diff --git a/Data/AbyssS2_Ability_GeppettoTarot_EffCtrl.json b/Data/AbyssS2_Ability_GeppettoTarot_EffCtrl.json index 58373b7e..1fc7dc51 100644 --- a/Data/AbyssS2_Ability_GeppettoTarot_EffCtrl.json +++ b/Data/AbyssS2_Ability_GeppettoTarot_EffCtrl.json @@ -68,6 +68,14 @@ }, "EffectPattern": "Eff_Device_Prop_AbyssS2GeppettoClue_01_04_Death", "Target": "Self" + }, + { + "$type": "PushPointGameObjectControlAction", + "AttachPointNameList": [ + "WallCollider" + ], + "IsActive": false, + "Tag": "AbyssS2_GeppettoTarot_Death" } ] }, diff --git a/Data/AbyssS2_Artifact_1339707.json b/Data/AbyssS2_Artifact_1339707.json index 9352ec56..0e94efa0 100644 --- a/Data/AbyssS2_Artifact_1339707.json +++ b/Data/AbyssS2_Artifact_1339707.json @@ -71,6 +71,7 @@ "Modifiers": { "AbyssS2_Artifact_MistAreaBonus_Modifier": { "Duration": -1, + "MaxStackingNumber": 99, "ModifierStacking": "Multiple", "OnAdded": [ { diff --git a/Data/AbyssS2_Artifact_1339802.json b/Data/AbyssS2_Artifact_1339802.json index 1894b0d1..0f128e8e 100644 --- a/Data/AbyssS2_Artifact_1339802.json +++ b/Data/AbyssS2_Artifact_1339802.json @@ -9,6 +9,10 @@ "Value": 0, "ValueType": "Float" }, + "AS_CurHP_Limit_DiffTemp": { + "Value": 0, + "ValueType": "Float" + }, "AS_CurHP_Limit_Ratio": { "Value": 0.1, "ValueType": "Float" @@ -35,25 +39,38 @@ "Target": "Self" }, { - "$type": "SetBasePropertyLimitByAbility", - "Limit": "%AS_CurHP_Limit", - "PropertyType": "CurHP" - }, - { - "$type": "RecoverHPAction", - "Amount": 1, + "$type": "SetAbilitySpecialByExpression", + "Expression": "property(CurHP)-property(MaxHP)*specials(AS_CurHP_Limit_Ratio)", + "ParamName": "AS_CurHP_Limit_DiffTemp", "Predicates": [ { "$type": "ByPlayerPropertyValue", "CompareType": "Greater", "Denominator": "MaxHP", - "IsUsePercent": true, "Numerator": "CurHP", "Target": "Self", - "Val1": "%AS_CurHP_Limit_Ratio", - "Val2": 0 + "Val1": "%AS_CurHP_Limit_Ratio" } - ] + ], + "Target": "Self", + "ValueType": "Float" + }, + { + "$type": "DecreaseHPAction", + "Amount": "%AS_CurHP_Limit_DiffTemp", + "IgnoreInvincible": true, + "IgnoreLifeLock": true, + "Predicates": [ + { + "$type": "ByPlayerPropertyValue", + "CompareType": "Greater", + "Denominator": "MaxHP", + "Numerator": "CurHP", + "Target": "Self", + "Val1": "%AS_CurHP_Limit_Ratio" + } + ], + "Target": "Self" }, { "$type": "ApplyModifier", @@ -65,6 +82,52 @@ "Modifiers": { "AbyssS2_Artifact_HighStakes_Modifier": { "Duration": -1, + "ModifierMixins": [ + { + "$type": "ActionsOnPropertyChangeMixin", + "PropertyActions": [ + { + "PropertyChangeActions": [ + { + "$type": "SetAbilitySpecialByExpression", + "Expression": "property(CurHP)-property(MaxHP)*specials(AS_CurHP_Limit_Ratio)", + "ParamName": "AS_CurHP_Limit_DiffTemp", + "Predicates": [ + { + "$type": "ByPlayerPropertyValue", + "CompareType": "Greater", + "Denominator": "MaxHP", + "Numerator": "CurHP", + "Target": "Self", + "Val1": "%AS_CurHP_Limit_Ratio" + } + ], + "Target": "Self", + "ValueType": "Float" + }, + { + "$type": "DecreaseHPAction", + "Amount": "%AS_CurHP_Limit_DiffTemp", + "IgnoreInvincible": true, + "IgnoreLifeLock": true, + "Predicates": [ + { + "$type": "ByPlayerPropertyValue", + "CompareType": "Greater", + "Denominator": "MaxHP", + "Numerator": "CurHP", + "Target": "Self", + "Val1": "%AS_CurHP_Limit_Ratio" + } + ], + "Target": "Self" + } + ], + "PropertyType": "CurHP" + } + ] + } + ], "ModifierStacking": "Unique", "OnHitOther": [ { diff --git a/Data/AbyssS2_Artifact_1339803.json b/Data/AbyssS2_Artifact_1339803.json index 7b18b54a..cf63e675 100644 --- a/Data/AbyssS2_Artifact_1339803.json +++ b/Data/AbyssS2_Artifact_1339803.json @@ -174,6 +174,138 @@ ], "Target": "TeamAvatars" } + ], + "OnBuffDamageAttackLanded": [ + { + "$type": "SetAbilitySpecialByAttackData", + "AttackDataType": "HpDamage", + "ModifyFunction": "Replace", + "ParamName": "AS_AbyssS2_Artifact_DamageToHP_DamageCache", + "Predicates": [ + { + "$type": "ByMonsterFunctionType", + "CompareType": "Equal", + "MonsterFunctionType": "Monster", + "Target": "Other" + }, + { + "$type": "ByCampType", + "Camp": "TeamEvil", + "IsNot": false, + "Target": "Other" + } + ] + }, + { + "$type": "SetAbilitySpecialByExpression", + "Expression": "specials(AS_AbyssS2_Artifact_DamageToHP_DamageCache)*specials(AS_AbyssS2_Artifact_DamageToHP_Ratio)", + "ParamName": "AS_AbyssS2_Artifact_DamageToHP_Amount", + "Predicates": [ + { + "$type": "ByMonsterFunctionType", + "CompareType": "Equal", + "MonsterFunctionType": "Monster", + "Target": "Other" + }, + { + "$type": "ByCampType", + "Camp": "TeamEvil", + "IsNot": false, + "Target": "Other" + } + ], + "Target": "Self", + "ValueType": "Float" + }, + { + "$type": "SetAbilitySpecialAction", + "ModifyFunction": "Replace", + "Param": "%AS_AbyssS2_Artifact_DamageToHP_Limit", + "ParamName": "AS_AbyssS2_Artifact_DamageToHP_Amount", + "ParamType": "Float", + "Predicates": [ + { + "$type": "ByAbilitySpecial", + "CompareType": "Greater", + "Param": "%AS_AbyssS2_Artifact_DamageToHP_Limit", + "ParamName": "AS_AbyssS2_Artifact_DamageToHP_Amount", + "ParamType": "Float", + "Target": "Self" + }, + { + "$type": "ByMonsterFunctionType", + "CompareType": "Equal", + "MonsterFunctionType": "Monster", + "Target": "Other" + }, + { + "$type": "ByCampType", + "Camp": "TeamEvil", + "IsNot": false, + "Target": "Other" + } + ], + "Target": "Self" + }, + { + "$type": "SetAbilitySpecialByExpression", + "Expression": "specials(AS_AbyssS2_Artifact_DamageToHP_Amount)*specials(AS_BackUpAvatarTransRatio)", + "ParamName": "AS_AbyssS2_Artifact_DamageToHP_Amount_BackUp", + "Predicates": [ + { + "$type": "ByMonsterFunctionType", + "CompareType": "Equal", + "MonsterFunctionType": "Monster", + "Target": "Other" + }, + { + "$type": "ByCampType", + "Camp": "TeamEvil", + "IsNot": false, + "Target": "Other" + } + ], + "Target": "Self", + "ValueType": "Float" + }, + { + "$type": "RecoverHPAction", + "Amount": "%AS_AbyssS2_Artifact_DamageToHP_Amount", + "Predicates": [ + { + "$type": "ByMonsterFunctionType", + "CompareType": "Equal", + "MonsterFunctionType": "Monster", + "Target": "Other" + }, + { + "$type": "ByCampType", + "Camp": "TeamEvil", + "IsNot": false, + "Target": "Other" + } + ], + "Target": "Self" + }, + { + "$type": "ApplyModifier", + "ModifierName": "AbyssS2_Artifact_1339803_BackUpDamageToHP_Modifier", + "Predicates": [ + { + "$type": "ByMonsterFunctionType", + "CompareType": "Equal", + "MonsterFunctionType": "Monster", + "Target": "Other" + }, + { + "$type": "ByCampType", + "Camp": "TeamEvil", + "IsNot": false, + "Target": "Other" + } + ], + "Target": "TeamAvatars" + } ] }, "Modifiers": { diff --git a/Data/AbyssS2_Artifact_1339804.json b/Data/AbyssS2_Artifact_1339804.json index 3e18f2c7..6ad87cfe 100644 --- a/Data/AbyssS2_Artifact_1339804.json +++ b/Data/AbyssS2_Artifact_1339804.json @@ -71,6 +71,7 @@ "Modifiers": { "AbyssS2_Artifact_MistAreaBonus_Modifier": { "Duration": -1, + "MaxStackingNumber": 99, "ModifierStacking": "Multiple", "OnAdded": [ { diff --git a/Data/AbyssS2_Boss_Geppetto_Card_A01.json b/Data/AbyssS2_Boss_Geppetto_Card_A01.json index 3f0d93f5..b4551540 100644 --- a/Data/AbyssS2_Boss_Geppetto_Card_A01.json +++ b/Data/AbyssS2_Boss_Geppetto_Card_A01.json @@ -32,6 +32,15 @@ { "$type": "ApplyModifier", "ModifierName": "BuffModifier", + "Predicates": [ + { + "$type": "ByIsInZoneTags", + "Tags": [ + "Geppetto" + ], + "Target": "Target" + } + ], "Target": "Self" } ] diff --git a/Data/AbyssS2_SingeleTask_Astra.json b/Data/AbyssS2_SingeleTask_Astra.json index 4444e5a4..90212edc 100644 --- a/Data/AbyssS2_SingeleTask_Astra.json +++ b/Data/AbyssS2_SingeleTask_Astra.json @@ -3,6 +3,19 @@ { "$type": "AttachStateWithModifierMixin", "ConfigList": [ + { + "AnimatorStateName": "Attack_Card_S_01_Start", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": true, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "AbyssS2_SingeleTask_Astra_01", + "AbyssS2_SingeleTask_Astra_02" + ] + }, { "AnimatorStateName": "Attack_Card_S_01_Loop", "FrameCountHigh": 0, @@ -16,7 +29,8 @@ "AbyssS2_SingeleTask_Astra_02" ] } - ] + ], + "IsSeam": false } ], "AbilityName": "AbyssS2_SingeleTask_Astra", diff --git a/Data/AbyssS2_SingeleTask_Unagi.json b/Data/AbyssS2_SingeleTask_Unagi.json index faf3df37..24013360 100644 --- a/Data/AbyssS2_SingeleTask_Unagi.json +++ b/Data/AbyssS2_SingeleTask_Unagi.json @@ -63,7 +63,8 @@ } ] } - ] + ], + "PropertyType": "Custom" } ] } diff --git a/Data/AbyssS2_Trend_12.json b/Data/AbyssS2_Trend_12.json index 02c5990c..c9e519c3 100644 --- a/Data/AbyssS2_Trend_12.json +++ b/Data/AbyssS2_Trend_12.json @@ -110,7 +110,7 @@ ] } ], - "Target": "Target" + "Target": "Other" } ] } diff --git a/Data/Activity_BangbooDream_Common_Follow.json b/Data/Activity_BangbooDream_Common_Follow.json index fe03d285..7fa24920 100644 --- a/Data/Activity_BangbooDream_Common_Follow.json +++ b/Data/Activity_BangbooDream_Common_Follow.json @@ -442,7 +442,20 @@ }, { "$type": "ApplyModifier", - "ModifierName": "FollowCameraModifier" + "ModifierName": "FollowCameraModifier", + "Predicates": [ + { + "$type": "ByNot", + "Predicates": [ + { + "$type": "ByHasModifier", + "ModifierNameList": [ + "StartFollow" + ] + } + ] + } + ] } ] }, diff --git a/Data/Activity_BangbooDream_Weapon_Gun.json b/Data/Activity_BangbooDream_Weapon_Gun.json index d2c7c1ae..007de437 100644 --- a/Data/Activity_BangbooDream_Weapon_Gun.json +++ b/Data/Activity_BangbooDream_Weapon_Gun.json @@ -74,37 +74,6 @@ "BoolVal": true, "ParamName": "Bool_IsGun", "ParamType": 2 - }, - { - "$type": "ProcessAttachPointAction", - "AttachPointName": "Gun1", - "HierarchyType": "Self", - "PosRot": { - "CoordsOption": "ReferTarget", - "Offset": { - "AngleOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "IsUseRotationXZ": false, - "IsUseRotationY": true, - "PositionOffset": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "TargetOption": { - "$type": "ConfigPosRotReferTarget", - "AttachPoint": "GunEffPoint_1", - "IsUseAttachPointPos": true, - "IsUseAttachPointRotation": false, - "OffsetReferTarget": "Self" - } - }, - "ProcessType": "Create", - "Target": "Self" } ] }, diff --git a/Data/Activity_BangbooDream_Weapon_Gun_Perk_AbnormalGun.json b/Data/Activity_BangbooDream_Weapon_Gun_Perk_AbnormalGun.json index 17ef3c24..44138532 100644 --- a/Data/Activity_BangbooDream_Weapon_Gun_Perk_AbnormalGun.json +++ b/Data/Activity_BangbooDream_Weapon_Gun_Perk_AbnormalGun.json @@ -1,11 +1,11 @@ { "AbilityName": "Activity_BangbooDream_Weapon_Gun_Perk_AbnormalGun", "AbilitySpecials": { - "AS_AS_CriticalDamageRatioDelta": { + "AS_CriticalDamageRatioDelta": { "Value": 0.02, "ValueType": "Float" }, - "AS_AS_CriticalDamageRatioDelta_Real": { + "AS_CriticalDamageRatioDelta_Real": { "Value": 0.02, "ValueType": "Float" }, @@ -25,8 +25,8 @@ }, { "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343005)*specials(AS_AS_CriticalDamageRatioDelta)", - "ParamName": "AS_AS_CriticalDamageRatioDelta_Real", + "Expression": "item(1343005)*specials(AS_CriticalDamageRatioDelta)", + "ParamName": "AS_CriticalDamageRatioDelta_Real", "ValueType": "Float" } ], @@ -60,8 +60,8 @@ }, { "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343005)*specials(AS_AS_CriticalDamageRatioDelta)", - "ParamName": "AS_AS_CriticalDamageRatioDelta_Real", + "Expression": "item(1343005)*specials(AS_CriticalDamageRatioDelta)", + "ParamName": "AS_CriticalDamageRatioDelta_Real", "Predicates": [ { "$type": "ByLevelAbilityItemID", @@ -88,8 +88,8 @@ ] } ], - "PropertyKey": "Actor_AS_CriticalDamageRatioDelta", - "PropertyValue": "%AS_AS_CriticalDamageRatioDelta_Real", + "PropertyKey": "Actor_CriticalDamageRatioDelta", + "PropertyValue": "%AS_CriticalDamageRatioDelta_Real", "Target": "Self" } ] diff --git a/Data/Activity_BangbooDream_Weapon_Gun_Perk_ExtraGunCount.json b/Data/Activity_BangbooDream_Weapon_Gun_Perk_ExtraGunCount.json index 7ff0a3a8..f6422b16 100644 --- a/Data/Activity_BangbooDream_Weapon_Gun_Perk_ExtraGunCount.json +++ b/Data/Activity_BangbooDream_Weapon_Gun_Perk_ExtraGunCount.json @@ -60,6 +60,15 @@ ], "ValueType": "Float" }, + { + "$type": "ModifyProperty", + "Amount": "%AS_Gun_Count", + "CustomPropertyType": "GunCount", + "IsUsePercentage": false, + "PropertyModifyFunction": "Replace", + "PropertyType": "Custom", + "Target": "Caster" + }, { "$type": "ApplyModifier", "ModifierName": "GunChangeModifier" @@ -68,9 +77,9 @@ }, "Modifiers": { "GunChangeModifier": { - "Duration": 2, + "Duration": 0.5, "ModifierStacking": "Replace", - "OnAdded": [ + "OnRemoved": [ { "$type": "BranchOperator", "Conditions": [ @@ -224,7 +233,7 @@ "OffsetReferTarget": "Self" } }, - "ProcessType": "Create", + "ProcessType": "Modify", "Target": "Self" } ] @@ -257,7 +266,7 @@ "OffsetReferTarget": "Self" } }, - "ProcessType": "Create", + "ProcessType": "Modify", "Target": "Self" }, { diff --git a/Data/Activity_BangbooDream_Weapon_Gun_Perk_HitAbnormalGun.json b/Data/Activity_BangbooDream_Weapon_Gun_Perk_HitAbnormalGun.json index 66604985..365e94cb 100644 --- a/Data/Activity_BangbooDream_Weapon_Gun_Perk_HitAbnormalGun.json +++ b/Data/Activity_BangbooDream_Weapon_Gun_Perk_HitAbnormalGun.json @@ -45,7 +45,8 @@ "Overload", "Frost", "Strike" - ] + ], + "Target": "Target" }, { "$type": "ByOr", @@ -66,7 +67,7 @@ } ], "PropertyKey": "Actor_AddedDamageRatio", - "PropertyValue": "%AS_AddedDamageRatio", + "PropertyValue": "%AS_AddedDamageRatio_Real", "Target": "Other" } ], diff --git a/Data/Activity_BangbooDream_Weapon_Gun_Perk_MissileGun.json b/Data/Activity_BangbooDream_Weapon_Gun_Perk_MissileGun.json index 528fdc0b..e3de05e2 100644 --- a/Data/Activity_BangbooDream_Weapon_Gun_Perk_MissileGun.json +++ b/Data/Activity_BangbooDream_Weapon_Gun_Perk_MissileGun.json @@ -18,7 +18,7 @@ { "$type": "ByAbilitySpecial", "CompareType": "GreaterEqual", - "Param": 15, + "Param": 40, "ParamName": "AS_MachineGun_HitCount" } ] diff --git a/Data/Activity_BangbooDream_Weapon_Gun_Perk_TwoSideGun.json b/Data/Activity_BangbooDream_Weapon_Gun_Perk_TwoSideGun.json index f3ea0585..1b2f05de 100644 --- a/Data/Activity_BangbooDream_Weapon_Gun_Perk_TwoSideGun.json +++ b/Data/Activity_BangbooDream_Weapon_Gun_Perk_TwoSideGun.json @@ -35,7 +35,8 @@ "BangbooDream_Gun" ] } - ] + ], + "Target": "Target" } ], "OnLevelAbilityItemChanged": [ @@ -79,7 +80,7 @@ } ], "PropertyKey": "Actor_BuffDamageRatio", - "PropertyValue": "%AS_BuffDamageRatio", + "PropertyValue": "%AS_BuffDamageRatio_Real", "Target": "Self" } ] diff --git a/Data/Activity_BangbooDream_Weapon_Gun_Perk_WeakenGun.json b/Data/Activity_BangbooDream_Weapon_Gun_Perk_WeakenGun.json index 61263963..b8364cd4 100644 --- a/Data/Activity_BangbooDream_Weapon_Gun_Perk_WeakenGun.json +++ b/Data/Activity_BangbooDream_Weapon_Gun_Perk_WeakenGun.json @@ -27,88 +27,10 @@ } ], "OnHitOther": [ - { - "$type": "RemoveModifier", - "ModifierName": "SameTargetModifier", - "Predicates": [ - { - "$type": "ByNot", - "Predicates": [ - { - "$type": "ByHasModifier", - "ModifierNameList": [ - "SameTargetModifier" - ] - } - ] - }, - { - "$type": "ByAnimTagList", - "TagList": [ - "BangbooDream_Gun" - ] - } - ], - "Target": "EnemyAllied" - }, - { - "$type": "RemoveModifier", - "ModifierName": "WeakenModifier", - "Predicates": [ - { - "$type": "ByNot", - "Predicates": [ - { - "$type": "ByHasModifier", - "ModifierNameList": [ - "SameTargetModifier" - ] - } - ] - }, - { - "$type": "ByAnimTagList", - "TagList": [ - "BangbooDream_Gun" - ] - } - ], - "Target": "EnemyAllied" - }, { "$type": "ApplyModifier", "ModifierName": "WeakenModifier", "Predicates": [ - { - "$type": "ByHasModifier", - "ModifierNameList": [ - "SameTargetModifier" - ] - }, - { - "$type": "ByAnimTagList", - "TagList": [ - "BangbooDream_Gun" - ] - } - ], - "Target": "Target" - }, - { - "$type": "ApplyModifier", - "ModifierName": "SameTargetModifier", - "Predicates": [ - { - "$type": "ByNot", - "Predicates": [ - { - "$type": "ByHasModifier", - "ModifierNameList": [ - "SameTargetModifier" - ] - } - ] - }, { "$type": "ByAnimTagList", "TagList": [ diff --git a/Data/Activity_BangbooDream_Weapon_Laser.json b/Data/Activity_BangbooDream_Weapon_Laser.json index 83538303..4ef8ed5c 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser.json +++ b/Data/Activity_BangbooDream_Weapon_Laser.json @@ -10,6 +10,9 @@ "AS_LaserAttackDelta": { "Value": 0.8 }, + "AS_LaserDebuffDuration": { + "Value": 5 + }, "AS_Laser_AddDuration_Real": { "Value": 0.8 }, @@ -100,6 +103,15 @@ "PropertyType": "Custom", "Target": "Caster" }, + { + "$type": "SetAbilitySpecialsByPropertyAction", + "CustomPropertyType": "LaserDebuffDuration", + "ModifyFunction": "Replace", + "ParamName": "AS_LaserDebuffDuration", + "Percentage": 1, + "PropertyType": "Custom", + "Target": "Caster" + }, { "$type": "SetAbilitySpecialByExpression", "Expression": "specials(AS_AllDamageResist)*(-1)", @@ -153,19 +165,13 @@ "LaserDebuffModifier": { "Buff": { "BuffID": 9000301, - "IsOverrideDuration": false + "IsOverrideDuration": true }, - "Duration": 1, + "Duration": "%AS_LaserDebuffDuration", "ModifierStacking": "Refresh", "OnBeingHit": [ { "$type": "ModifyAttackDataAction", - "Predicates": [ - { - "$type": "ByIsModifierCaster", - "Target": "Self" - } - ], "PropertyKey": "Actor_AllDamageResist", "PropertyValue": "%AS_AllDamageResist", "Target": "Self" @@ -193,6 +199,23 @@ "Duration": "%AS_Laser_AddDuration_Real", "ModifierStacking": "Replace", "OnAdded": [ + { + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "LaserDoubleGun" + ], + "IsAdd": true, + "Predicates": [ + { + "$type": "ByIsInZoneTags", + "Tags": [ + "Laser_DoubleGunPerk" + ], + "Target": "Caster" + } + ], + "Target": "Self" + }, { "$type": "SkillStartAction", "StartedSkillName": "Bangboo_Observaboo_Armored_Laser", @@ -258,6 +281,14 @@ "$type": "InterruptLaserAction", "Tag": "BangbooDream_Laser", "Target": "Caster" + }, + { + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "LaserDoubleGun" + ], + "IsAdd": false, + "Target": "Self" } ] }, @@ -283,8 +314,20 @@ "ModifierStacking": "Replace", "OnAdded": [ { - "$type": "SkillStartAction", - "StartedSkillName": "Bangboo_Observaboo_Armored_Laser_Short", + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "LaserDoubleGun" + ], + "IsAdd": true, + "Predicates": [ + { + "$type": "ByIsInZoneTags", + "Tags": [ + "Laser_DoubleGunPerk" + ], + "Target": "Caster" + } + ], "Target": "Self" }, { @@ -347,6 +390,14 @@ "$type": "InterruptLaserAction", "Tag": "BangbooDream_Laser_Short", "Target": "Caster" + }, + { + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "LaserDoubleGun" + ], + "IsAdd": false, + "Target": "Self" } ] }, @@ -363,13 +414,6 @@ "PropertyType": "Custom", "Target": "Caster" }, - { - "$type": "SetAbilitySpecialByExpression", - "Expression": "specials(AS_Laser_AddDuration_Real)+2", - "ParamName": "AS_DoubleGun_AddDuration_Real", - "Target": "Caster", - "ValueType": "Float" - }, { "$type": "RemoveModifier", "ModifierName": "LaserShortModifier", @@ -391,13 +435,6 @@ "PropertyType": "Custom", "Target": "Caster" }, - { - "$type": "SetAbilitySpecialByExpression", - "Expression": "specials(AS_Laser_AddDuration_Real)+2", - "ParamName": "AS_DoubleGun_AddDuration_Real", - "Target": "Caster", - "ValueType": "Float" - }, { "$type": "RemoveModifier", "ModifierName": "LaserShortModifier", diff --git a/Data/Activity_BangbooDream_Weapon_Laser_Perk_DebuffAddDamage.json b/Data/Activity_BangbooDream_Weapon_Laser_Perk_DebuffAddDamage.json index 1c85fce6..26079f66 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser_Perk_DebuffAddDamage.json +++ b/Data/Activity_BangbooDream_Weapon_Laser_Perk_DebuffAddDamage.json @@ -28,6 +28,13 @@ "$type": "ByHasBuffID", "BuffIDList": [ "9000301" + ], + "Target": "Target" + }, + { + "$type": "ByAnimTagList", + "TagList": [ + "BangbooDream_Laser" ] } ], diff --git a/Data/Activity_BangbooDream_Weapon_Laser_Perk_DelayDebuff.json b/Data/Activity_BangbooDream_Weapon_Laser_Perk_DelayDebuff.json index 6f8e0763..d68c972e 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser_Perk_DelayDebuff.json +++ b/Data/Activity_BangbooDream_Weapon_Laser_Perk_DelayDebuff.json @@ -60,9 +60,26 @@ "$type": "ModifyAttackDataAction", "Predicates": [ { - "$type": "ByAnimTagList", - "TagList": [ - "BangbooDream_Laser" + "$type": "ByOr", + "Predicates": [ + { + "$type": "ByAnimTagList", + "TagList": [ + "BangbooDream_Laser" + ] + }, + { + "$type": "ByAnimTagList", + "TagList": [ + "BangbooDream_Gun" + ] + }, + { + "$type": "ByAnimTagList", + "TagList": [ + "BangbooDream_Missile" + ] + } ] } ], diff --git a/Data/Activity_BangbooDream_Weapon_Laser_Perk_DoubleGun.json b/Data/Activity_BangbooDream_Weapon_Laser_Perk_DoubleGun.json index d56b4db0..4420870e 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser_Perk_DoubleGun.json +++ b/Data/Activity_BangbooDream_Weapon_Laser_Perk_DoubleGun.json @@ -1,83 +1,26 @@ { - "AbilityMixins": [ - { - "$type": "ListenAbilityMixin", - "AbilityName": "Activity_BangbooDream_Weapon_Laser", - "OnListenAbilityStarted": [ - { - "$type": "ApplyModifier", - "ModifierName": "ListenModifier", - "Target": "Self" - } - ], - "Targetting": "Self" - } - ], "AbilityName": "Activity_BangbooDream_Weapon_Laser_Perk_DoubleGun", "AbilityStacking": "Unique", "DefaultModifier": { - "OnSkillStart": [ + "OnAdded": [ { - "$type": "RemoveModifier", - "ModifierName": "ListenModifier", - "Predicates": [ - { - "$type": "BySkillName", - "SkillName": "Bangboo_Observaboo_Armored_Laser" - } - ] - }, + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "Laser_DoubleGunPerk" + ], + "IsAdd": true, + "Target": "Self" + } + ], + "OnRemoved": [ { - "$type": "ApplyModifier", - "ModifierName": "DoubleGunModifier", - "Predicates": [ - { - "$type": "BySkillName", - "SkillName": "Bangboo_Observaboo_Armored_Laser" - } - ] + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "Laser_DoubleGunPerk" + ], + "IsAdd": false, + "Target": "Self" } ] - }, - "Modifiers": { - "DoubleGunModifier": { - "Duration": -1, - "ModifierStacking": "Replace", - "OnAdded": [ - { - "$type": "HandleAnimatorZoneTagsAction", - "AnimatorStateTags": [ - "LaserDoubleGun" - ], - "IsAdd": true, - "Target": "Self" - } - ], - "OnRemoved": [ - { - "$type": "HandleAnimatorZoneTagsAction", - "AnimatorStateTags": [ - "LaserDoubleGun" - ], - "IsAdd": false, - "Target": "Self" - } - ] - }, - "ListenModifier": { - "DelayHandlers": [ - { - "DelayTime": 1, - "TimeUpActions": [ - { - "$type": "RemoveModifier", - "ModifierName": "DoubleGunModifier" - } - ] - } - ], - "Duration": 2, - "ModifierStacking": "Replace" - } } } \ No newline at end of file diff --git a/Data/Activity_BangbooDream_Weapon_Laser_Perk_EnhanceMissile.json b/Data/Activity_BangbooDream_Weapon_Laser_Perk_EnhanceMissile.json index acae5864..f11e4ad9 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser_Perk_EnhanceMissile.json +++ b/Data/Activity_BangbooDream_Weapon_Laser_Perk_EnhanceMissile.json @@ -8,14 +8,27 @@ "AS_CriticalDelta_ConvertRatio": { "Value": 0.5, "ValueType": "Float" + }, + "AS_MissileCriticalDelta": { + "Value": 0, + "ValueType": "Float" } }, "AbilityStacking": "Unique", "DefaultModifier": { "OnAdded": [ + { + "$type": "SetAbilitySpecialsByPropertyAction", + "CustomPropertyType": "MissileCriticalDelta", + "ModifyFunction": "Replace", + "ParamName": "AS_MissileCriticalDelta", + "Percentage": 1, + "PropertyType": "Custom", + "Target": "Caster" + }, { "$type": "SetAbilitySpecialByExpression", - "Expression": "property(Crit_Battle)*specials(AS_CriticalDelta_ConvertRatio)", + "Expression": "(property(Crit_Battle)+specials(AS_MissileCriticalDelta))*specials(AS_CriticalDelta_ConvertRatio)", "ParamName": "AS_CritDamageRatioDelta_Real", "ValueType": "Float" } @@ -45,10 +58,39 @@ ] } ], - "PropertyKey": "Actor_CritDamageRatioDelta", + "PropertyKey": "Actor_CriticalDamageRatioDelta", "PropertyValue": "%AS_CritDamageRatioDelta_Real", "Target": "Other" } + ], + "OnLevelAbilityItemChanged": [ + { + "$type": "SetAbilitySpecialsByPropertyAction", + "CustomPropertyType": "MissileCriticalDelta", + "ModifyFunction": "Replace", + "ParamName": "AS_MissileCriticalDelta", + "Percentage": 1, + "Predicates": [ + { + "$type": "ByLevelAbilityItemID", + "LevelAbilityItemID": 1343013 + } + ], + "PropertyType": "Custom", + "Target": "Caster" + }, + { + "$type": "SetAbilitySpecialByExpression", + "Expression": "(property(Crit_Battle)+specials(AS_MissileCriticalDelta))*specials(AS_CriticalDelta_ConvertRatio)", + "ParamName": "AS_CritDamageRatioDelta_Real", + "Predicates": [ + { + "$type": "ByLevelAbilityItemID", + "LevelAbilityItemID": 1343013 + } + ], + "ValueType": "Float" + } ] } } \ No newline at end of file diff --git a/Data/Activity_BangbooDream_Weapon_Laser_Perk_LaserBuff.json b/Data/Activity_BangbooDream_Weapon_Laser_Perk_LaserBuff.json index 589495de..6ee702ff 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser_Perk_LaserBuff.json +++ b/Data/Activity_BangbooDream_Weapon_Laser_Perk_LaserBuff.json @@ -19,36 +19,38 @@ "OnAdded": [ { "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343029)*specials(AS_AddedDamageRatio_Upgrade)", + "Expression": "item(1343028)*specials(AS_AddedDamageRatio_Upgrade)", "ParamName": "AS_AddedDamageRatio_Real", "ValueType": "Float" } ], - "OnLevelAbilityItemChanged": [ - { - "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343029)*specials(AS_AddedDamageRatio_Upgrade)", - "ParamName": "AS_AddedDamageRatio_Real", - "Predicates": [ - { - "$type": "ByLevelAbilityItemID", - "LevelAbilityItemID": 1343029 - } - ], - "ValueType": "Float" - } - ], - "OnSkillStart": [ + "OnHitOtherPre": [ { "$type": "ApplyModifier", "ModifierName": "BuffModifier", "Predicates": [ { - "$type": "BySkillName", - "SkillName": "Bangboo_Observaboo_Armored_Laser" + "$type": "ByAnimTagList", + "TagList": [ + "BangbooDream_Laser" + ] } ] } + ], + "OnLevelAbilityItemChanged": [ + { + "$type": "SetAbilitySpecialByExpression", + "Expression": "item(1343028)*specials(AS_AddedDamageRatio_Upgrade)", + "ParamName": "AS_AddedDamageRatio_Real", + "Predicates": [ + { + "$type": "ByLevelAbilityItemID", + "LevelAbilityItemID": 1343028 + } + ], + "ValueType": "Float" + } ] }, "Modifiers": { diff --git a/Data/Activity_BangbooDream_Weapon_Laser_Perk_StunAddDamage.json b/Data/Activity_BangbooDream_Weapon_Laser_Perk_StunAddDamage.json index cbf19b1c..a7a59fb0 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser_Perk_StunAddDamage.json +++ b/Data/Activity_BangbooDream_Weapon_Laser_Perk_StunAddDamage.json @@ -1,11 +1,11 @@ { "AbilityName": "Activity_BangbooDream_Weapon_Laser_Perk_StunAddDamage", "AbilitySpecials": { - "AS_AddedDamageRatio_Real": { + "AS_AddedDamageRatio": { "Value": 0.2, "ValueType": "Float" }, - "AS_AddedDamageRatio_Upgrade": { + "AS_AddedDamageRatio_Real": { "Value": 0.2, "ValueType": "Float" } @@ -15,7 +15,7 @@ "OnAdded": [ { "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343026)*specials(AS_AddedDamageRatio_Upgrade)", + "Expression": "item(1343026)*specials(AS_AddedDamageRatio)", "ParamName": "AS_AddedDamageRatio_Real", "ValueType": "Float" } @@ -44,7 +44,7 @@ "OnLevelAbilityItemChanged": [ { "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343026)*specials(AS_AddedDamageRatio_Upgrade)", + "Expression": "item(1343026)*specials(AS_AddedDamageRatio)", "ParamName": "AS_AddedDamageRatio_Real", "Predicates": [ { diff --git a/Data/Activity_BangbooDream_Weapon_Laser_Upgrade_Debuff.json b/Data/Activity_BangbooDream_Weapon_Laser_Upgrade_Debuff.json index be8cae97..74786880 100644 --- a/Data/Activity_BangbooDream_Weapon_Laser_Upgrade_Debuff.json +++ b/Data/Activity_BangbooDream_Weapon_Laser_Upgrade_Debuff.json @@ -20,18 +20,6 @@ }, "AbilityStacking": "Unique", "DefaultModifier": { - "BuffRevises": [ - { - "BuffID": 9000301, - "FilterType": "ByBuffId", - "Params": [ - { - "Delta": "%AS_BuffAddDuration_Real", - "Name": "Duration" - } - ] - } - ], "OnAdded": [ { "$type": "ApplyAbilityAction", @@ -39,7 +27,7 @@ }, { "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343023)*specials(AS_BuffAddDuration_Upgrade)", + "Expression": "item(1343023)*specials(AS_BuffAddDuration_Upgrade)+5", "ParamName": "AS_BuffAddDuration_Real", "ValueType": "Float" }, @@ -57,12 +45,21 @@ "PropertyModifyFunction": "Replace", "PropertyType": "Custom", "Target": "Caster" + }, + { + "$type": "ModifyProperty", + "Amount": "%AS_BuffAddDuration_Real", + "CustomPropertyType": "LaserDebuffDuration", + "IsUsePercentage": false, + "PropertyModifyFunction": "Replace", + "PropertyType": "Custom", + "Target": "Caster" } ], "OnLevelAbilityItemChanged": [ { "$type": "SetAbilitySpecialByExpression", - "Expression": "item(1343023)*specials(AS_BuffAddDuration_Upgrade)", + "Expression": "item(1343023)*specials(AS_BuffAddDuration_Upgrade)+5", "ParamName": "AS_BuffAddDuration_Real", "Predicates": [ { @@ -98,6 +95,21 @@ "PropertyModifyFunction": "Replace", "PropertyType": "Custom", "Target": "Caster" + }, + { + "$type": "ModifyProperty", + "Amount": "%AS_BuffAddDuration_Real", + "CustomPropertyType": "LaserDebuffDuration", + "IsUsePercentage": false, + "Predicates": [ + { + "$type": "ByLevelAbilityItemID", + "LevelAbilityItemID": 1343023 + } + ], + "PropertyModifyFunction": "Replace", + "PropertyType": "Custom", + "Target": "Caster" } ] } diff --git a/Data/Activity_BangbooDream_Weapon_Missile_Perk_Weaken.json b/Data/Activity_BangbooDream_Weapon_Missile_Perk_Weaken.json index c9754ae7..91202a23 100644 --- a/Data/Activity_BangbooDream_Weapon_Missile_Perk_Weaken.json +++ b/Data/Activity_BangbooDream_Weapon_Missile_Perk_Weaken.json @@ -68,20 +68,9 @@ "$type": "ModifyAttackDataAction", "Predicates": [ { - "$type": "ByOr", - "Predicates": [ - { - "$type": "ByAnimTagList", - "TagList": [ - "BangbooDream_Missile" - ] - }, - { - "$type": "ByAnimTagList", - "TagList": [ - "BangbooDream_Laser" - ] - } + "$type": "ByAnimTagList", + "TagList": [ + "BangbooDream_Missile" ] } ], diff --git a/Data/Activity_BangbooDream_Weapon_Missile_Upgrade_CriticalDelta.json b/Data/Activity_BangbooDream_Weapon_Missile_Upgrade_CriticalDelta.json index 3c803f48..bd6781e7 100644 --- a/Data/Activity_BangbooDream_Weapon_Missile_Upgrade_CriticalDelta.json +++ b/Data/Activity_BangbooDream_Weapon_Missile_Upgrade_CriticalDelta.json @@ -22,6 +22,15 @@ "Expression": "item(1343013)*specials(AS_MissileCriticalDelta)", "ParamName": "AS_CriticalDelta_Real", "ValueType": "Float" + }, + { + "$type": "ModifyProperty", + "Amount": "%AS_CriticalDelta_Real", + "CustomPropertyType": "MissileCriticalDelta", + "IsUsePercentage": false, + "PropertyModifyFunction": "Replace", + "PropertyType": "Custom", + "Target": "Caster" } ], "OnHitOther": [ @@ -52,6 +61,21 @@ } ], "ValueType": "Float" + }, + { + "$type": "ModifyProperty", + "Amount": "%AS_CriticalDelta_Real", + "CustomPropertyType": "MissileCriticalDelta", + "IsUsePercentage": false, + "Predicates": [ + { + "$type": "ByLevelAbilityItemID", + "LevelAbilityItemID": 1343013 + } + ], + "PropertyModifyFunction": "Replace", + "PropertyType": "Custom", + "Target": "Caster" } ] } diff --git a/Data/Astra_Branch_Singing.json b/Data/Astra_Branch_Singing.json index 84301559..58aa40f8 100644 --- a/Data/Astra_Branch_Singing.json +++ b/Data/Astra_Branch_Singing.json @@ -793,6 +793,24 @@ "$type": "TriggerAbilityAction", "AbilityName": "Astra_MathSkill", "Target": "Self" + }, + { + "$type": "SetAbilitySpecialByExpression", + "DoRefresh": true, + "Expression": "max(0,property(CurSP)\/specials(AS_DecreaseSP_Lv1))", + "ParamName": "AS_ChargeTimes_Local", + "Target": "Self", + "ValueType": "Integer" + }, + { + "$type": "ModifyProperty", + "Amount": "%AS_ChargeTimes_Local", + "CustomPropertyType": "ChargeTimes", + "IsUsePercentage": false, + "Percentage": 0, + "PropertyModifyFunction": "Replace", + "PropertyType": "Custom", + "Target": "Caster" } ], "OnSwitchInBegin": [ diff --git a/Data/AudioResourceData.json b/Data/AudioResourceData.json index a92ef747..215a6ca4 100644 Binary files a/Data/AudioResourceData.json and b/Data/AudioResourceData.json differ diff --git a/Data/Billy_SignatureWeapon.json b/Data/Billy_SignatureWeapon.json index 0de122fc..83208472 100644 --- a/Data/Billy_SignatureWeapon.json +++ b/Data/Billy_SignatureWeapon.json @@ -15,6 +15,45 @@ "SignatureMaterialWeaponModifier", "SignatureLightWeaponModifier" ] + }, + { + "AnimatorStateName": "Attack_Branch_04_Enhance_Start", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] + }, + { + "AnimatorStateName": "Attack_Branch_04_Enhance_Fire_01", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] + }, + { + "AnimatorStateName": "Attack_Branch_04_Enhance_Fire_02", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] } ] } diff --git a/Data/ConfigNewbie.json b/Data/ConfigNewbie.json index ade0e052..a6d8b3e2 100644 Binary files a/Data/ConfigNewbie.json and b/Data/ConfigNewbie.json differ diff --git a/Data/Corin_Card_A_02_BloodDebuff_01.json b/Data/Corin_Card_A_02_BloodDebuff_01.json index 3bececd5..64e33bb5 100644 --- a/Data/Corin_Card_A_02_BloodDebuff_01.json +++ b/Data/Corin_Card_A_02_BloodDebuff_01.json @@ -28,10 +28,42 @@ "Modifiers": { "BloodDebuffModifier": { "Duration": 12, + "ModifierStacking": "Replace", + "OnThinkInterval": [ + { + "$type": "DamageByAttackPropertyAction", + "AnimEventID": "#Corin_Attack_BloodDebuff_AttackProperty_01", + "Attacker": "LocalAvatar", + "Target": "Self" + }, + { + "$type": "FireEffect", + "EffectPattern": "Eff_Common_Dleed_01_Buff", + "Target": "Self" + } + ], + "ThinkInterval": 3 + }, + "BloodDebuffModifier_Count": { + "Duration": 12, + "ModifierStacking": "Refresh", + "OnRemoved": [ + { + "$type": "SetAbilitySpecialAction", + "ModifyFunction": "Replace", + "Param": 0, + "ParamName": "AS_BloodCount", + "ParamType": "Integer", + "Target": "Self" + } + ] + }, + "BloodDebuffModifier_Data": { + "Duration": -1, "ModifierStacking": "Refresh", "OnAdded": [ ], - "OnBeingHit": [ + "OnIndirectBeingHit": [ { "$type": "ModifyAttackDataAction", "Predicates": [ @@ -48,37 +80,7 @@ } ], "OnRemoved": [ - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": 0, - "ParamName": "AS_BloodCount", - "ParamType": "Integer", - "Target": "Self" - }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": 0, - "ParamName": "AS_AddedDamageRatio_Real", - "ParamType": "Integer", - "Target": "Self" - } - ], - "OnThinkInterval": [ - { - "$type": "DamageByAttackPropertyAction", - "AnimEventID": "#Corin_Attack_BloodDebuff_AttackProperty_01", - "Attacker": "LocalAvatar", - "Target": "Self" - }, - { - "$type": "FireEffect", - "EffectPattern": "Eff_Common_Dleed_01_Buff", - "Target": "Self" - } - ], - "ThinkInterval": 3 + ] } }, "OnAbilityTrigger": [ @@ -107,6 +109,18 @@ "StackCount": 1, "Target": "Self" }, + { + "$type": "ApplyModifier", + "ModifierName": "BloodDebuffModifier_Data", + "StackCount": 1, + "Target": "Self" + }, + { + "$type": "ApplyModifier", + "ModifierName": "BloodDebuffModifier_Count", + "StackCount": 1, + "Target": "Self" + }, { "$type": "SetAbilitySpecialByExpression", "DoRefresh": true, diff --git a/Data/Corin_Card_S_01.json b/Data/Corin_Card_S_01.json index 3827eb43..444a8638 100644 --- a/Data/Corin_Card_S_01.json +++ b/Data/Corin_Card_S_01.json @@ -111,7 +111,7 @@ "Value": 0 }, "AS_Max_AttackRush_HitNum": { - "Value": 30 + "Value": 29 } }, "AbilityStacking": "Unique", diff --git a/Data/Corin_Card_S_02.json b/Data/Corin_Card_S_02.json index 27c4bb1d..a32247b6 100644 --- a/Data/Corin_Card_S_02.json +++ b/Data/Corin_Card_S_02.json @@ -204,17 +204,6 @@ "ChainsawPowerUp" ] }, - { - "AnimatorStateName": "Attack_Branch_03_Enhance_Walk", - "ForceTriggerOnTransitionIn": true, - "FrameCountLow": 0, - "IsLoop": true, - "LayerIndex": 0, - "MaxFrameCountHigh": true, - "ModifierNameList": [ - "WindFieldModifier" - ] - }, { "AnimatorStateName": "Attack_Branch_03_Enhance_Loop", "ForceTriggerOnTransitionIn": true, @@ -224,6 +213,7 @@ "MaxFrameCountHigh": true, "MaxFrameCountLow": false, "ModifierNameList": [ + "OverloadDataModifier", "SlashCountAddModifier", "WindFieldModifier" ] @@ -237,37 +227,10 @@ "MaxFrameCountHigh": true, "MaxFrameCountLow": false, "ModifierNameList": [ + "OverloadDataModifier", "SlashCountAddModifier", "WindFieldModifier" ] - }, - { - "AnimatorStateName": "Attack_Branch_03_Walk_Shake", - "ForceTriggerOnTransitionIn": true, - "FrameCountLow": 0, - "IsLoop": true, - "LayerIndex": 0, - "MaxFrameCountHigh": true, - "MaxFrameCountLow": false, - "ModifierNameList": [ - "SlashCountAddModifier", - "WindFieldModifier", - "OverloadDataModifier" - ] - }, - { - "AnimatorStateName": "Attack_Branch_03_Shake", - "ForceTriggerOnTransitionIn": true, - "FrameCountLow": 0, - "IsLoop": true, - "LayerIndex": 0, - "MaxFrameCountHigh": true, - "MaxFrameCountLow": false, - "ModifierNameList": [ - "SlashCountAddModifier", - "WindFieldModifier", - "OverloadDataModifier" - ] } ] } @@ -315,8 +278,6 @@ { "$type": "ByAnimEventIDs", "AnimEventIDs": [ - "Corin_Attack_Branch_03_AttackProperty_02_02_01", - "Corin_Attack_Branch_03_AttackProperty_02_02_02", "Corin_Attack_Branch_03_AttackProperty_02_03_01", "Corin_Attack_Branch_03_AttackProperty_02_03_02" ] @@ -347,22 +308,17 @@ "$type": "DecreaseSPAction", "Amount": 1, "Percentage": 0, - "Predicates": [ - { - "$type": "ByAnimEventIDs", - "AnimEventIDs": [ - "Corin_Attack_Branch_03_AttackProperty_02_01", - "Corin_Attack_Branch_03_AttackProperty_02_02_01", - "Corin_Attack_Branch_03_AttackProperty_02_02_02", - "Corin_Attack_Branch_03_AttackProperty_02_03_01", - "Corin_Attack_Branch_03_AttackProperty_02_03_02" - ] - } - ], "Target": "Self" } ], "SuccessActions": [ + { + "$type": "SetAnimCtrlerParamAction", + "BoolVal": true, + "ParamName": "Trigger_SawExplode", + "ParamType": 1, + "Target": "Self" + }, { "$type": "SetAbilitySpecialAction", "DoRefresh": true, @@ -370,13 +326,6 @@ "Param": 0, "ParamName": "AS_SlashCount", "ParamType": "Integer" - }, - { - "$type": "SetAnimCtrlerParamAction", - "BoolVal": true, - "ParamName": "Trigger_SawExplode", - "ParamType": 1, - "Target": "Self" } ] }, diff --git a/Data/Corin_SignatureWeapon.json b/Data/Corin_SignatureWeapon.json index c868d2f9..c6841c86 100644 --- a/Data/Corin_SignatureWeapon.json +++ b/Data/Corin_SignatureWeapon.json @@ -54,6 +54,71 @@ "SignatureMaterialWeaponModifier", "SignatureLightWeaponModifier" ] + }, + { + "AnimatorStateName": "Attack_Branch_03", + "FrameCountHigh": 0, + "FrameCountLow": 9, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] + }, + { + "AnimatorStateName": "Attack_Branch_03_Loop", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] + }, + { + "AnimatorStateName": "Attack_Branch_03_Enhance_Loop", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] + }, + { + "AnimatorStateName": "Attack_Branch_03_Explode", + "FrameCountHigh": 51, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": false, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] + }, + { + "AnimatorStateName": "Attack_Branch_03_Enhance_Walk", + "FrameCountHigh": 65, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] } ] } diff --git a/Data/Device_Prop_KickOpenDoor_01_Interact.json b/Data/Device_Prop_KickOpenDoor_01_Interact.json index d28ee311..2b6763fd 100644 --- a/Data/Device_Prop_KickOpenDoor_01_Interact.json +++ b/Data/Device_Prop_KickOpenDoor_01_Interact.json @@ -105,10 +105,6 @@ "$type": "InteractEnableAction", "Enable": false, "Target": "Self" - }, - { - "$type": "LogStringAction", - "LogStr": "Template_Common启动!!!" } ] } diff --git a/Data/Evelyn_Enhance.json b/Data/Evelyn_Enhance.json index 8564f863..7c3f387a 100644 --- a/Data/Evelyn_Enhance.json +++ b/Data/Evelyn_Enhance.json @@ -1600,6 +1600,14 @@ "OnRemoved": [ { "$type": "PopQTEChainOnlyOnceLimitAction", + "Predicates": [ + { + "$type": "ByAbilitySpecial", + "CompareType": "Equal", + "Param": 1, + "ParamName": "QTECheckStart" + } + ], "Target": "Self" }, { @@ -1699,6 +1707,14 @@ "OnRemoved": [ { "$type": "PopQTEChainOnlyOnceLimitAction", + "Predicates": [ + { + "$type": "ByAbilitySpecial", + "CompareType": "Equal", + "Param": 1, + "ParamName": "QTECheckStart" + } + ], "Target": "Self" }, { diff --git a/Data/Geppetto_GravityAbnormal.json b/Data/Geppetto_GravityAbnormal.json index 41a39cad..02e80008 100644 --- a/Data/Geppetto_GravityAbnormal.json +++ b/Data/Geppetto_GravityAbnormal.json @@ -49,6 +49,11 @@ "Monster_Geppetto_OD_AttackProperty_Wall_12", "Monster_Geppetto_OD_AttackProperty_Area_01" ] + }, + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Target" } ], "Target": "Target" @@ -197,6 +202,17 @@ "EventKey": "Gepetto_GravityAbnormalRemoved", "IsGlobal": true }, + { + "$type": "TriggerSoundAction", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Self" + } + ], + "soundActionKey": "SA_Monster_Geppetto_Buff_01_Gravity_Out" + }, { "$type": "HandleAnimatorZoneTagsAction", "AnimatorStateTags": [ diff --git a/Data/Geppetto_PartBreakControl.json b/Data/Geppetto_PartBreakControl.json index 2a26d9ed..5d523537 100644 --- a/Data/Geppetto_PartBreakControl.json +++ b/Data/Geppetto_PartBreakControl.json @@ -174,6 +174,7 @@ { "IsUsePercentage": true, "PropertyType": "CurHP", + "RefPropertyType": "MaxHP", "ValueRangeActions": [ { "HighToValueActions": [ @@ -254,7 +255,21 @@ "PartBreakStunModifier": { "Duration": 8, "ModifierStacking": "Prolong", + "OnAdded": [ + { + "$type": "SetAnimCtrlerParamAction", + "BoolVal": true, + "ParamName": "Bool_IsInPartBreak", + "ParamType": 2 + } + ], "OnRemoved": [ + { + "$type": "SetAnimCtrlerParamAction", + "BoolVal": false, + "ParamName": "Bool_IsInPartBreak", + "ParamType": 2 + }, { "$type": "SetAnimCtrlerParamAction", "ParamName": "Trigger_PartBreakEnd", diff --git a/Data/Geppetto_ResetMove.json b/Data/Geppetto_ResetMove.json index 9ad24808..71e4ed18 100644 --- a/Data/Geppetto_ResetMove.json +++ b/Data/Geppetto_ResetMove.json @@ -274,17 +274,6 @@ ] }, "ScreenEffectModifier": { - "DelayHandlers": [ - { - "DelayTime": 0.5, - "TimeUpActions": [ - { - "$type": "TriggerAbilityAction", - "AbilityName": "Geppetto_OD_SummonEtherArena" - } - ] - } - ], "Duration": -1, "ModifierStacking": "Unique", "OnAdded": [ @@ -321,6 +310,10 @@ ], "Tag": "Geppetto_MuteAid", "Target": "TeamAvatars" + }, + { + "$type": "TriggerAbilityAction", + "AbilityName": "Geppetto_OD_SummonEtherArena" } ], "OnRemoved": [ diff --git a/Data/HugoVlad_WitchTime.json b/Data/HugoVlad_WitchTime.json index dcd828d3..6c58a384 100644 --- a/Data/HugoVlad_WitchTime.json +++ b/Data/HugoVlad_WitchTime.json @@ -176,6 +176,34 @@ "PropertyValue": "%AS_AbnormalResistDelta", "Target": "Self" }, + { + "$type": "ModifyAttackDataAction", + "Predicates": [ + { + "$type": "ByIsInZoneTags", + "Tags": [ + "WithInWitchSlowDown_HugoVlad" + ], + "Target": "Caster" + }, + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Other" + }, + { + "$type": "ByAnimTagList", + "TagList": [ + "AttackAid", + "AssaultAid" + ], + "Target": "Other" + } + ], + "PropertyKey": "Actor_ForceTriggerHit", + "PropertyValue": 1, + "Target": "Self" + }, { "$type": "ModifyAttackDataAction", "Predicates": [ @@ -436,7 +464,10 @@ "ModifierStacking": "Unique", "OnBeingHit": [ { - "$type": "ModifyAttackDataAction", + "$type": "SetAnimCtrlerParamAction", + "BoolVal": true, + "ParamName": "Trigger_Hit", + "ParamType": 1, "Predicates": [ { "$type": "ByIsInZoneTags", @@ -451,9 +482,7 @@ "Target": "Other" } ], - "PropertyKey": "Actor_ForceTriggerHit", - "PropertyValue": 1, - "Target": "Self" + "Target": "Caster" }, { "$type": "SetAnimCtrlerParamAction", @@ -630,7 +659,7 @@ }, { "$type": "TriggerSoundAction", - "Target": "Self", + "Target": "Caster", "soundActionKey": "Stop_SFX_Monster_Skill_HugoVlad_SpecialEvade_Loop" }, { @@ -658,7 +687,7 @@ "OnStart": [ { "$type": "TriggerSoundAction", - "Target": "Self", + "Target": "Caster", "soundActionKey": "Play_SFX_Monster_Skill_HugoVlad_SpecialEvade_Start" }, { @@ -777,8 +806,8 @@ }, { "$type": "TriggerSoundAction", - "Target": "Self", - "soundActionKey": "Stop_SFX_Monster_Skill_HugoVlad_SpecialEvade_Loop" + "Target": "Caster", + "soundActionKey": "Play_SFX_Char_Evade_Success_Hold_End" }, { "$type": "HandleAnimatorZoneTagsAction", @@ -836,8 +865,8 @@ }, { "$type": "TriggerSoundAction", - "Target": "Self", - "soundActionKey": "Play_SFX_Monster_Skill_HugoVlad_SpecialEvade_Start" + "Target": "Caster", + "soundActionKey": "Play_SFX_Char_Evade_Success_Hold_Start" }, { "$type": "HandleAnimatorZoneTagsAction", @@ -996,7 +1025,7 @@ { "$type": "FireEffect", "AttachPointName": "ChestPoint", - "EffectPattern": "Eff_PerfectAid_01", + "EffectPattern": "Eff_PerfectAid_02", "Target": "Self" }, { diff --git a/Data/JaneDoe_SignatureWeapon.json b/Data/JaneDoe_SignatureWeapon.json index 8cae22f1..3ed143d8 100644 --- a/Data/JaneDoe_SignatureWeapon.json +++ b/Data/JaneDoe_SignatureWeapon.json @@ -15,6 +15,19 @@ "SignatureMaterialWeaponModifier", "SignatureLightWeaponModifier" ] + }, + { + "AnimatorStateName": "Attack_ExSpecial_02", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "SignatureMaterialWeaponModifier", + "SignatureLightWeaponModifier" + ] } ] } diff --git a/Data/Level_TBoxBeHitEffect.json b/Data/Level_TBoxBeHitEffect.json index 8e932dcd..3c09aac0 100644 --- a/Data/Level_TBoxBeHitEffect.json +++ b/Data/Level_TBoxBeHitEffect.json @@ -20,10 +20,6 @@ "AttachPointName": "Ctr_Rot", "EffectPattern": "Eff_TriggerShoot_TBox_01_Hit", "Target": "Self" - }, - { - "$type": "LogStringAction", - "LogStr": "靶子成功收到了OnBeAttackLanded!!!" } ] } diff --git a/Data/NPCTransformSplit.json b/Data/NPCTransformSplit.json index 453cf6b2..64654363 100644 Binary files a/Data/NPCTransformSplit.json and b/Data/NPCTransformSplit.json differ diff --git a/Data/Pulchra_ChainAttack.json b/Data/Pulchra_ChainAttack.json index d55d3932..6bbc7c46 100644 --- a/Data/Pulchra_ChainAttack.json +++ b/Data/Pulchra_ChainAttack.json @@ -107,6 +107,70 @@ ] } ], + "OnSwitchTriggered": [ + { + "$type": "SetAnimCtrlerParamAction", + "BoolVal": false, + "ParamName": "Trigger_Switch_Out", + "ParamType": 1, + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Self" + } + ], + "Target": "Self" + }, + { + "$type": "InterruptScreenEffectAction", + "EffectType": "RadialBlur", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Self" + } + ], + "TargetKey": "FireSupport_Trigger_RadialBlur_01" + }, + { + "$type": "InterruptScreenEffectAction", + "EffectType": "Vignette", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Self" + } + ], + "TargetKey": "FireSupport_Trigger_Vignette_01" + }, + { + "$type": "InterruptScreenEffectAction", + "EffectKey": "FireSupport_Trigger_ColorAdjustments_01", + "EffectType": "ColorAdjustments", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Self" + } + ] + }, + { + "$type": "InterruptScreenEffectAction", + "EffectType": "FXFog", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Self" + } + ], + "TargetKey": "FireSupport_Trigger_FXFog_01" + } + ], "OnTeamAvatarConstructed": [ { "$type": "ApplyModifier", @@ -359,6 +423,7 @@ }, { "$type": "CoAttackStartAction", + "MaxSwitchPositionSearchDistance": 40, "Predicates": [ { "$type": "ByAbilitySpecial", @@ -394,6 +459,7 @@ }, { "$type": "CoAttackStartAction", + "MaxSwitchPositionSearchDistance": 40, "Predicates": [ { "$type": "ByAbilitySpecial", @@ -479,6 +545,7 @@ }, { "$type": "CoAttackStartAction", + "MaxSwitchPositionSearchDistance": 40, "Predicates": [ { "$type": "ByOr", @@ -520,6 +587,7 @@ }, { "$type": "CoAttackStartAction", + "MaxSwitchPositionSearchDistance": 40, "Predicates": [ { "$type": "ByOr", @@ -570,6 +638,7 @@ }, { "$type": "CoAttackStartAction", + "MaxSwitchPositionSearchDistance": 40, "Predicates": [ { "$type": "ByOr", @@ -611,6 +680,7 @@ }, { "$type": "CoAttackStartAction", + "MaxSwitchPositionSearchDistance": 40, "Predicates": [ { "$type": "ByOr", @@ -661,6 +731,7 @@ }, { "$type": "CoAttackStartAction", + "MaxSwitchPositionSearchDistance": 40, "Predicates": [ { "$type": "ByPlayerPropertyValue", @@ -706,6 +777,11 @@ "ModifierName": "ChainAttackModifier_ChainAttack_01_First", "MpExecMode": "NotExecuted", "Predicates": [ + { + "$type": "ByAliveState", + "AliveState": "Alive", + "Target": "Caster" + }, { "$type": "ByIsLocalAvatar", "IsLocalAvatar": true, @@ -804,6 +880,11 @@ "ModifierName": "ChainAttackModifier_ChainAttack_01_Repeat", "MpExecMode": "NotExecuted", "Predicates": [ + { + "$type": "ByAliveState", + "AliveState": "Alive", + "Target": "Caster" + }, { "$type": "ByIsLocalAvatar", "IsLocalAvatar": true, diff --git a/Data/Pulchra_MathSkill.json b/Data/Pulchra_MathSkill.json index ae0484ee..38a3bca0 100644 --- a/Data/Pulchra_MathSkill.json +++ b/Data/Pulchra_MathSkill.json @@ -61,6 +61,55 @@ "Pulchra_Attack_AssaultAid_AttackProperty_04" ], "Target": "Self" + }, + { + "$type": "ByNot", + "Predicates": [ + { + "$type": "ByAvatarTalentIndex", + "TalentIndex": 6, + "Target": "Caster" + } + ] + } + ], + "Target": "Target" + }, + { + "$type": "ApplyModifier", + "ModifierName": "Pulchra_MathSkill_Debuff_Talent_06", + "Predicates": [ + { + "$type": "ByAnimEventIDs", + "AnimEventIDs": [ + "Pulchra_Attack_ChainAttack_01_AttackProperty_01", + "Pulchra_Attack_ChainAttack_01_AttackProperty_02", + "Pulchra_Attack_ChainAttack_02_AttackProperty_01", + "Pulchra_Attack_ChainAttack_02_AttackProperty_02", + "Pulchra_Attack_ChainAttack_02_AttackProperty_03", + "Pulchra_Attack_ChainAttack_02_AttackProperty_04", + "Pulchra_Attack_ChainAttack_02_AttackProperty_05", + "Pulchra_Attack_ChainAttack_02_AttackProperty_06", + "Pulchra_Attack_ChainAttack_02_AttackProperty_07", + "Pulchra_Attack_ExSpecial_01_AttackProperty_01", + "Pulchra_Attack_ExSpecial_01_AttackProperty_02", + "Pulchra_Attack_ExSpecial_01_AttackProperty_03", + "Pulchra_Attack_ExSpecial_01_AttackProperty_04", + "Pulchra_Attack_SwitchIn_Attack_AttackProperty_01", + "Pulchra_Attack_SwitchIn_Attack_AttackProperty_02", + "Pulchra_Attack_SwitchIn_Attack_Ex_AttackProperty_01", + "Pulchra_Attack_SwitchIn_Attack_Ex_AttackProperty_02", + "Pulchra_Attack_AssaultAid_AttackProperty_01", + "Pulchra_Attack_AssaultAid_AttackProperty_02", + "Pulchra_Attack_AssaultAid_AttackProperty_03", + "Pulchra_Attack_AssaultAid_AttackProperty_04" + ], + "Target": "Self" + }, + { + "$type": "ByAvatarTalentIndex", + "TalentIndex": 6, + "Target": "Caster" } ], "Target": "Target" @@ -88,16 +137,6 @@ { "$type": "ByMathSkillSuccess", "Target": "Caster" - }, - { - "$type": "ByNot", - "Predicates": [ - { - "$type": "ByAvatarTalentIndex", - "TalentIndex": 6, - "Target": "Caster" - } - ] } ], "PropertyKey": "Actor_AddedDamageRatio", @@ -108,12 +147,41 @@ "$type": "ModifyAttackDataAction", "Predicates": [ { - "$type": "ByMathSkillSuccess", - "Target": "Caster" + "$type": "ByEntityTemplateID", + "EntityType": "Avatar", + "Target": "Other", + "TemplateID": 1351 }, { "$type": "ByAvatarTalentIndex", - "TalentIndex": 6, + "TalentIndex": 1, + "Target": "Caster" + }, + { + "$type": "ByMathSkillSuccess", + "Target": "Caster" + } + ], + "PropertyKey": "Actor_CriticalDelta", + "PropertyValue": "%AddedCriticalDelta", + "Target": "Target" + } + ] + }, + "Pulchra_MathSkill_Debuff_Talent_06": { + "Buff": { + "BuffID": 3000213, + "IsOverrideDuration": true + }, + "Duration": "%AS_Duration", + "IgnoreTimeScale": false, + "ModifierStacking": "Refresh", + "OnBeingHit": [ + { + "$type": "ModifyAttackDataAction", + "Predicates": [ + { + "$type": "ByMathSkillSuccess", "Target": "Caster" } ], diff --git a/Data/Pulchra_UniqueSkill.json b/Data/Pulchra_UniqueSkill.json index b733c035..577f8a63 100644 --- a/Data/Pulchra_UniqueSkill.json +++ b/Data/Pulchra_UniqueSkill.json @@ -106,6 +106,10 @@ ] }, "PulchraUniqueSkillBuff": { + "Buff": { + "BuffID": 3000212, + "IsOverrideDuration": true + }, "Duration": "%AS_Duration", "ModifierStacking": "Replace", "OnAdded": [ @@ -247,7 +251,7 @@ }, "PulchraUniqueSkillBuff_BackStage": { "Buff": { - "BuffID": 3000212, + "BuffID": 3000214, "IsOverrideDuration": true }, "Duration": -1, diff --git a/Data/SilverAnby_UniqueSkill.json b/Data/SilverAnby_UniqueSkill.json index 7a331d2c..11d458b0 100644 --- a/Data/SilverAnby_UniqueSkill.json +++ b/Data/SilverAnby_UniqueSkill.json @@ -1497,6 +1497,11 @@ "SilverAnby_Mark03" ], "Target": "Target" + }, + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Self" } ], "Target": "SelfAttackTarget" diff --git a/Data/Trigger_Activity_CameraEvent.json b/Data/Trigger_Activity_CameraEvent.json index 8252ab54..accecb1b 100644 --- a/Data/Trigger_Activity_CameraEvent.json +++ b/Data/Trigger_Activity_CameraEvent.json @@ -27,7 +27,7 @@ }, { "AnimatorStateName": "Fire_Single", - "FrameCountHigh": 60, + "FrameCountHigh": 30, "FrameCountLow": 0, "LayerIndex": 0, "MaxFrameCountHigh": false, diff --git a/Data/Trigger_Activity_IsSingleFire.json b/Data/Trigger_Activity_IsSingleFire.json index 45beb499..cff6cfc6 100644 --- a/Data/Trigger_Activity_IsSingleFire.json +++ b/Data/Trigger_Activity_IsSingleFire.json @@ -71,7 +71,7 @@ "AnimatorStateName": "Fire_Single", "ForceTriggerOnTransitionIn": true, "ForceTriggerOnTransitionOut": true, - "Frame": 30, + "Frame": 20, "IsLoop": false, "LayerIndex": 0 }, diff --git a/Data/Trigger_Attack_Charge_Manager.json b/Data/Trigger_Attack_Charge_Manager.json index 3bb58864..6f5cb124 100644 --- a/Data/Trigger_Attack_Charge_Manager.json +++ b/Data/Trigger_Attack_Charge_Manager.json @@ -130,17 +130,6 @@ ], "IsSeam": false }, - { - "$type": "AttachZoneTagWithModifierMixin", - "ConfigList": [ - { - "ModifierNameList": [ - "AidAttack_Common_CD_Modifier_Controller" - ], - "ZoneTag": "AidAttack_Common_Prev" - } - ] - }, { "$type": "ActwithStateFrameMixin", "ConfigList": [ @@ -538,11 +527,32 @@ "Duration": -1, "IgnoreTimeScale": false, "ModifierStacking": "Unique", - "OnSwitchTriggered": [ + "OnSwitchInBegin": [ { "$type": "ApplyModifier", "ModifierName": "AidAttack_Common_CD_Modifier", - "Target": "Self" + "Predicates": [ + { + "$type": "ByAidAttackSwitchDataTagList", + "SwitchDataTagList": [ + "TriggerAidAttackTag" + ] + } + ], + "Target": "Caster" + }, + { + "$type": "RemoveModifier", + "ModifierName": "AidAttack_Common_CD_Modifier_Controller", + "Predicates": [ + { + "$type": "ByAidAttackSwitchDataTagList", + "SwitchDataTagList": [ + "TriggerAidAttackTag" + ] + } + ], + "Target": "TeamAvatars" } ] }, @@ -759,6 +769,15 @@ ], "IsAdd": true, "Target": "Self" + }, + { + "$type": "TryOpenAidAttackWindowWithSwitchDataTagAction", + "CheckZoneTagList": [ + "AidAttack_Common_Prev" + ], + "SwitchDataTagList": [ + "TriggerAidAttackTag" + ] } ], "OnRemoved": [ @@ -934,6 +953,34 @@ } ], "Target": "Self" + }, + { + "$type": "ApplyModifier", + "ModifierName": "AidAttack_Common_CD_Modifier_Controller", + "Predicates": [ + { + "$type": "ByCauseStun", + "IsCauseStun": true + }, + { + "$type": "ByNot", + "Predicates": [ + { + "$type": "ByHasModifier", + "ModifierNameList": [ + "AidAttack_Common_CD_Modifier" + ], + "Target": "Self" + } + ] + } + ], + "Target": "TeamAvatars" + }, + { + "$type": "RemoveModifier", + "ModifierName": "AidAttack_Common_CD_Modifier_Controller", + "Target": "Caster" } ], "OnRemoved": [ diff --git a/Data/Trigger_AutoTriggerEvade.json b/Data/Trigger_AutoTriggerEvade.json index 334da1a3..8c80a4db 100644 --- a/Data/Trigger_AutoTriggerEvade.json +++ b/Data/Trigger_AutoTriggerEvade.json @@ -14,6 +14,42 @@ "ModifierNameList": [ "Trigger_AutoTriggerEvade_Modifier" ] + }, + { + "AnimatorStateName": "Attack_SpecialEvade_Left_Start", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "Trigger_AutoTriggerEvade_Modifier" + ] + }, + { + "AnimatorStateName": "Attack_SpecialEvade_Right_Start", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "Trigger_AutoTriggerEvade_Modifier" + ] + }, + { + "AnimatorStateName": "Attack_SpecialEvade_Back_Start", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "Trigger_AutoTriggerEvade_Modifier" + ] } ] } @@ -465,6 +501,14 @@ "AutoTriggerEvadeCD" ], "Target": "Self" + }, + { + "$type": "ByAnimCtrlerParam", + "BoolVal": false, + "CompareType": "Equal", + "ParamName": "Trigger_PerfectEvade", + "ParamType": 1, + "Target": "Self" } ], "Target": "Self" @@ -485,6 +529,14 @@ "AutoTriggerEvadeCD" ], "Target": "Self" + }, + { + "$type": "ByAnimCtrlerParam", + "BoolVal": false, + "CompareType": "Equal", + "ParamName": "Trigger_PerfectEvade", + "ParamType": 1, + "Target": "Self" } ], "Target": "Self" @@ -506,6 +558,14 @@ "AutoTriggerEvadeCD" ], "Target": "Self" + }, + { + "$type": "ByAnimCtrlerParam", + "BoolVal": false, + "CompareType": "Equal", + "ParamName": "Trigger_PerfectEvade", + "ParamType": 1, + "Target": "Self" } ], "Target": "Self" @@ -527,6 +587,14 @@ "AutoTriggerEvadeCD" ], "Target": "Self" + }, + { + "$type": "ByAnimCtrlerParam", + "BoolVal": false, + "CompareType": "Equal", + "ParamName": "Trigger_PerfectEvade", + "ParamType": 1, + "Target": "Self" } ], "Target": "Self" diff --git a/Data/Trigger_ExSp.json b/Data/Trigger_ExSp.json index 3a3c344d..e0196e65 100644 --- a/Data/Trigger_ExSp.json +++ b/Data/Trigger_ExSp.json @@ -197,9 +197,36 @@ { "$type": "SetModifierDurationAction", "ModifierName": "StartHotStateModifier", - "ModifyType": "Add", + "ModifyType": "Replace", + "Predicates": [ + { + "$type": "ByModifierDuration", + "CompareType": "GreaterEqual", + "CompareValue": 8, + "ModifierTargetType": "CurTargetAbility", + "Target": "Caster", + "TargetModifier": "StartHotStateModifier" + } + ], "Target": "Self", - "Value": 10 + "Value": 20 + }, + { + "$type": "SetModifierDurationAction", + "ModifierName": "StartHotStateModifier", + "ModifyType": "Add", + "Predicates": [ + { + "$type": "ByModifierDuration", + "CompareType": "Less", + "CompareValue": 8, + "ModifierTargetType": "CurTargetAbility", + "Target": "Caster", + "TargetModifier": "StartHotStateModifier" + } + ], + "Target": "Self", + "Value": 12 } ] }, @@ -357,9 +384,36 @@ { "$type": "SetModifierDurationAction", "ModifierName": "StartHotStateModifier", - "ModifyType": "Add", + "ModifyType": "Replace", + "Predicates": [ + { + "$type": "ByModifierDuration", + "CompareType": "GreaterEqual", + "CompareValue": 12, + "ModifierTargetType": "CurTargetAbility", + "Target": "Caster", + "TargetModifier": "StartHotStateModifier" + } + ], "Target": "Self", - "Value": 6 + "Value": 20 + }, + { + "$type": "SetModifierDurationAction", + "ModifierName": "StartHotStateModifier", + "ModifyType": "Add", + "Predicates": [ + { + "$type": "ByModifierDuration", + "CompareType": "Less", + "CompareValue": 12, + "ModifierTargetType": "CurTargetAbility", + "Target": "Caster", + "TargetModifier": "StartHotStateModifier" + } + ], + "Target": "Self", + "Value": 8 } ] }, @@ -396,7 +450,7 @@ ] }, "StartHotStateModifier": { - "Duration": 6, + "Duration": 8, "IgnoreTimeScale": false, "ModifierStacking": "Unique", "OnRemoved": [ diff --git a/Data/Trigger_Talent_03.json b/Data/Trigger_Talent_03.json index b4708634..1298dfa2 100644 --- a/Data/Trigger_Talent_03.json +++ b/Data/Trigger_Talent_03.json @@ -34,11 +34,50 @@ "Trigger_Attack_ChainAttack_Extra_AttackProperty_02", "Trigger_Attack_ChainAttack_Extra_AttackProperty_03" ], - "Target": "Self" + "Target": "Caster" + }, + { + "$type": "ByPlayerPropertyValue", + "CompareType": "Greater", + "CustomNumerator": "HotState", + "IsUsePercent": false, + "Numerator": "Custom", + "Target": "Caster", + "Val1": 0 } ], "Target": "Target" } + ], + "OnPatternAttackLandedFinished": [ + { + "$type": "ApplyModifier", + "ModifierName": "Trigger_Attack_ChainAttack_Talent_ReSet_Modifiers", + "Predicates": [ + { + "$type": "ByAnimEventIDs", + "AnimEventIDs": [ + "Trigger_Attack_ChainAttack_Plus_2_AttackProperty_01", + "Trigger_Attack_ChainAttack_Plus_2_AttackProperty_02", + "Trigger_Attack_ChainAttack_Plus_2_AttackProperty_03", + "Trigger_Attack_ChainAttack_Extra_AttackProperty_01", + "Trigger_Attack_ChainAttack_Extra_AttackProperty_02", + "Trigger_Attack_ChainAttack_Extra_AttackProperty_03" + ], + "Target": "Caster" + }, + { + "$type": "ByPlayerPropertyValue", + "CompareType": "Greater", + "CustomNumerator": "HotState", + "IsUsePercent": false, + "Numerator": "Custom", + "Target": "Caster", + "Val1": 0 + } + ], + "Target": "Caster" + } ] }, "Trigger_Attack_ChainAttack_Talent_AttackProperty_Modifiers": { @@ -49,19 +88,14 @@ "$type": "DamageByAttackPropertyAction", "AnimEventID": "Trigger_Attack_ChainAttack_Talent_AttackProperty_01", "Attacker": "Caster", - "Predicates": [ - { - "$type": "ByPlayerPropertyValue", - "CompareType": "Greater", - "CustomNumerator": "HotState", - "IsUsePercent": false, - "Numerator": "Custom", - "Target": "Caster", - "Val1": 0 - } - ], "Target": "Self" - }, + } + ] + }, + "Trigger_Attack_ChainAttack_Talent_ReSet_Modifiers": { + "Duration": 0.1, + "ModifierStacking": "Unique", + "OnAdded": [ { "$type": "ModifyProperty", "Amount": -1, diff --git a/Data/Trigger_Talent_04.json b/Data/Trigger_Talent_04.json index 9cb64d42..2bc644fd 100644 --- a/Data/Trigger_Talent_04.json +++ b/Data/Trigger_Talent_04.json @@ -306,6 +306,44 @@ "Target": "Caster", "ValueType": "Float" } + ], + "OnPatternAttackLandedFinished": [ + { + "$type": "ApplyModifier", + "ModifierName": "Trigger_SuperAttackCost_Remove_Modifiers", + "Predicates": [ + { + "$type": "ByAnimEventIDs", + "AnimEventIDs": [ + "Trigger_Attack_Normal_Charge_Loop_AttackProperty_01", + "Trigger_Attack_Normal_Charge_Loop_AttackProperty_02", + "Trigger_Attack_Normal_Charge_Loop_AttackProperty_03", + "Trigger_Attack_Normal_Charge_Evade_Back_AttackProperty_01", + "Trigger_Attack_Normal_Charge_Evade_Back_AttackProperty_02", + "Trigger_Attack_Normal_Charge_Evade_Back_AttackProperty_03", + "Trigger_Attack_Normal_Charge_Evade_Left_AttackProperty_01", + "Trigger_Attack_Normal_Charge_Evade_Left_AttackProperty_02", + "Trigger_Attack_Normal_Charge_Evade_Left_AttackProperty_03", + "Trigger_Attack_Normal_Charge_Evade_Right_AttackProperty_01", + "Trigger_Attack_Normal_Charge_Evade_Right_AttackProperty_02", + "Trigger_Attack_Normal_Charge_Evade_Right_AttackProperty_03", + "Trigger_Attack_Normal_Charge_Finish_AttackProperty_01", + "Trigger_Attack_Normal_Charge_Finish_AttackProperty_02", + "Trigger_Attack_Normal_Charge_Finish_AttackProperty_03", + "Trigger_Attack_Normal_Charge_Finish_AttackProperty_04" + ], + "Target": "Self" + }, + { + "$type": "ByHasModifier", + "ModifierNameList": [ + "TalentSuperPointModifier" + ], + "Target": "Self" + } + ], + "Target": "Self" + } ] }, "TalentSuperPointModifier": { @@ -342,7 +380,13 @@ "AnimEventID": "Trigger_Attack_Normal_Charge_SuperAttack_AttackProperty_01", "Attacker": "Caster", "Target": "Self" - }, + } + ] + }, + "Trigger_SuperAttackCost_Remove_Modifiers": { + "Duration": 0.3, + "ModifierStacking": "Unique", + "OnAdded": [ { "$type": "ApplyModifier", "ModifierName": "TalentSuperAttackCostModifier", diff --git a/Data/Trigger_UniqueSkill.json b/Data/Trigger_UniqueSkill.json index 1e709935..ae4a5646 100644 --- a/Data/Trigger_UniqueSkill.json +++ b/Data/Trigger_UniqueSkill.json @@ -33,7 +33,7 @@ }, { "AnimatorStateName": "Attack_ChainAttack", - "FrameCountHigh": 41, + "FrameCountHigh": 52, "FrameCountLow": 0, "IsLoop": false, "LayerIndex": 0, @@ -57,7 +57,7 @@ }, { "AnimatorStateName": "Attack_ChainAttack_Extra", - "FrameCountHigh": 41, + "FrameCountHigh": 52, "FrameCountLow": 0, "IsLoop": false, "LayerIndex": 0, @@ -81,7 +81,7 @@ }, { "AnimatorStateName": "Attack_ChainAttack_Talent", - "FrameCountHigh": 53, + "FrameCountHigh": 52, "FrameCountLow": 0, "IsLoop": false, "LayerIndex": 0, @@ -93,7 +93,7 @@ }, { "AnimatorStateName": "Attack_ChainAttack_Talent", - "FrameCountHigh": 53, + "FrameCountHigh": 52, "FrameCountLow": 0, "IsLoop": false, "LayerIndex": 0, @@ -105,7 +105,7 @@ }, { "AnimatorStateName": "Attack_ChainAttack_Talent", - "FrameCountHigh": 53, + "FrameCountHigh": 52, "FrameCountLow": 0, "IsLoop": false, "LayerIndex": 0, @@ -130,7 +130,7 @@ }, { "AnimatorStateName": "Attack_ChainAttack_Plus_1", - "FrameCountHigh": 70, + "FrameCountHigh": 52, "FrameCountLow": 0, "IsLoop": false, "LayerIndex": 0, @@ -164,6 +164,20 @@ "ChainAttackModifier_Interrupt_Animation", "ChainAttackModifier_LowAttackingTag" ] + }, + { + "AnimatorStateName": "InstantOut", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "ChainAttackModifier_LowAttackingTag", + "ChainAttackModifier_Interrupt_Animation", + "ChainAttackModifier_Interrupt_Effect" + ] } ] }, @@ -397,12 +411,6 @@ "AS_LowChainAttack_Talent_0_Negative": { "Value": -3 }, - "AS_LowChainAttack_Talent_1_Cost": { - "Value": 2 - }, - "AS_LowChainAttack_Talent_1_Negative": { - "Value": -2 - }, "AS_LowChainAttack_Talent_1_UpLimit": { "Value": 125 }, @@ -442,6 +450,22 @@ "IsAdd": true, "Target": "Self" }, + { + "$type": "SetAbilitySpecialAction", + "ModifyFunction": "Replace", + "Param": "%AS_LowChainAttack_Talent_0_Cost", + "ParamName": "AS_LowChainAttack_Cost", + "ParamType": "Integer", + "Target": "Caster" + }, + { + "$type": "SetAbilitySpecialAction", + "ModifyFunction": "Replace", + "Param": "%AS_LowChainAttack_Talent_0_Negative", + "ParamName": "AS_LowChainAttack_Cost_Negative", + "ParamType": "Integer", + "Target": "Caster" + }, { "$type": "BranchOperator", "Conditions": [ @@ -467,22 +491,6 @@ "ParamName": "AS_StunDamageTakeRatio", "ParamType": "Float", "Target": "Caster" - }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_0_Cost", - "ParamName": "AS_LowChainAttack_Cost", - "ParamType": "Integer", - "Target": "Caster" - }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_0_Negative", - "ParamName": "AS_LowChainAttack_Cost_Negative", - "ParamType": "Integer", - "Target": "Caster" } ], "SuccessActions": [ @@ -497,27 +505,11 @@ { "$type": "SetAbilitySpecialByExpression", "DoRefresh": true, - "Expression": "specials(AS_StunDamageTakeRatio_Talent_0)+(1+specials(AS_StunDamageTakeRatio_Talent_1_Para))", + "Expression": "specials(AS_StunDamageTakeRatio_Talent_0)+(specials(AS_StunDamageTakeRatio_Talent_1_Para))", "ParamName": "AS_StunDamageTakeRatio", "Target": "Self", "ValueType": "Float" }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_1_Cost", - "ParamName": "AS_LowChainAttack_Cost", - "ParamType": "Integer", - "Target": "Caster" - }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_1_Negative", - "ParamName": "AS_LowChainAttack_Cost_Negative", - "ParamType": "Integer", - "Target": "Caster" - }, { "$type": "ModifyProperty", "Amount": "%AS_LowChainAttack_Talent_1_UpLimit", @@ -558,16 +550,99 @@ "Target": "Target" } ], - "OnSwitchInBegin": [ + "OnSwitchTriggered": [ { "$type": "SetAnimCtrlerParamAction", "BoolVal": false, "ParamName": "Trigger_Switch_Out", "ParamType": 1, + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Caster" + } + ], "Target": "Self" + }, + { + "$type": "InterruptScreenEffectAction", + "EffectType": "RadialBlur", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Caster" + } + ], + "TargetKey": "FireSupport_Trigger_RadialBlur_01" + }, + { + "$type": "InterruptScreenEffectAction", + "EffectType": "Vignette", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Caster" + } + ], + "TargetKey": "FireSupport_Trigger_Vignette_01" + }, + { + "$type": "InterruptScreenEffectAction", + "EffectKey": "FireSupport_Trigger_ColorAdjustments_01", + "EffectType": "ColorAdjustments", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Caster" + } + ] + }, + { + "$type": "InterruptScreenEffectAction", + "EffectType": "FXFog", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Caster" + } + ], + "TargetKey": "FireSupport_Trigger_FXFog_01" + }, + { + "$type": "InterruptScreenEffectAction", + "EffectType": "LensDistortion", + "Predicates": [ + { + "$type": "ByIsLocalAvatar", + "IsLocalAvatar": true, + "Target": "Caster" + } + ], + "TargetKey": "FireSupport_Trigger_LensDistortion_01" } ], "OnTeamAvatarConstructed": [ + { + "$type": "SetAbilitySpecialAction", + "ModifyFunction": "Replace", + "Param": "%AS_LowChainAttack_Talent_0_Cost", + "ParamName": "AS_LowChainAttack_Cost", + "ParamType": "Integer", + "Target": "Caster" + }, + { + "$type": "SetAbilitySpecialAction", + "ModifyFunction": "Replace", + "Param": "%AS_LowChainAttack_Talent_0_Negative", + "ParamName": "AS_LowChainAttack_Cost_Negative", + "ParamType": "Integer", + "Target": "Caster" + }, { "$type": "BranchOperator", "Conditions": [ @@ -593,22 +668,6 @@ "ParamName": "AS_StunDamageTakeRatio", "ParamType": "Float", "Target": "Caster" - }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_0_Cost", - "ParamName": "AS_LowChainAttack_Cost", - "ParamType": "Integer", - "Target": "Caster" - }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_0_Negative", - "ParamName": "AS_LowChainAttack_Cost_Negative", - "ParamType": "Integer", - "Target": "Caster" } ], "SuccessActions": [ @@ -628,22 +687,6 @@ "Target": "Self", "ValueType": "Float" }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_1_Cost", - "ParamName": "AS_LowChainAttack_Cost", - "ParamType": "Integer", - "Target": "Caster" - }, - { - "$type": "SetAbilitySpecialAction", - "ModifyFunction": "Replace", - "Param": "%AS_LowChainAttack_Talent_1_Negative", - "ParamName": "AS_LowChainAttack_Cost_Negative", - "ParamType": "Integer", - "Target": "Caster" - }, { "$type": "ModifyProperty", "Amount": "%AS_LowChainAttack_Talent_1_UpLimit", @@ -2184,8 +2227,8 @@ "$type": "ByNot", "Predicates": [ { - "$type": "ByHasModifier", - "ModifierNameList": [ + "$type": "ByIsInZoneTags", + "Tags": [ "ChainAttackModifier_LowAttackingTag" ], "Target": "Caster" @@ -2264,8 +2307,8 @@ "$type": "ByNot", "Predicates": [ { - "$type": "ByHasModifier", - "ModifierNameList": [ + "$type": "ByIsInZoneTags", + "Tags": [ "ChainAttackModifier_LowAttackingTag" ], "Target": "Caster" @@ -2273,16 +2316,6 @@ ], "Target": "Caster" }, - { - "$type": "ByNot", - "Predicates": [ - { - "$type": "ByCauseStun", - "IsCauseStun": true - } - ], - "Target": "Self" - }, { "$type": "ByNot", "Predicates": [ @@ -2534,7 +2567,27 @@ }, "ChainAttackModifier_LowAttackingTag": { "Duration": -1, - "ModifierStacking": "Unique" + "ModifierStacking": "Unique", + "OnAdded": [ + { + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "ChainAttackModifier_LowAttackingTag" + ], + "IsAdd": true, + "Target": "Caster" + } + ], + "OnRemoved": [ + { + "$type": "HandleAnimatorZoneTagsAction", + "AnimatorStateTags": [ + "ChainAttackModifier_LowAttackingTag" + ], + "IsAdd": false, + "Target": "Caster" + } + ] }, "ChainAttackModifier_PlusCombo": { "Duration": 0.1, diff --git a/Data/TyphonDestroyer_EnhanceControl.json b/Data/TyphonDestroyer_EnhanceControl.json index 4f7fd940..62e03cbc 100644 --- a/Data/TyphonDestroyer_EnhanceControl.json +++ b/Data/TyphonDestroyer_EnhanceControl.json @@ -75,6 +75,12 @@ "Amount": "%AS_PartStun", "Percentage": 0, "Target": "Self" + }, + { + "$type": "ShowSpecialDamageTextAction", + "AttachPoint": "MiddlePoint", + "Target": "Caster", + "TextType": "PartDestroy" } ], "AnimatorStateName": "Hit_Parry_Heavy_Left", @@ -91,6 +97,12 @@ "Amount": "%AS_PartStun", "Percentage": 0, "Target": "Self" + }, + { + "$type": "ShowSpecialDamageTextAction", + "AttachPoint": "MiddlePoint", + "Target": "Caster", + "TextType": "PartDestroy" } ], "AnimatorStateName": "Hit_Parry_Heavy_Right", @@ -125,42 +137,6 @@ } ], "OnBeingHitPre": [ - { - "$type": "ShowSpecialDamageTextAction", - "AttachPoint": "MiddlePoint", - "Predicates": [ - { - "$type": "ByAnimTagList", - "TagList": [ - "ParryAid" - ] - }, - { - "$type": "ByNot", - "Predicates": [ - { - "$type": "ByIsInZoneTags", - "Tags": [ - "Enhance_Left" - ] - } - ] - }, - { - "$type": "ByNot", - "Predicates": [ - { - "$type": "ByIsInZoneTags", - "Tags": [ - "Enhance_Right" - ] - } - ] - } - ], - "Target": "Caster", - "TextType": "PartDestroy" - } ], "OnHitOther": [ { diff --git a/FileCfg/1033767438085951951.json b/FileCfg/1033767438085951951.json index 6c03d4e8..2f3eb092 100644 --- a/FileCfg/1033767438085951951.json +++ b/FileCfg/1033767438085951951.json @@ -72,9 +72,9 @@ "GFKMAFDNHOD": [], "HAPFPBPKJHF": [ 0, - 9000, - 11000, - 13000 + 8000, + 10000, + 12000 ], "GLKCAKOJEAL": 1 }, @@ -124,9 +124,9 @@ "GFKMAFDNHOD": [], "HAPFPBPKJHF": [ 0, - 8000, - 10000, - 12000 + 7000, + 9000, + 11000 ], "GLKCAKOJEAL": 5 } diff --git a/FileCfg/10361992832664957090.json b/FileCfg/10361992832664957090.json index ee3e39b1..16df9628 100644 --- a/FileCfg/10361992832664957090.json +++ b/FileCfg/10361992832664957090.json @@ -744,7 +744,7 @@ { "DJOKBCBOMAC": 3800141, "NANNCEFNLPL": "TitleCondition_Achievement", - "BNBDCMNACCJ": "30070060", + "BNBDCMNACCJ": "1040140557", "GFDIGOGJFFA": "TitlePreCondition_HollowZero03", "LGGGBMNFDOE": [ 2005002 @@ -761,7 +761,7 @@ { "DJOKBCBOMAC": 3800142, "NANNCEFNLPL": "TitleCondition_Achievement", - "BNBDCMNACCJ": "30070060", + "BNBDCMNACCJ": "1040140557", "GFDIGOGJFFA": "TitlePreCondition_HollowZero03", "LGGGBMNFDOE": [ 2005003 @@ -1018,7 +1018,9 @@ "EAJHLHCMNAM": 6, "OLANPFHKOCI": "TitleText_3800156", "LMAKOFAEFBC": 2, - "MGHPBGDNANO": [], + "MGHPBGDNANO": [ + "Avatar_Female_Size03_Trigger" + ], "MHKKANFLAMM": "Assets/NapResources/UI/Materials/General/UI_Title_Trust.mat", "IDKHAIAIHFO": "f58661", "DMPFPDPNINP": "fe357b" @@ -1035,7 +1037,9 @@ "EAJHLHCMNAM": 6, "OLANPFHKOCI": "TitleText_3800157", "LMAKOFAEFBC": 2, - "MGHPBGDNANO": [], + "MGHPBGDNANO": [ + "Avatar_Female_Size02_Longinus" + ], "MHKKANFLAMM": "Assets/NapResources/UI/Materials/General/UI_Title_Trust.mat", "IDKHAIAIHFO": "f58661", "DMPFPDPNINP": "fe357b" @@ -1052,7 +1056,9 @@ "EAJHLHCMNAM": 6, "OLANPFHKOCI": "TitleText_3800158", "LMAKOFAEFBC": 2, - "MGHPBGDNANO": [], + "MGHPBGDNANO": [ + "Avatar_Female_Size03_Pulchra" + ], "MHKKANFLAMM": "Assets/NapResources/UI/Materials/General/UI_Title_Trust.mat", "IDKHAIAIHFO": "f58661", "DMPFPDPNINP": "fe357b" @@ -1060,7 +1066,7 @@ { "DJOKBCBOMAC": 3800159, "NANNCEFNLPL": "TitleCondition_3800159", - "BNBDCMNACCJ": "30070060", + "BNBDCMNACCJ": "1040140557", "GFDIGOGJFFA": "TitlePreCondition_HollowZero03", "LGGGBMNFDOE": [], "PHLEAIOFLKP": "", @@ -1075,7 +1081,7 @@ { "DJOKBCBOMAC": 3800160, "NANNCEFNLPL": "TitleCondition_Achievement", - "BNBDCMNACCJ": "30070060", + "BNBDCMNACCJ": "1040140557", "GFDIGOGJFFA": "TitlePreCondition_HollowZero03", "LGGGBMNFDOE": [ 2005009 diff --git a/FileCfg/10997546003453637036.json b/FileCfg/10997546003453637036.json index b726465e..e7355f1a 100644 --- a/FileCfg/10997546003453637036.json +++ b/FileCfg/10997546003453637036.json @@ -58,7 +58,7 @@ "OPFEAMDPIAG": 406501, "HLEAEPDDBLE": 2, "OMJDNILGBOD": 406501, - "ELPKGCDKJGL": 1001, + "ELPKGCDKJGL": 1006, "ICDEDELJKPI": 1, "EECGBALDFOH": [ 101 diff --git a/FileCfg/12802194980258273454.json b/FileCfg/12802194980258273454.json index 1c284ba0..bd0d3df4 100644 --- a/FileCfg/12802194980258273454.json +++ b/FileCfg/12802194980258273454.json @@ -332,7 +332,7 @@ "OPFEAMDPIAG": 14136103, "AAJGKDEGKMO": 1030004, "DDGELGBNCGL": "", - "IDFPCEEBEAF": 18132103, + "IDFPCEEBEAF": 14136103, "IKDJDPPLNOM": 141361, "DBEGKPBDLMF": "14136108,14136109,14136110,14136111" }, @@ -572,7 +572,7 @@ "OPFEAMDPIAG": 16135103, "AAJGKDEGKMO": 1030004, "DDGELGBNCGL": "", - "IDFPCEEBEAF": 18131103, + "IDFPCEEBEAF": 16135103, "IKDJDPPLNOM": 161351, "DBEGKPBDLMF": "16135108,16135109,16135110,16135111" }, diff --git a/FileCfg/13653452728974023680.json b/FileCfg/13653452728974023680.json index 71cce204..408f4cc4 100644 --- a/FileCfg/13653452728974023680.json +++ b/FileCfg/13653452728974023680.json @@ -2,7 +2,7 @@ "GHFLHABGNDH": [ { "CKCLOFPICJP": 2, - "FLODMDHBDCO": "2025-05-12 04:00:00", + "FLODMDHBDCO": "2026-05-12 04:00:00", "LJFBDEDNPOC": "2024-07-04 04:00:00", "DPCJPNODKPI": 42 } diff --git a/FileCfg/14396763538925579954.json b/FileCfg/14396763538925579954.json index ad1e0111..30d5619e 100644 --- a/FileCfg/14396763538925579954.json +++ b/FileCfg/14396763538925579954.json @@ -3,7 +3,7 @@ { "OPFEAMDPIAG": 101, "AONDCPPKFAI": 100, - "MLKEJAKFNOK": 3, + "MLKEJAKFNOK": 1, "IIKGIHJHCEJ": 10, "JGIAGGPCFFL": 200 }, @@ -17,7 +17,7 @@ { "OPFEAMDPIAG": 103, "AONDCPPKFAI": 200, - "MLKEJAKFNOK": 6, + "MLKEJAKFNOK": 5, "IIKGIHJHCEJ": 20, "JGIAGGPCFFL": 400 }, diff --git a/FileCfg/16179374026644280624.json b/FileCfg/16179374026644280624.json index 5cf132ab..d2bbef1b 100644 --- a/FileCfg/16179374026644280624.json +++ b/FileCfg/16179374026644280624.json @@ -10265,7 +10265,7 @@ { "JHHHFEOPAEC": 1205192501, "IPPHJMGEKHM": "Assets/NapResources/Data/MainCityNodeGraph/DateFollowTalkEllen.json", - "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Stall_Partner", + "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Stall_Partner;useSkin,false", "ELCPMKCIFLF": [], "NHMJOIKEFIJ": [ 1 @@ -10289,7 +10289,7 @@ { "JHHHFEOPAEC": 1205192601, "IPPHJMGEKHM": "Assets/NapResources/Data/MainCityNodeGraph/DateFollowTalkEllen.json", - "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Subway_Partner", + "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Subway_Partner;useSkin,false", "ELCPMKCIFLF": [], "NHMJOIKEFIJ": [], "DGEEFIAKMKH": "", @@ -10311,7 +10311,7 @@ { "JHHHFEOPAEC": 1205192701, "IPPHJMGEKHM": "Assets/NapResources/Data/MainCityNodeGraph/DateFollowTalkEllen.json", - "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Random_Partner", + "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Random_Partner;useSkin,false", "ELCPMKCIFLF": [], "NHMJOIKEFIJ": [], "DGEEFIAKMKH": "", @@ -10333,7 +10333,7 @@ { "JHHHFEOPAEC": 1205192801, "IPPHJMGEKHM": "Assets/NapResources/Data/MainCityNodeGraph/DateFollowTalkEllen.json", - "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Subway_Partner", + "MACPOBJFGPP": "bornPosition,Pos_Date_Section1_Subway_Partner;useSkin,false", "ELCPMKCIFLF": [], "NHMJOIKEFIJ": [], "DGEEFIAKMKH": "", diff --git a/FileCfg/16853304864289304300.json b/FileCfg/16853304864289304300.json index 4d1bef66..93d2b1eb 100644 --- a/FileCfg/16853304864289304300.json +++ b/FileCfg/16853304864289304300.json @@ -1912,7 +1912,7 @@ "KHEKMEMGABJ": "", "BEKPPEBCAJE": "", "HENFAEPGLLF": 1, - "JOOLCGLAHJP": "30070099", + "JOOLCGLAHJP": "1040140491", "DFGHOMEHLNO": "", "LBGMOMKKMEL": "0", "HIHOCGFCGNF": true, @@ -2041,8 +2041,8 @@ "LCJKHPINDKN": "", "KHEKMEMGABJ": "", "BEKPPEBCAJE": "", - "HENFAEPGLLF": 1, - "JOOLCGLAHJP": "30070099", + "HENFAEPGLLF": 0, + "JOOLCGLAHJP": "", "DFGHOMEHLNO": "", "LBGMOMKKMEL": "0", "HIHOCGFCGNF": true, diff --git a/FileCfg/17494673306553180103.json b/FileCfg/17494673306553180103.json index 211b96a5..6cc3eb24 100644 --- a/FileCfg/17494673306553180103.json +++ b/FileCfg/17494673306553180103.json @@ -19,6 +19,7 @@ "LBGAOAMJHLJ": "Abysss2_AreaDesc_03", "JFGDIEJGOCC": [ "Battle", + "BattleNormal", "Tarot", "SacrificeBringerHand", "GeppettoTarot", @@ -50,6 +51,7 @@ "LBGAOAMJHLJ": "Abysss2_AreaDesc_04", "JFGDIEJGOCC": [ "Battle", + "BattleNormal", "Relic", "SacrificeBringerHand", "GeppettoTarot", @@ -107,6 +109,7 @@ "LBGAOAMJHLJ": "Abysss2_AreaDesc_15", "JFGDIEJGOCC": [ "Battle", + "BattleNormal", "Coin", "SacrificeBringerHand", "GeppettoTarot", @@ -138,6 +141,7 @@ "LBGAOAMJHLJ": "Abysss2_AreaDesc_03", "JFGDIEJGOCC": [ "Battle", + "BattleNormal", "Coin", "AgentAssist", "GeppettoTarot" @@ -167,6 +171,7 @@ "LBGAOAMJHLJ": "Abysss2_AreaDesc_15", "JFGDIEJGOCC": [ "Battle", + "BattleNormal", "Tarot", "AgentAssist", "GeppettoTarot" diff --git a/FileCfg/2206529640176526753.json b/FileCfg/2206529640176526753.json index 9f7d25c3..f4c86422 100644 --- a/FileCfg/2206529640176526753.json +++ b/FileCfg/2206529640176526753.json @@ -1177,7 +1177,7 @@ ], "CGIFHPMJOHO": "", "GPEANFBKGIF": "Journey_QuestName_1060101", - "HIOIHLHPCIH": "1040140547", + "HIOIHLHPCIH": "1040140646", "GFJBAFBJMJB": "Journey_ChapterName_160", "KOAJOFBMANJ": "", "OEGNJPJCIOI": 1, @@ -1230,7 +1230,7 @@ "GPEANFBKGIF": "QuestDesc_10010603", "HIOIHLHPCIH": "1040140651", "GFJBAFBJMJB": "QuestName_10010603", - "KOAJOFBMANJ": "Assets/NapResources/UI/Sprite/A1DynamicLoad/InterKnot/UnPacker/CourseImg/Mission/Journey_Mission_1050603.png", + "KOAJOFBMANJ": "Assets/NapResources/UI/Sprite/A1DynamicLoad/InterKnot/UnPacker/CourseImg/Mission/Journey_Mission_1060203.png", "OEGNJPJCIOI": 2, "NHEMAJLEOFK": 160, "BIFACBBBAOJ": [], @@ -1247,7 +1247,7 @@ "GPEANFBKGIF": "QuestDesc_10010604", "HIOIHLHPCIH": "1040140652", "GFJBAFBJMJB": "QuestName_10010604", - "KOAJOFBMANJ": "Assets/NapResources/UI/Sprite/A1DynamicLoad/InterKnot/UnPacker/CourseImg/Mission/Journey_Mission_1050604.png", + "KOAJOFBMANJ": "Assets/NapResources/UI/Sprite/A1DynamicLoad/InterKnot/UnPacker/CourseImg/Mission/Journey_Mission_1060204.png", "OEGNJPJCIOI": 2, "NHEMAJLEOFK": 160, "BIFACBBBAOJ": [], diff --git a/FileCfg/4069416385955677556.json b/FileCfg/4069416385955677556.json index c5d1a167..9193c745 100644 --- a/FileCfg/4069416385955677556.json +++ b/FileCfg/4069416385955677556.json @@ -56,7 +56,7 @@ "FMDFJEOJIMK": "UI/Sprite/A1DynamicLoad/IconRole/UnPacker/IconRole24.png", "LNDIHICCDFN": "Avatar_Female_Size03_JaneDoe", "MHINMINPONI": 6, - "FPBOLOPBPKG": "UI/Sprite/A1DynamicLoad/IconRoleCamp/UnPacker/IconCampN.E.P.S..png", + "FPBOLOPBPKG": "UI/Sprite/A1DynamicLoad/IconRoleCamp/UnPacker/IconCampJaneBadge.png", "IHGOMJBHNAM": "AbyssS2Agent_RecordDes_2_8", "EAKHFMHOMGL": 1341 }, diff --git a/FileCfg/8423183413999768910.json b/FileCfg/8423183413999768910.json index 78200b46..97a120b8 100644 --- a/FileCfg/8423183413999768910.json +++ b/FileCfg/8423183413999768910.json @@ -96,7 +96,7 @@ "NDGNDMGBEDP": "1001", "EGBFCKLPFDK": "", "GOOMMEJNHAC": "", - "PLCHMDCILAG": 45, + "PLCHMDCILAG": 500, "GKHLDPHODPK": 0, "ONHALAAELCC": 0, "INNPIAGBEKH": "Trigger_LevelUp_Gun", @@ -123,7 +123,7 @@ "NDGNDMGBEDP": "1002", "EGBFCKLPFDK": "1002", "GOOMMEJNHAC": "", - "PLCHMDCILAG": 56, + "PLCHMDCILAG": 600, "GKHLDPHODPK": 0, "ONHALAAELCC": 0, "INNPIAGBEKH": "Trigger_LevelUp_Gun", @@ -167,6 +167,7 @@ "PDEJFBLBKPN": 2, "FHIIIPELENE": "ActivityBangBooDream_CardFDesc_1343007", "KGDPAFCGCOD": [ + 1342503, 1342501 ], "JOMIJEEIBCJ": 3007108, diff --git a/FileCfg/9141409437965288128.json b/FileCfg/9141409437965288128.json index cd0da3e3..835fb82a 100644 --- a/FileCfg/9141409437965288128.json +++ b/FileCfg/9141409437965288128.json @@ -12458,7 +12458,7 @@ "KFMBKOLLGPI": 99900031, "EKIFDJNCBOJ": 0, "FHMBDJKIFJK": 0, - "KFLIALFDCPC": 2026, + "KFLIALFDCPC": 2126, "IFDMJCDLFPI": 0, "JEENNAKAHLP": [], "ICPEHHBDNHI": "", @@ -12992,7 +12992,7 @@ "KFMBKOLLGPI": 99900106, "EKIFDJNCBOJ": 0, "FHMBDJKIFJK": 0, - "KFLIALFDCPC": 2037, + "KFLIALFDCPC": 2137, "IFDMJCDLFPI": 0, "JEENNAKAHLP": [], "ICPEHHBDNHI": "", diff --git a/FileCfg/AbilityConfigTemplateTb.json b/FileCfg/AbilityConfigTemplateTb.json index 1333d28d..c0b43861 100644 --- a/FileCfg/AbilityConfigTemplateTb.json +++ b/FileCfg/AbilityConfigTemplateTb.json @@ -7520,7 +7520,7 @@ "LHOFPFFFJNE": "", "LACJKOGEKKE": "SilverAnby_UniqueSkill", "DNBBNMBMNNA": 0, - "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.150", + "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.125", "BFCHHPKMIOM": "AS_Duration:10.0", "PHOGPNFGGNN": "AS_CriticalDamageRatio_SilverAnby:0.150", "KOIFLEFAMAF": "AS_CriticalDamageRatioDelta_Real:0", @@ -7537,7 +7537,7 @@ "LHOFPFFFJNE": "", "LACJKOGEKKE": "SilverAnby_UniqueSkill", "DNBBNMBMNNA": 0, - "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.175", + "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.145", "BFCHHPKMIOM": "AS_Duration:10.0", "PHOGPNFGGNN": "AS_CriticalDamageRatio_SilverAnby:0.175", "KOIFLEFAMAF": "AS_CriticalDamageRatioDelta_Real:0", @@ -7554,7 +7554,7 @@ "LHOFPFFFJNE": "", "LACJKOGEKKE": "SilverAnby_UniqueSkill", "DNBBNMBMNNA": 0, - "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.200", + "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.165", "BFCHHPKMIOM": "AS_Duration:10.0", "PHOGPNFGGNN": "AS_CriticalDamageRatio_SilverAnby:0.200", "KOIFLEFAMAF": "AS_CriticalDamageRatioDelta_Real:0", @@ -7571,7 +7571,7 @@ "LHOFPFFFJNE": "", "LACJKOGEKKE": "SilverAnby_UniqueSkill", "DNBBNMBMNNA": 0, - "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.225", + "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.188", "BFCHHPKMIOM": "AS_Duration:10.0", "PHOGPNFGGNN": "AS_CriticalDamageRatio_SilverAnby:0.225", "KOIFLEFAMAF": "AS_CriticalDamageRatioDelta_Real:0", @@ -7588,7 +7588,7 @@ "LHOFPFFFJNE": "", "LACJKOGEKKE": "SilverAnby_UniqueSkill", "DNBBNMBMNNA": 0, - "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.250", + "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.208", "BFCHHPKMIOM": "AS_Duration:10.0", "PHOGPNFGGNN": "AS_CriticalDamageRatio_SilverAnby:0.250", "KOIFLEFAMAF": "AS_CriticalDamageRatioDelta_Real:0", @@ -7605,7 +7605,7 @@ "LHOFPFFFJNE": "", "LACJKOGEKKE": "SilverAnby_UniqueSkill", "DNBBNMBMNNA": 0, - "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.275", + "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.230", "BFCHHPKMIOM": "AS_Duration:10.0", "PHOGPNFGGNN": "AS_CriticalDamageRatio_SilverAnby:0.275", "KOIFLEFAMAF": "AS_CriticalDamageRatioDelta_Real:0", @@ -7622,7 +7622,7 @@ "LHOFPFFFJNE": "", "LACJKOGEKKE": "SilverAnby_UniqueSkill", "DNBBNMBMNNA": 0, - "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.300", + "ALMNNGFCOOP": "AS_AddedDamageRatio_Unique:0.250", "BFCHHPKMIOM": "AS_Duration:10.0", "PHOGPNFGGNN": "AS_CriticalDamageRatio_SilverAnby:0.300", "KOIFLEFAMAF": "AS_CriticalDamageRatioDelta_Real:0", diff --git a/FileCfg/AbyssDungeonTemplateTb.json b/FileCfg/AbyssDungeonTemplateTb.json index 81576a6c..d4859685 100644 --- a/FileCfg/AbyssDungeonTemplateTb.json +++ b/FileCfg/AbyssDungeonTemplateTb.json @@ -3310,7 +3310,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", @@ -3372,7 +3372,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", @@ -3443,7 +3443,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", @@ -3507,7 +3507,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", @@ -3568,7 +3568,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", @@ -3627,7 +3627,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", @@ -3716,7 +3716,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", @@ -3775,7 +3775,7 @@ "LDBJOFDJAEF": 0, "FKKMHEFDHCA": "", "CEOIECBJHGI": "", - "GFOKGFGKAGD": 2, + "GFOKGFGKAGD": 5, "BAICCGGCKIF": "", "HHHBMKOFBGA": "", "IBPHCPKNMFP": "", diff --git a/FileCfg/AccessConfigTemplateTb.json b/FileCfg/AccessConfigTemplateTb.json index bba46bfd..a804d136 100644 --- a/FileCfg/AccessConfigTemplateTb.json +++ b/FileCfg/AccessConfigTemplateTb.json @@ -16254,6 +16254,69 @@ "IBPEGIKLKIF": 0, "BLCBEFPLEIC": "" }, + { + "JIFHJEMHGNK": 100100583, + "ADKMIGDAAOJ": 2, + "LBEMKCCEBCM": 115000054, + "NKPHPDMNOHK": "ActivityJumpName", + "HMDPEFNBKAK": 0, + "NPDEKNJAEFP": 0, + "IFGPLCMKENG": "", + "AJIPMMDEPCB": 0, + "BLMLBOHGDJF": 0, + "EDJPKOAKBEF": "", + "GCONMGLJOFA": 0, + "IGFNAMKKDPD": 0, + "EGGLIGHKKOJ": "", + "PCIPHIIEHIN": 0, + "JMCDPFGLEIB": 0, + "KPCADFFIEHI": "", + "EKGHCBFEMHA": 0, + "IBPEGIKLKIF": 0, + "BLCBEFPLEIC": "" + }, + { + "JIFHJEMHGNK": 100100584, + "ADKMIGDAAOJ": 2, + "LBEMKCCEBCM": 115000089, + "NKPHPDMNOHK": "ActivityJumpName", + "HMDPEFNBKAK": 0, + "NPDEKNJAEFP": 0, + "IFGPLCMKENG": "", + "AJIPMMDEPCB": 0, + "BLMLBOHGDJF": 0, + "EDJPKOAKBEF": "", + "GCONMGLJOFA": 0, + "IGFNAMKKDPD": 0, + "EGGLIGHKKOJ": "", + "PCIPHIIEHIN": 0, + "JMCDPFGLEIB": 0, + "KPCADFFIEHI": "", + "EKGHCBFEMHA": 0, + "IBPEGIKLKIF": 0, + "BLCBEFPLEIC": "" + }, + { + "JIFHJEMHGNK": 100100585, + "ADKMIGDAAOJ": 2, + "LBEMKCCEBCM": 115000090, + "NKPHPDMNOHK": "ActivityJumpName", + "HMDPEFNBKAK": 0, + "NPDEKNJAEFP": 0, + "IFGPLCMKENG": "", + "AJIPMMDEPCB": 0, + "BLMLBOHGDJF": 0, + "EDJPKOAKBEF": "", + "GCONMGLJOFA": 0, + "IGFNAMKKDPD": 0, + "EGGLIGHKKOJ": "", + "PCIPHIIEHIN": 0, + "JMCDPFGLEIB": 0, + "KPCADFFIEHI": "", + "EKGHCBFEMHA": 0, + "IBPEGIKLKIF": 0, + "BLCBEFPLEIC": "" + }, { "JIFHJEMHGNK": 100100589, "ADKMIGDAAOJ": 2, @@ -16611,6 +16674,90 @@ "IBPEGIKLKIF": 0, "BLCBEFPLEIC": "" }, + { + "JIFHJEMHGNK": 100100607, + "ADKMIGDAAOJ": 2, + "LBEMKCCEBCM": 113000178, + "NKPHPDMNOHK": "ActivityJumpName", + "HMDPEFNBKAK": 0, + "NPDEKNJAEFP": 0, + "IFGPLCMKENG": "", + "AJIPMMDEPCB": 0, + "BLMLBOHGDJF": 0, + "EDJPKOAKBEF": "", + "GCONMGLJOFA": 0, + "IGFNAMKKDPD": 0, + "EGGLIGHKKOJ": "", + "PCIPHIIEHIN": 0, + "JMCDPFGLEIB": 0, + "KPCADFFIEHI": "", + "EKGHCBFEMHA": 0, + "IBPEGIKLKIF": 0, + "BLCBEFPLEIC": "" + }, + { + "JIFHJEMHGNK": 100100608, + "ADKMIGDAAOJ": 2, + "LBEMKCCEBCM": 113000179, + "NKPHPDMNOHK": "ActivityJumpName", + "HMDPEFNBKAK": 0, + "NPDEKNJAEFP": 0, + "IFGPLCMKENG": "", + "AJIPMMDEPCB": 0, + "BLMLBOHGDJF": 0, + "EDJPKOAKBEF": "", + "GCONMGLJOFA": 0, + "IGFNAMKKDPD": 0, + "EGGLIGHKKOJ": "", + "PCIPHIIEHIN": 0, + "JMCDPFGLEIB": 0, + "KPCADFFIEHI": "", + "EKGHCBFEMHA": 0, + "IBPEGIKLKIF": 0, + "BLCBEFPLEIC": "" + }, + { + "JIFHJEMHGNK": 100100609, + "ADKMIGDAAOJ": 2, + "LBEMKCCEBCM": 113000180, + "NKPHPDMNOHK": "ActivityJumpName", + "HMDPEFNBKAK": 0, + "NPDEKNJAEFP": 0, + "IFGPLCMKENG": "", + "AJIPMMDEPCB": 0, + "BLMLBOHGDJF": 0, + "EDJPKOAKBEF": "", + "GCONMGLJOFA": 0, + "IGFNAMKKDPD": 0, + "EGGLIGHKKOJ": "", + "PCIPHIIEHIN": 0, + "JMCDPFGLEIB": 0, + "KPCADFFIEHI": "", + "EKGHCBFEMHA": 0, + "IBPEGIKLKIF": 0, + "BLCBEFPLEIC": "" + }, + { + "JIFHJEMHGNK": 100100610, + "ADKMIGDAAOJ": 2, + "LBEMKCCEBCM": 113000181, + "NKPHPDMNOHK": "ActivityJumpName", + "HMDPEFNBKAK": 0, + "NPDEKNJAEFP": 0, + "IFGPLCMKENG": "", + "AJIPMMDEPCB": 0, + "BLMLBOHGDJF": 0, + "EDJPKOAKBEF": "", + "GCONMGLJOFA": 0, + "IGFNAMKKDPD": 0, + "EGGLIGHKKOJ": "", + "PCIPHIIEHIN": 0, + "JMCDPFGLEIB": 0, + "KPCADFFIEHI": "", + "EKGHCBFEMHA": 0, + "IBPEGIKLKIF": 0, + "BLCBEFPLEIC": "" + }, { "JIFHJEMHGNK": 100111001, "ADKMIGDAAOJ": 2, diff --git a/FileCfg/AchievementTemplateTb.json b/FileCfg/AchievementTemplateTb.json index 8b290892..4bf675be 100644 --- a/FileCfg/AchievementTemplateTb.json +++ b/FileCfg/AchievementTemplateTb.json @@ -2767,7 +2767,7 @@ "OBPOMMPNBOE": "", "LCDENONOMJC": 0, "AMENIJBOKGD": "0", - "BNBDCMNACCJ": "1201320010&1090140028&1040140136", + "BNBDCMNACCJ": "1201320010&1040140136", "ECCONOOJBCG": 0, "GENLGIFDJBI": 3800157 }, diff --git a/FileCfg/ActivityQuestJumpTemplateTb.json b/FileCfg/ActivityQuestJumpTemplateTb.json index 93254e8f..b921b4a8 100644 --- a/FileCfg/ActivityQuestJumpTemplateTb.json +++ b/FileCfg/ActivityQuestJumpTemplateTb.json @@ -3014,7 +3014,7 @@ }, { "CMNANACPCBN": 10001432, - "KDMDEBIBENP": 32, + "KDMDEBIBENP": 33, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100532, @@ -3026,7 +3026,7 @@ }, { "CMNANACPCBN": 10001433, - "KDMDEBIBENP": 33, + "KDMDEBIBENP": 34, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100533, @@ -3038,7 +3038,7 @@ }, { "CMNANACPCBN": 10001434, - "KDMDEBIBENP": 34, + "KDMDEBIBENP": 35, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100534, @@ -3050,7 +3050,7 @@ }, { "CMNANACPCBN": 10001435, - "KDMDEBIBENP": 35, + "KDMDEBIBENP": 36, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100535, @@ -3062,7 +3062,7 @@ }, { "CMNANACPCBN": 10001436, - "KDMDEBIBENP": 36, + "KDMDEBIBENP": 37, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100536, @@ -3074,7 +3074,7 @@ }, { "CMNANACPCBN": 10001437, - "KDMDEBIBENP": 37, + "KDMDEBIBENP": 38, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100537, @@ -3086,7 +3086,7 @@ }, { "CMNANACPCBN": 10001438, - "KDMDEBIBENP": 38, + "KDMDEBIBENP": 39, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100538, @@ -3098,7 +3098,7 @@ }, { "CMNANACPCBN": 10001439, - "KDMDEBIBENP": 39, + "KDMDEBIBENP": 40, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100539, @@ -3110,7 +3110,7 @@ }, { "CMNANACPCBN": 10001440, - "KDMDEBIBENP": 40, + "KDMDEBIBENP": 41, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100540, @@ -3122,7 +3122,7 @@ }, { "CMNANACPCBN": 10001441, - "KDMDEBIBENP": 41, + "KDMDEBIBENP": 42, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100541, @@ -3134,7 +3134,7 @@ }, { "CMNANACPCBN": 10001442, - "KDMDEBIBENP": 42, + "KDMDEBIBENP": 43, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100542, @@ -3146,7 +3146,7 @@ }, { "CMNANACPCBN": 10001443, - "KDMDEBIBENP": 43, + "KDMDEBIBENP": 44, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100543, @@ -3158,7 +3158,7 @@ }, { "CMNANACPCBN": 10001444, - "KDMDEBIBENP": 44, + "KDMDEBIBENP": 45, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100544, @@ -3170,7 +3170,7 @@ }, { "CMNANACPCBN": 10001445, - "KDMDEBIBENP": 45, + "KDMDEBIBENP": 46, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100545, @@ -3182,7 +3182,7 @@ }, { "CMNANACPCBN": 10001446, - "KDMDEBIBENP": 46, + "KDMDEBIBENP": 47, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100546, @@ -3194,7 +3194,7 @@ }, { "CMNANACPCBN": 10001447, - "KDMDEBIBENP": 47, + "KDMDEBIBENP": 48, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100547, @@ -3206,7 +3206,7 @@ }, { "CMNANACPCBN": 10001448, - "KDMDEBIBENP": 48, + "KDMDEBIBENP": 49, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100548, @@ -3218,7 +3218,7 @@ }, { "CMNANACPCBN": 10001449, - "KDMDEBIBENP": 49, + "KDMDEBIBENP": 50, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100549, @@ -3230,7 +3230,7 @@ }, { "CMNANACPCBN": 10001450, - "KDMDEBIBENP": 50, + "KDMDEBIBENP": 51, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100550, @@ -3242,7 +3242,7 @@ }, { "CMNANACPCBN": 10001451, - "KDMDEBIBENP": 51, + "KDMDEBIBENP": 52, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100551, @@ -3254,7 +3254,7 @@ }, { "CMNANACPCBN": 10001452, - "KDMDEBIBENP": 52, + "KDMDEBIBENP": 53, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100552, @@ -3266,7 +3266,7 @@ }, { "CMNANACPCBN": 10001453, - "KDMDEBIBENP": 53, + "KDMDEBIBENP": 54, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100553, @@ -3278,7 +3278,7 @@ }, { "CMNANACPCBN": 10001454, - "KDMDEBIBENP": 54, + "KDMDEBIBENP": 55, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100554, @@ -3290,7 +3290,7 @@ }, { "CMNANACPCBN": 10001455, - "KDMDEBIBENP": 55, + "KDMDEBIBENP": 56, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100555, @@ -3302,7 +3302,7 @@ }, { "CMNANACPCBN": 10001456, - "KDMDEBIBENP": 56, + "KDMDEBIBENP": 57, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100556, @@ -3314,7 +3314,7 @@ }, { "CMNANACPCBN": 10001457, - "KDMDEBIBENP": 57, + "KDMDEBIBENP": 58, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100557, @@ -3326,7 +3326,7 @@ }, { "CMNANACPCBN": 10001458, - "KDMDEBIBENP": 58, + "KDMDEBIBENP": 59, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100558, @@ -3338,7 +3338,7 @@ }, { "CMNANACPCBN": 10001459, - "KDMDEBIBENP": 59, + "KDMDEBIBENP": 60, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100559, @@ -3350,7 +3350,7 @@ }, { "CMNANACPCBN": 10001460, - "KDMDEBIBENP": 60, + "KDMDEBIBENP": 61, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100560, @@ -3362,7 +3362,7 @@ }, { "CMNANACPCBN": 10001461, - "KDMDEBIBENP": 61, + "KDMDEBIBENP": 62, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100561, @@ -3374,7 +3374,7 @@ }, { "CMNANACPCBN": 10001462, - "KDMDEBIBENP": 62, + "KDMDEBIBENP": 63, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100562, @@ -3386,7 +3386,7 @@ }, { "CMNANACPCBN": 10001463, - "KDMDEBIBENP": 63, + "KDMDEBIBENP": 64, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100563, @@ -3398,7 +3398,7 @@ }, { "CMNANACPCBN": 10001464, - "KDMDEBIBENP": 64, + "KDMDEBIBENP": 65, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100564, @@ -3410,7 +3410,7 @@ }, { "CMNANACPCBN": 10001465, - "KDMDEBIBENP": 65, + "KDMDEBIBENP": 67, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100565, @@ -3422,7 +3422,7 @@ }, { "CMNANACPCBN": 10001466, - "KDMDEBIBENP": 66, + "KDMDEBIBENP": 68, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100566, @@ -3434,7 +3434,7 @@ }, { "CMNANACPCBN": 10001467, - "KDMDEBIBENP": 67, + "KDMDEBIBENP": 69, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100567, @@ -3446,7 +3446,7 @@ }, { "CMNANACPCBN": 10001468, - "KDMDEBIBENP": 68, + "KDMDEBIBENP": 70, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100568, @@ -3533,6 +3533,18 @@ "KDMDEBIBENP": 3, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100607, + "NNHNKBNDOMN": 0, + "IOOGHGPKFHF": 10026, + "DIOJJKOHBPM": [ + 7043603 + ] + }, + { + "CMNANACPCBN": 10001476, + "KDMDEBIBENP": 4, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, "JIFHJEMHGNK": 100100593, "NNHNKBNDOMN": 0, "IOOGHGPKFHF": 10026, @@ -3540,28 +3552,16 @@ 7043701 ] }, - { - "CMNANACPCBN": 10001476, - "KDMDEBIBENP": 4, - "GLDKEFMFDNE": 0, - "AJPIILNCHLL": 0, - "JIFHJEMHGNK": 100100594, - "NNHNKBNDOMN": 0, - "IOOGHGPKFHF": 10026, - "DIOJJKOHBPM": [ - 70438 - ] - }, { "CMNANACPCBN": 10001477, "KDMDEBIBENP": 5, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, - "JIFHJEMHGNK": 100100595, + "JIFHJEMHGNK": 100100608, "NNHNKBNDOMN": 0, "IOOGHGPKFHF": 10026, "DIOJJKOHBPM": [ - 7043901 + 7043702 ] }, { @@ -3569,11 +3569,11 @@ "KDMDEBIBENP": 6, "GLDKEFMFDNE": 0, "AJPIILNCHLL": 0, - "JIFHJEMHGNK": 100100596, + "JIFHJEMHGNK": 100100608, "NNHNKBNDOMN": 0, "IOOGHGPKFHF": 10026, "DIOJJKOHBPM": [ - 7044001 + 7043703 ] }, { @@ -3588,6 +3588,114 @@ 7043102 ] }, + { + "CMNANACPCBN": 10001480, + "KDMDEBIBENP": 7, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100595, + "NNHNKBNDOMN": 0, + "IOOGHGPKFHF": 10026, + "DIOJJKOHBPM": [ + 7043901 + ] + }, + { + "CMNANACPCBN": 10001481, + "KDMDEBIBENP": 8, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100609, + "NNHNKBNDOMN": 0, + "IOOGHGPKFHF": 10026, + "DIOJJKOHBPM": [ + 7043902 + ] + }, + { + "CMNANACPCBN": 10001482, + "KDMDEBIBENP": 9, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100609, + "NNHNKBNDOMN": 0, + "IOOGHGPKFHF": 10026, + "DIOJJKOHBPM": [ + 7043903 + ] + }, + { + "CMNANACPCBN": 10001483, + "KDMDEBIBENP": 10, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100596, + "NNHNKBNDOMN": 0, + "IOOGHGPKFHF": 10026, + "DIOJJKOHBPM": [ + 7044001 + ] + }, + { + "CMNANACPCBN": 10001484, + "KDMDEBIBENP": 11, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100610, + "NNHNKBNDOMN": 0, + "IOOGHGPKFHF": 10026, + "DIOJJKOHBPM": [ + 7044002 + ] + }, + { + "CMNANACPCBN": 10001485, + "KDMDEBIBENP": 12, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100610, + "NNHNKBNDOMN": 0, + "IOOGHGPKFHF": 10026, + "DIOJJKOHBPM": [ + 7044003 + ] + }, + { + "CMNANACPCBN": 10001515, + "KDMDEBIBENP": 32, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100583, + "NNHNKBNDOMN": 100100335, + "IOOGHGPKFHF": 10023, + "DIOJJKOHBPM": [ + 7005212 + ] + }, + { + "CMNANACPCBN": 10001516, + "KDMDEBIBENP": 66, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100584, + "NNHNKBNDOMN": 100100335, + "IOOGHGPKFHF": 10023, + "DIOJJKOHBPM": [ + 7005508 + ] + }, + { + "CMNANACPCBN": 10001517, + "KDMDEBIBENP": 71, + "GLDKEFMFDNE": 0, + "AJPIILNCHLL": 0, + "JIFHJEMHGNK": 100100585, + "NNHNKBNDOMN": 100100335, + "IOOGHGPKFHF": 10023, + "DIOJJKOHBPM": [ + 7005513 + ] + }, { "CMNANACPCBN": 10002001, "KDMDEBIBENP": 1, diff --git a/FileCfg/ArchiveFileQuestTemplateTb.json b/FileCfg/ArchiveFileQuestTemplateTb.json index fb54c9e6..d48105f9 100644 --- a/FileCfg/ArchiveFileQuestTemplateTb.json +++ b/FileCfg/ArchiveFileQuestTemplateTb.json @@ -1739,7 +1739,8 @@ 1221061005, 1221061006, 1221061007, - 1221061008 + 1221061008, + 1221061009 ] }, { @@ -2980,6 +2981,7 @@ 1222105120, 1222105121, 1222105122, + 1222105126, 1222105123, 1222105124, 1222105125 diff --git a/FileCfg/ArchivePerformTemplateTb.json b/FileCfg/ArchivePerformTemplateTb.json index 9484cde9..92d444fb 100644 --- a/FileCfg/ArchivePerformTemplateTb.json +++ b/FileCfg/ArchivePerformTemplateTb.json @@ -2555,6 +2555,13 @@ "OAEJPMIBGDP": "Quest_VHSPerformTarget_1221061008", "GJPPELNNBEN": 10600415 }, + { + "OPFEAMDPIAG": 1221061009, + "NIGGIDCENCK": "Quest_VHSPerformName_1221061009", + "GIIEMDLFLGF": "Quest_VHSPerformDesc_1221061009", + "OAEJPMIBGDP": "Quest_VHSPerformTarget_1221061009", + "GJPPELNNBEN": 10600417 + }, { "OPFEAMDPIAG": 1221061101, "NIGGIDCENCK": "Quest_VHSPerformName_1221061101", @@ -3703,6 +3710,13 @@ "OAEJPMIBGDP": "Quest_VHSPerformTarget_1222105125", "GJPPELNNBEN": 16310260 }, + { + "OPFEAMDPIAG": 1222105126, + "NIGGIDCENCK": "Quest_VHSPerformName_1222105126", + "GIIEMDLFLGF": "Quest_VHSPerformDesc_1222105126", + "OAEJPMIBGDP": "Quest_VHSPerformTarget_1222105126", + "GJPPELNNBEN": 56320001 + }, { "OPFEAMDPIAG": 1222110101, "NIGGIDCENCK": "Quest_VHSPerformName_1222110101", diff --git a/FileCfg/AvatarSkillTemplateTb.json b/FileCfg/AvatarSkillTemplateTb.json index e065b078..08b50c00 100644 --- a/FileCfg/AvatarSkillTemplateTb.json +++ b/FileCfg/AvatarSkillTemplateTb.json @@ -18617,7 +18617,7 @@ "CADEHIMFGKI": 320, "KMIKCOFOAPP": 1730, "AABMEOCEMGA": 80, - "ICNBANIHMDO": 7050, + "ICNBANIHMDO": 9870, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, @@ -18628,7 +18628,7 @@ "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 53900, + "BDGHBOGJIEA": 75625, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [], @@ -18643,7 +18643,7 @@ "CADEHIMFGKI": 520, "KMIKCOFOAPP": 2850, "AABMEOCEMGA": 130, - "ICNBANIHMDO": 11630, + "ICNBANIHMDO": 20020, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, @@ -18654,7 +18654,7 @@ "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 89100, + "BDGHBOGJIEA": 153175, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [], @@ -18669,7 +18669,7 @@ "CADEHIMFGKI": 1010, "KMIKCOFOAPP": 6080, "AABMEOCEMGA": 280, - "ICNBANIHMDO": 33570, + "ICNBANIHMDO": 32810, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, @@ -18680,7 +18680,7 @@ "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 256575, + "BDGHBOGJIEA": 250800, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [], @@ -18695,7 +18695,7 @@ "CADEHIMFGKI": 2210, "KMIKCOFOAPP": 17690, "AABMEOCEMGA": 810, - "ICNBANIHMDO": 80210, + "ICNBANIHMDO": 69760, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, @@ -18706,7 +18706,7 @@ "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 612700, + "BDGHBOGJIEA": 532950, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [], @@ -18721,7 +18721,7 @@ "CADEHIMFGKI": 440, "KMIKCOFOAPP": 2380, "AABMEOCEMGA": 110, - "ICNBANIHMDO": 9730, + "ICNBANIHMDO": 13620, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, @@ -18732,7 +18732,7 @@ "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 297275, + "BDGHBOGJIEA": 416075, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [], @@ -18773,7 +18773,7 @@ "CADEHIMFGKI": 1200, "KMIKCOFOAPP": 6560, "AABMEOCEMGA": 300, - "ICNBANIHMDO": 53680, + "ICNBANIHMDO": 44890, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, @@ -18784,7 +18784,7 @@ "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 410025, + "BDGHBOGJIEA": 342925, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [], @@ -18951,10 +18951,10 @@ "AMIJIAHGPMC": 1361, "GCGPNHPGPLH": 3, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 184710, - "CADEHIMFGKI": 16800, - "KMIKCOFOAPP": 125940, - "AABMEOCEMGA": 5730, + "DODFMPECNGB": 148050, + "CADEHIMFGKI": 13460, + "KMIKCOFOAPP": 92200, + "AABMEOCEMGA": 4200, "ICNBANIHMDO": 0, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, @@ -18962,7 +18962,7 @@ "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 34333, + "AMDOLMNIJBG": 7666, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 6, @@ -19213,20 +19213,20 @@ "HPLAGKIJIMI": 0, "DODFMPECNGB": 3270, "CADEHIMFGKI": 300, - "KMIKCOFOAPP": 1990, - "AABMEOCEMGA": 100, - "ICNBANIHMDO": 6520, + "KMIKCOFOAPP": 2790, + "AABMEOCEMGA": 130, + "ICNBANIHMDO": 9120, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 1808, + "AMDOLMNIJBG": 2532, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 49775, + "BDGHBOGJIEA": 69850, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ @@ -19241,20 +19241,20 @@ "HPLAGKIJIMI": 0, "DODFMPECNGB": 6220, "CADEHIMFGKI": 570, - "KMIKCOFOAPP": 5740, - "AABMEOCEMGA": 270, - "ICNBANIHMDO": 18760, + "KMIKCOFOAPP": 5450, + "AABMEOCEMGA": 250, + "ICNBANIHMDO": 17840, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 5210, + "AMDOLMNIJBG": 4954, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 143550, + "BDGHBOGJIEA": 136400, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ @@ -19269,20 +19269,20 @@ "HPLAGKIJIMI": 0, "DODFMPECNGB": 8010, "CADEHIMFGKI": 730, - "KMIKCOFOAPP": 6840, - "AABMEOCEMGA": 320, - "ICNBANIHMDO": 22390, + "KMIKCOFOAPP": 7190, + "AABMEOCEMGA": 330, + "ICNBANIHMDO": 23500, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 6216, + "AMDOLMNIJBG": 6527, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 171050, + "BDGHBOGJIEA": 179575, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ @@ -19295,26 +19295,26 @@ "AMIJIAHGPMC": 1381, "GCGPNHPGPLH": 0, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 12680, - "CADEHIMFGKI": 1160, - "KMIKCOFOAPP": 10550, - "AABMEOCEMGA": 480, - "ICNBANIHMDO": 34520, + "DODFMPECNGB": 3990, + "CADEHIMFGKI": 370, + "KMIKCOFOAPP": 6210, + "AABMEOCEMGA": 290, + "ICNBANIHMDO": 20310, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 9588, + "AMDOLMNIJBG": 5640, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 263725, + "BDGHBOGJIEA": 155375, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ - 146654 + 73327 ], "JCAOIAPHDAO": 0 }, @@ -19325,20 +19325,20 @@ "HPLAGKIJIMI": 0, "DODFMPECNGB": 15450, "CADEHIMFGKI": 1410, - "KMIKCOFOAPP": 11710, - "AABMEOCEMGA": 540, - "ICNBANIHMDO": 38310, + "KMIKCOFOAPP": 13770, + "AABMEOCEMGA": 630, + "ICNBANIHMDO": 45060, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 10639, + "AMDOLMNIJBG": 12516, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 292600, + "BDGHBOGJIEA": 344300, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ @@ -19351,22 +19351,22 @@ "AMIJIAHGPMC": 1381, "GCGPNHPGPLH": 0, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 18020, - "CADEHIMFGKI": 1640, - "KMIKCOFOAPP": 17110, - "AABMEOCEMGA": 780, - "ICNBANIHMDO": 55990, + "DODFMPECNGB": 14850, + "CADEHIMFGKI": 1350, + "KMIKCOFOAPP": 13090, + "AABMEOCEMGA": 600, + "ICNBANIHMDO": 42830, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 15552, + "AMDOLMNIJBG": 11895, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 0, - "BDGHBOGJIEA": 427900, + "BDGHBOGJIEA": 327250, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ @@ -19379,8 +19379,8 @@ "AMIJIAHGPMC": 1381, "GCGPNHPGPLH": 1, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 18480, - "CADEHIMFGKI": 1680, + "DODFMPECNGB": 16720, + "CADEHIMFGKI": 1520, "KMIKCOFOAPP": 0, "AABMEOCEMGA": 0, "ICNBANIHMDO": 0, @@ -19407,8 +19407,8 @@ "AMIJIAHGPMC": 1381, "GCGPNHPGPLH": 1, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 20790, - "CADEHIMFGKI": 1890, + "DODFMPECNGB": 18810, + "CADEHIMFGKI": 1710, "KMIKCOFOAPP": 0, "AABMEOCEMGA": 0, "ICNBANIHMDO": 0, @@ -19547,22 +19547,22 @@ "AMIJIAHGPMC": 1381, "GCGPNHPGPLH": 2, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 24350, - "CADEHIMFGKI": 2220, - "KMIKCOFOAPP": 21270, - "AABMEOCEMGA": 970, - "ICNBANIHMDO": 33590, + "DODFMPECNGB": 25060, + "CADEHIMFGKI": 2280, + "KMIKCOFOAPP": 21820, + "AABMEOCEMGA": 1000, + "ICNBANIHMDO": 35390, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 9329, + "AMDOLMNIJBG": 9830, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 4, - "BDGHBOGJIEA": 256575, + "BDGHBOGJIEA": 270600, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ @@ -19603,10 +19603,10 @@ "AMIJIAHGPMC": 1381, "GCGPNHPGPLH": 3, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 172060, - "CADEHIMFGKI": 15650, - "KMIKCOFOAPP": 26590, - "AABMEOCEMGA": 1210, + "DODFMPECNGB": 173490, + "CADEHIMFGKI": 15780, + "KMIKCOFOAPP": 27690, + "AABMEOCEMGA": 1260, "ICNBANIHMDO": 0, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, @@ -19614,7 +19614,7 @@ "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 24166, + "AMDOLMNIJBG": 25166, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 6, @@ -19631,26 +19631,26 @@ "AMIJIAHGPMC": 1381, "GCGPNHPGPLH": 6, "HPLAGKIJIMI": 0, - "DODFMPECNGB": 20900, - "CADEHIMFGKI": 1900, - "KMIKCOFOAPP": 20900, - "AABMEOCEMGA": 950, - "ICNBANIHMDO": 68400, + "DODFMPECNGB": 10820, + "CADEHIMFGKI": 990, + "KMIKCOFOAPP": 10820, + "AABMEOCEMGA": 500, + "ICNBANIHMDO": 17700, "OEENEGADPFF": 0, "GPGKEHBDJLF": 0, "AAKACCGOOEN": 0, "AMOMHAEENNC": "", "ENFFGLIPKOL": 0, "CMGFCJECMLK": 0, - "AMDOLMNIJBG": 19000, + "AMDOLMNIJBG": 9830, "KBFMKFBLEKL": 1, "HNKHNDIKCPE": 0, "PFANGLNCEPA": 7, - "BDGHBOGJIEA": 522500, + "BDGHBOGJIEA": 270600, "IMEKHFGGDJM": 0, "BNHCHJGINNK": 0, "JHAAJNDHHAP": [ - 123500 + 63896 ], "JCAOIAPHDAO": 0 }, diff --git a/FileCfg/BattleEventConfigTemplateTb.json b/FileCfg/BattleEventConfigTemplateTb.json index 7338f31a..c6bff300 100644 Binary files a/FileCfg/BattleEventConfigTemplateTb.json and b/FileCfg/BattleEventConfigTemplateTb.json differ diff --git a/FileCfg/BuffTemplateTb.json b/FileCfg/BuffTemplateTb.json index 39bc7fff..31cfa1f2 100644 --- a/FileCfg/BuffTemplateTb.json +++ b/FileCfg/BuffTemplateTb.json @@ -4585,111 +4585,6 @@ "FPPALOEINBN": 0, "JACKDCAMDLJ": 0 }, - { - "OPFEAMDPIAG": 3000201, - "KELAMLHKNPB": "Avatar_Trigger_Buff_01_Title", - "KHMDBKLEJEJ": "Avatar_Trigger_Buff_01_Des", - "KJMNCFLNBOG": 9, - "GPJCONCICBK": "IconBuff_TriggerUniqueSkill_01", - "FOEAJHDEEJP": 1, - "NDHFJFOOLPM": 3, - "JOJBOMLDHAO": 4, - "NBNJEFMBCEE": -1, - "FBJPAFKPCMH": 1000000, - "FDEABKMAMJM": true, - "NIFGFJGMPMI": 0, - "NNNOKHMBBNF": true, - "ALMNNGFCOOP": "Percentage:0.00", - "BFCHHPKMIOM": "", - "PHOGPNFGGNN": "", - "KOIFLEFAMAF": "", - "AIADKKHADKN": "", - "EEEDLAEMCLN": "", - "GCMCJBMEJLP": "", - "DDGMKKNGKMM": "", - "LGFPOLPFAMP": "", - "HGCFCMOCIPH": "", - "GAJOPEOAPGM": "", - "LGIOAFJOAIM": 0, - "PPLHENOJPHF": 0, - "GPPEPLCMFEO": 0, - "NGAKALMKNAH": 0, - "FOEHAADFKKL": true, - "JBEOIMADBBP": 0, - "GGMPJKJMNMA": "TriggerUni", - "FPPALOEINBN": 1, - "JACKDCAMDLJ": 0 - }, - { - "OPFEAMDPIAG": 3000202, - "KELAMLHKNPB": "Avatar_Trigger_Buff_02_Title", - "KHMDBKLEJEJ": "Avatar_Trigger_Buff_02_Des", - "KJMNCFLNBOG": 9, - "GPJCONCICBK": "IconBuff_TriggerUniqueSkill_02", - "FOEAJHDEEJP": 1, - "NDHFJFOOLPM": 3, - "JOJBOMLDHAO": 4, - "NBNJEFMBCEE": -1, - "FBJPAFKPCMH": 1000000, - "FDEABKMAMJM": true, - "NIFGFJGMPMI": 0, - "NNNOKHMBBNF": true, - "ALMNNGFCOOP": "Percentage:0.00", - "BFCHHPKMIOM": "", - "PHOGPNFGGNN": "", - "KOIFLEFAMAF": "", - "AIADKKHADKN": "", - "EEEDLAEMCLN": "", - "GCMCJBMEJLP": "", - "DDGMKKNGKMM": "", - "LGFPOLPFAMP": "", - "HGCFCMOCIPH": "", - "GAJOPEOAPGM": "", - "LGIOAFJOAIM": 0, - "PPLHENOJPHF": 0, - "GPPEPLCMFEO": 0, - "NGAKALMKNAH": 0, - "FOEHAADFKKL": true, - "JBEOIMADBBP": 0, - "GGMPJKJMNMA": "TriggerUni", - "FPPALOEINBN": 2, - "JACKDCAMDLJ": 0 - }, - { - "OPFEAMDPIAG": 3000203, - "KELAMLHKNPB": "Avatar_Trigger_Buff_03_Title", - "KHMDBKLEJEJ": "Avatar_Trigger_Buff_03_Des", - "KJMNCFLNBOG": 9, - "GPJCONCICBK": "IconBuff_TriggerUniqueSkill_03", - "FOEAJHDEEJP": 1, - "NDHFJFOOLPM": 8, - "JOJBOMLDHAO": 1, - "NBNJEFMBCEE": -1, - "FBJPAFKPCMH": 1000000, - "FDEABKMAMJM": true, - "NIFGFJGMPMI": 0, - "NNNOKHMBBNF": false, - "ALMNNGFCOOP": "Percentage:0.00", - "BFCHHPKMIOM": "", - "PHOGPNFGGNN": "", - "KOIFLEFAMAF": "", - "AIADKKHADKN": "", - "EEEDLAEMCLN": "", - "GCMCJBMEJLP": "", - "DDGMKKNGKMM": "", - "LGFPOLPFAMP": "", - "HGCFCMOCIPH": "", - "GAJOPEOAPGM": "", - "LGIOAFJOAIM": 0, - "PPLHENOJPHF": 0, - "GPPEPLCMFEO": 0, - "NGAKALMKNAH": 0, - "FOEHAADFKKL": true, - "JBEOIMADBBP": 0, - "GGMPJKJMNMA": "", - "FPPALOEINBN": 0, - "JACKDCAMDLJ": 0 - }, { "OPFEAMDPIAG": 3000211, "KELAMLHKNPB": "Avatar_Pulchra_Debuff_01_Title", @@ -4760,6 +4655,76 @@ "FPPALOEINBN": 0, "JACKDCAMDLJ": 0 }, + { + "OPFEAMDPIAG": 3000213, + "KELAMLHKNPB": "Avatar_Pulchra_Debuff_02_Title", + "KHMDBKLEJEJ": "Avatar_Pulchra_Debuff_02_Des", + "KJMNCFLNBOG": 10, + "GPJCONCICBK": "IconBuff_PulchraMathSkill", + "FOEAJHDEEJP": 1, + "NDHFJFOOLPM": 8, + "JOJBOMLDHAO": 1, + "NBNJEFMBCEE": -1, + "FBJPAFKPCMH": 1000000, + "FDEABKMAMJM": true, + "NIFGFJGMPMI": 0, + "NNNOKHMBBNF": false, + "ALMNNGFCOOP": "Percentage:0.00", + "BFCHHPKMIOM": "", + "PHOGPNFGGNN": "", + "KOIFLEFAMAF": "", + "AIADKKHADKN": "", + "EEEDLAEMCLN": "", + "GCMCJBMEJLP": "", + "DDGMKKNGKMM": "", + "LGFPOLPFAMP": "", + "HGCFCMOCIPH": "", + "GAJOPEOAPGM": "", + "LGIOAFJOAIM": 0, + "PPLHENOJPHF": 0, + "GPPEPLCMFEO": 0, + "NGAKALMKNAH": 0, + "FOEHAADFKKL": true, + "JBEOIMADBBP": 0, + "GGMPJKJMNMA": "", + "FPPALOEINBN": 0, + "JACKDCAMDLJ": 0 + }, + { + "OPFEAMDPIAG": 3000214, + "KELAMLHKNPB": "Avatar_Pulchra_Buff_01_Title", + "KHMDBKLEJEJ": "Avatar_Pulchra_Buff_01_Des", + "KJMNCFLNBOG": 9, + "GPJCONCICBK": "IconBuff_PulchraUniqueSkill", + "FOEAJHDEEJP": 1, + "NDHFJFOOLPM": 8, + "JOJBOMLDHAO": 1, + "NBNJEFMBCEE": -1, + "FBJPAFKPCMH": 1000000, + "FDEABKMAMJM": true, + "NIFGFJGMPMI": 0, + "NNNOKHMBBNF": false, + "ALMNNGFCOOP": "Percentage:0.00", + "BFCHHPKMIOM": "", + "PHOGPNFGGNN": "", + "KOIFLEFAMAF": "", + "AIADKKHADKN": "", + "EEEDLAEMCLN": "", + "GCMCJBMEJLP": "", + "DDGMKKNGKMM": "", + "LGFPOLPFAMP": "", + "HGCFCMOCIPH": "", + "GAJOPEOAPGM": "", + "LGIOAFJOAIM": 0, + "PPLHENOJPHF": 0, + "GPPEPLCMFEO": 0, + "NGAKALMKNAH": 0, + "FOEHAADFKKL": true, + "JBEOIMADBBP": 0, + "GGMPJKJMNMA": "", + "FPPALOEINBN": 0, + "JACKDCAMDLJ": 0 + }, { "OPFEAMDPIAG": 3100001, "KELAMLHKNPB": "TarotCard_Test_Buff_01_Title", diff --git a/FileCfg/ClueAreaConfigTemplateTb.json b/FileCfg/ClueAreaConfigTemplateTb.json index 4f2da70c..a03786a6 100644 --- a/FileCfg/ClueAreaConfigTemplateTb.json +++ b/FileCfg/ClueAreaConfigTemplateTb.json @@ -60,7 +60,7 @@ "AJDKDCJIPKF": 1, "FAJMBHBJJKL": "Tab1_1", "HCOONHHNNGA": 1007, - "EFPJLPJOBFL": "Tab2_1007", + "EFPJLPJOBFL": "Hollow_Chapter_06", "NNANBCMLFBL": 0, "JOOLCGLAHJP": "" }, @@ -160,6 +160,14 @@ "NNANBCMLFBL": 0, "JOOLCGLAHJP": "" }, + { + "AJDKDCJIPKF": 20, + "FAJMBHBJJKL": "Tab1_20", + "HCOONHHNNGA": 20002, + "EFPJLPJOBFL": "ResourceTitleText_10303", + "NNANBCMLFBL": 0, + "JOOLCGLAHJP": "" + }, { "AJDKDCJIPKF": 30, "FAJMBHBJJKL": "Tab1_30", diff --git a/FileCfg/ClueConfigTemplateTb.json b/FileCfg/ClueConfigTemplateTb.json index 85bacbff..7402b4e5 100644 --- a/FileCfg/ClueConfigTemplateTb.json +++ b/FileCfg/ClueConfigTemplateTb.json @@ -234,7 +234,7 @@ "DBCOLMOODLK": 0, "HENFAEPGLLF": 1, "JOOLCGLAHJP": "1040140493", - "PDCNLIPNGLL": 20001, + "PDCNLIPNGLL": 20002, "NIDCBGFMPCD": "ClueDesc_1017", "LLHHBDFNLIC": 0, "NMHNBHDEKBP": 0, @@ -384,7 +384,7 @@ "DBCOLMOODLK": 0, "HENFAEPGLLF": 1, "JOOLCGLAHJP": "1040140493", - "PDCNLIPNGLL": 20001, + "PDCNLIPNGLL": 20002, "NIDCBGFMPCD": "ClueDesc_1028", "LLHHBDFNLIC": 0, "NMHNBHDEKBP": 0, @@ -399,7 +399,7 @@ "DBCOLMOODLK": 0, "HENFAEPGLLF": 1, "JOOLCGLAHJP": "1040140493", - "PDCNLIPNGLL": 20001, + "PDCNLIPNGLL": 20002, "NIDCBGFMPCD": "ClueDesc_1029", "LLHHBDFNLIC": 0, "NMHNBHDEKBP": 0, @@ -414,7 +414,7 @@ "DBCOLMOODLK": 0, "HENFAEPGLLF": 1, "JOOLCGLAHJP": "1040140491", - "PDCNLIPNGLL": 20001, + "PDCNLIPNGLL": 20002, "NIDCBGFMPCD": "ClueDesc_1030", "LLHHBDFNLIC": 0, "NMHNBHDEKBP": 0, diff --git a/FileCfg/ConditionConfigTemplateTb.json b/FileCfg/ConditionConfigTemplateTb.json index bebd11be..a274e463 100644 Binary files a/FileCfg/ConditionConfigTemplateTb.json and b/FileCfg/ConditionConfigTemplateTb.json differ diff --git a/FileCfg/DurationInfoTemplateTb.json b/FileCfg/DurationInfoTemplateTb.json index c1891438..b7a99360 100644 --- a/FileCfg/DurationInfoTemplateTb.json +++ b/FileCfg/DurationInfoTemplateTb.json @@ -171,7 +171,7 @@ { "EELDLMADHPK": 69009, "LJFBDEDNPOC": "2025-04-18 04:00:00", - "FLODMDHBDCO": "2025-04-31 03:59:59", + "FLODMDHBDCO": "2025-05-02 03:59:59", "CMOLKPGAPEO": 9 } ] diff --git a/FileCfg/HollowQuestTemplateTb.json b/FileCfg/HollowQuestTemplateTb.json index 7c17f368..762b1e90 100644 --- a/FileCfg/HollowQuestTemplateTb.json +++ b/FileCfg/HollowQuestTemplateTb.json @@ -31432,7 +31432,7 @@ "JCEHJBLHKMK": 0, "KNPGMJHIANJ": 1, "FFCONNBKGOG": 65, - "DGNJPJOGJKE": 60, + "DGNJPJOGJKE": 65, "DNHDBDGIFGO": 9, "CJJMOFANFEL": true, "KEMOEDJLCBE": true, @@ -32869,7 +32869,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { @@ -32948,7 +32948,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { @@ -33027,7 +33027,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { @@ -33106,7 +33106,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { @@ -33185,7 +33185,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { @@ -33264,7 +33264,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { @@ -33343,7 +33343,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { @@ -33422,7 +33422,7 @@ "AMIFJKNJHFI": [], "AIBLMOGFIAJ": [], "GOJDGIPLGNP": 2, - "FNEPOLOFGAM": 0, + "FNEPOLOFGAM": 1, "HNBELKNGPCD": 0 }, { diff --git a/FileCfg/InterKnotConfigTemplateTb.json b/FileCfg/InterKnotConfigTemplateTb.json index 57947742..901099b6 100644 --- a/FileCfg/InterKnotConfigTemplateTb.json +++ b/FileCfg/InterKnotConfigTemplateTb.json @@ -5361,7 +5361,7 @@ { "OPFEAMDPIAG": 16004, "HLEAEPDDBLE": 0, - "JOGGOAJIAJJ": "1040140432", + "JOGGOAJIAJJ": "1040140432|1630006310", "PGHJJOFKMCP": "", "JIAFNJNGJFM": 0, "LPELLJIEKDJ": 600, @@ -5399,7 +5399,7 @@ { "OPFEAMDPIAG": 16005, "HLEAEPDDBLE": 0, - "JOGGOAJIAJJ": "1040140432", + "JOGGOAJIAJJ": "1040140432|1630006310", "PGHJJOFKMCP": "", "JIAFNJNGJFM": 0, "LPELLJIEKDJ": 600, @@ -5437,7 +5437,7 @@ { "OPFEAMDPIAG": 16006, "HLEAEPDDBLE": 0, - "JOGGOAJIAJJ": "1040140432", + "JOGGOAJIAJJ": "1040140432|1630006310", "PGHJJOFKMCP": "", "JIAFNJNGJFM": 0, "LPELLJIEKDJ": 600, diff --git a/FileCfg/InteractDataTemplateTb.json b/FileCfg/InteractDataTemplateTb.json index 072bafa2..7be743bc 100644 Binary files a/FileCfg/InteractDataTemplateTb.json and b/FileCfg/InteractDataTemplateTb.json differ diff --git a/FileCfg/ItemTemplateTb.json b/FileCfg/ItemTemplateTb.json index e6bca265..056db12d 100644 Binary files a/FileCfg/ItemTemplateTb.json and b/FileCfg/ItemTemplateTb.json differ diff --git a/FileCfg/LevelAbilityConfigTemplateTb.json b/FileCfg/LevelAbilityConfigTemplateTb.json index 50e2e96a..5b30f13d 100644 --- a/FileCfg/LevelAbilityConfigTemplateTb.json +++ b/FileCfg/LevelAbilityConfigTemplateTb.json @@ -7731,7 +7731,7 @@ "AMDFPDIKMIJ": "", "LHOFPFFFJNE": "", "LACJKOGEKKE": "Activity_BangbooDream_Weapon_Gun_Perk_WeakenGun", - "ALMNNGFCOOP": "AS_AddedDamageRatio:0.0045", + "ALMNNGFCOOP": "AS_AddedDamageRatio:0.005", "BFCHHPKMIOM": "", "PHOGPNFGGNN": "", "KOIFLEFAMAF": "", @@ -7755,7 +7755,7 @@ "AMDFPDIKMIJ": "", "LHOFPFFFJNE": "", "LACJKOGEKKE": "Activity_BangbooDream_Weapon_Gun_Perk_AbnormalGun", - "ALMNNGFCOOP": "AS_CriticalDamageRatioDelta:0.0056", + "ALMNNGFCOOP": "AS_CriticalDamageRatioDelta:0.006", "BFCHHPKMIOM": "AS_Duration:20", "PHOGPNFGGNN": "", "KOIFLEFAMAF": "", @@ -16849,7 +16849,7 @@ "AMDFPDIKMIJ": "", "LHOFPFFFJNE": "", "LACJKOGEKKE": "Corin_Card_S_01", - "ALMNNGFCOOP": "AS_Max_AttackRush_HitNum:30", + "ALMNNGFCOOP": "AS_Max_AttackRush_HitNum:29", "BFCHHPKMIOM": "", "PHOGPNFGGNN": "", "KOIFLEFAMAF": "", diff --git a/FileCfg/LevelMonsterAdjustTemplateTb.json b/FileCfg/LevelMonsterAdjustTemplateTb.json index b4276d46..32d5b2b3 100644 --- a/FileCfg/LevelMonsterAdjustTemplateTb.json +++ b/FileCfg/LevelMonsterAdjustTemplateTb.json @@ -1343,7 +1343,7 @@ { "DALOEJAHNGM": 20609, "JBDCBJIEKFM": 0, - "PGOGJAAPNFC": 0, + "PGOGJAAPNFC": -2500, "PAPCKEHJENB": 0, "GAEAJCJLJEM": -5000, "IDCDJOPEEDC": 0, @@ -1355,7 +1355,7 @@ { "DALOEJAHNGM": 20609, "JBDCBJIEKFM": 1, - "PGOGJAAPNFC": -6000, + "PGOGJAAPNFC": -7000, "PAPCKEHJENB": 0, "GAEAJCJLJEM": -5000, "IDCDJOPEEDC": 0, @@ -1367,7 +1367,7 @@ { "DALOEJAHNGM": 20609, "JBDCBJIEKFM": 2, - "PGOGJAAPNFC": -6000, + "PGOGJAAPNFC": -7000, "PAPCKEHJENB": 0, "GAEAJCJLJEM": -5000, "IDCDJOPEEDC": 0, @@ -3978,7 +3978,7 @@ "DALOEJAHNGM": 29304, "JBDCBJIEKFM": 999, "PGOGJAAPNFC": 3800, - "PAPCKEHJENB": 0, + "PAPCKEHJENB": -1000, "GAEAJCJLJEM": 10000, "IDCDJOPEEDC": 0, "KHKGPGGHNNO": 3300, @@ -3990,7 +3990,7 @@ "DALOEJAHNGM": 29305, "JBDCBJIEKFM": 999, "PGOGJAAPNFC": 4800, - "PAPCKEHJENB": -3000, + "PAPCKEHJENB": -5000, "GAEAJCJLJEM": 10000, "IDCDJOPEEDC": 0, "KHKGPGGHNNO": 3300, @@ -4050,7 +4050,7 @@ "DALOEJAHNGM": 29315, "JBDCBJIEKFM": 999, "PGOGJAAPNFC": 5800, - "PAPCKEHJENB": 0, + "PAPCKEHJENB": -2000, "GAEAJCJLJEM": 10000, "IDCDJOPEEDC": 0, "KHKGPGGHNNO": 3300, diff --git a/FileCfg/MainCityObjectTemplateTb.json b/FileCfg/MainCityObjectTemplateTb.json index 629dd9b1..f14eca51 100644 Binary files a/FileCfg/MainCityObjectTemplateTb.json and b/FileCfg/MainCityObjectTemplateTb.json differ diff --git a/FileCfg/MainCityQuestTemplateTb.json b/FileCfg/MainCityQuestTemplateTb.json index c963e1b4..9a60528f 100644 Binary files a/FileCfg/MainCityQuestTemplateTb.json and b/FileCfg/MainCityQuestTemplateTb.json differ diff --git a/FileCfg/MessageGroupConfigTemplateTb.json b/FileCfg/MessageGroupConfigTemplateTb.json index 62b14a2f..dccbef55 100644 --- a/FileCfg/MessageGroupConfigTemplateTb.json +++ b/FileCfg/MessageGroupConfigTemplateTb.json @@ -5434,7 +5434,7 @@ "BKNKIPBIKIH": 0, "JOOLCGLAHJP": "", "KBIJPHEGNFD": 1, - "HBHCMOIIIKN": 10027, + "HBHCMOIIIKN": 10002, "KINEKLHNPOO": 0, "HLEAEPDDBLE": 0, "IPENFOOEDGC": 1, diff --git a/FileCfg/MonsterConfigTemplateTb.json b/FileCfg/MonsterConfigTemplateTb.json index 17ebffbd..2feac3c1 100644 Binary files a/FileCfg/MonsterConfigTemplateTb.json and b/FileCfg/MonsterConfigTemplateTb.json differ diff --git a/FileCfg/MonsterSubTemplateTb.json b/FileCfg/MonsterSubTemplateTb.json index 3942fa3a..2526764d 100644 Binary files a/FileCfg/MonsterSubTemplateTb.json and b/FileCfg/MonsterSubTemplateTb.json differ diff --git a/FileCfg/NotificationBadgeConfigTemplateTb.json b/FileCfg/NotificationBadgeConfigTemplateTb.json index 0f80c344..15046111 100644 --- a/FileCfg/NotificationBadgeConfigTemplateTb.json +++ b/FileCfg/NotificationBadgeConfigTemplateTb.json @@ -1578,7 +1578,8 @@ "EOFILNAHENA": 1, "DDLEMGCDHGM": [ 2521, - 2524 + 2524, + 2523 ] }, { diff --git a/FileCfg/PerformTemplateTb.json b/FileCfg/PerformTemplateTb.json index 3608cfc0..ffe6cf0a 100644 Binary files a/FileCfg/PerformTemplateTb.json and b/FileCfg/PerformTemplateTb.json differ diff --git a/FileCfg/PhotoWallItemTemplateTb.json b/FileCfg/PhotoWallItemTemplateTb.json index 97a0b05c..b7a929e6 100644 --- a/FileCfg/PhotoWallItemTemplateTb.json +++ b/FileCfg/PhotoWallItemTemplateTb.json @@ -553,7 +553,7 @@ "DBCOLMOODLK": 0, "KKGBBKPDFKH": "", "OFHOIDGKCIH": "", - "HENFAEPGLLF": 1, + "HENFAEPGLLF": 0, "JOOLCGLAHJP": "", "EFPFKDLDFBJ": "1", "KHEKMEMGABJ": "UI/Sprite/A1DynamicLoad/DIYBoard/UnPacker/Photo/DIYBoardPhoto028.png", diff --git a/FileCfg/PopupWindowConfigTemplateTb.json b/FileCfg/PopupWindowConfigTemplateTb.json index 703eaa1e..c192f123 100644 --- a/FileCfg/PopupWindowConfigTemplateTb.json +++ b/FileCfg/PopupWindowConfigTemplateTb.json @@ -8371,8 +8371,8 @@ "JOGGOAJIAJJ": "", "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, - "FKLONHGLFMJ": "", - "BGOCJEKHDAA": "Yorozuya/Zero/TutorialHollow_WeaponUpgrade.usm", + "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/1_5/Tutorial_ActivityGildedCarrotDay_1.png", + "BGOCJEKHDAA": "", "OJOJJKNMIHD": 40001, "LHIBKOLGPPI": 0, "MALAKHPMBKF": 0, @@ -8390,7 +8390,7 @@ "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, "FKLONHGLFMJ": "", - "BGOCJEKHDAA": "Yorozuya/Zero/TutorialHollow_WeaponUpgrade.usm", + "BGOCJEKHDAA": "AllroundGeneralTutorial/Tutorial_ActivityGildedCarrotDay_2", "OJOJJKNMIHD": 40002, "LHIBKOLGPPI": 0, "MALAKHPMBKF": 0, @@ -9091,7 +9091,7 @@ "JOGGOAJIAJJ": "", "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, - "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/TutorialCharacter01.png", + "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/1_6/Tutorial_ShootingGame_1_1.png", "BGOCJEKHDAA": "", "OJOJJKNMIHD": 0, "LHIBKOLGPPI": 0, @@ -9120,7 +9120,7 @@ "JOGGOAJIAJJ": "", "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, - "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/TutorialCharacter01.png", + "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/1_6/Tutorial_ShootingGame_1_2.png", "BGOCJEKHDAA": "", "OJOJJKNMIHD": 0, "LHIBKOLGPPI": 0, @@ -9138,7 +9138,7 @@ "JOGGOAJIAJJ": "", "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, - "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/TutorialCharacter01.png", + "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/1_6/Tutorial_ShootingGame_1_3.png", "BGOCJEKHDAA": "", "OJOJJKNMIHD": 0, "LHIBKOLGPPI": 0, @@ -9156,7 +9156,7 @@ "JOGGOAJIAJJ": "", "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, - "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/TutorialCharacter01.png", + "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/1_6/Tutorial_ShootingGame_2.png", "BGOCJEKHDAA": "", "OJOJJKNMIHD": 0, "LHIBKOLGPPI": 0, @@ -9185,7 +9185,7 @@ "JOGGOAJIAJJ": "", "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, - "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/TutorialCharacter01.png", + "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/1_6/Tutorial_ShootingGame_3_1.png", "BGOCJEKHDAA": "", "OJOJJKNMIHD": 0, "LHIBKOLGPPI": 0, @@ -9199,11 +9199,11 @@ "HOELNEPHJKH": 9992017, "MOIGCHAHEJO": 1, "OLANPFHKOCI": "PopUp_Title_9992017", - "PJGJAMHMOKM": "PopUp_Content_999201601", + "PJGJAMHMOKM": "PopUp_Content_999201702", "JOGGOAJIAJJ": "", "ONFBEJDFLHH": "", "FOEAJHDEEJP": 1, - "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/TutorialCharacter01.png", + "FKLONHGLFMJ": "UI/Sprite/A1DynamicLoad/AllroundGeneralTutorial/UnPacker/1_6/Tutorial_ShootingGame_3_2.png", "BGOCJEKHDAA": "", "OJOJJKNMIHD": 0, "LHIBKOLGPPI": 0, diff --git a/FileCfg/QuestConfigTemplateTb.json b/FileCfg/QuestConfigTemplateTb.json index f52d6dd8..96a8a6ea 100644 Binary files a/FileCfg/QuestConfigTemplateTb.json and b/FileCfg/QuestConfigTemplateTb.json differ diff --git a/FileCfg/ResInfoConfigTemplateTb.json b/FileCfg/ResInfoConfigTemplateTb.json index 13ec7ee5..b3c82eda 100644 --- a/FileCfg/ResInfoConfigTemplateTb.json +++ b/FileCfg/ResInfoConfigTemplateTb.json @@ -540,6 +540,24 @@ "BIBLFKCDBFD": 40, "HMHOPDEPGHM": 6719039351179202245 }, + { + "DBOACCIJPDL": "Icon_Shoot_Change", + "NBODNGCFKHH": "", + "BIBLFKCDBFD": 40, + "HMHOPDEPGHM": 17882216646425659196 + }, + { + "DBOACCIJPDL": "Icon_Shoot_Fire", + "NBODNGCFKHH": "", + "BIBLFKCDBFD": 40, + "HMHOPDEPGHM": 18234687759557949427 + }, + { + "DBOACCIJPDL": "Icon_Shoot_Open", + "NBODNGCFKHH": "", + "BIBLFKCDBFD": 40, + "HMHOPDEPGHM": 14831429047575529230 + }, { "DBOACCIJPDL": "Icon_Special", "NBODNGCFKHH": "", diff --git a/FileCfg/TeleportConfigTemplateTb.json b/FileCfg/TeleportConfigTemplateTb.json index 701b82a1..29452ce6 100644 --- a/FileCfg/TeleportConfigTemplateTb.json +++ b/FileCfg/TeleportConfigTemplateTb.json @@ -2131,7 +2131,7 @@ "EELAMDEHNJF": 151, "PEJILDNFBDM": "Zero_PlayerPos_AbyssEnter", "GODBHKPHLJL": "TeleportName_01_DecorativeText", - "HPHDJNGIGEG": "UIYorozuyaDifficultWidgetController", + "HPHDJNGIGEG": "UIAbyssS2EntrancePageController", "NNFLFJOMAPK": 0, "ILHKKGMIIEL": 0, "BNDGHLOKGPE": 2, @@ -2173,7 +2173,7 @@ "OBPOMMPNBOE": "UI/Sprite/A1DynamicLoad/NavigationPage/UnPacker/ShopPic/IconStorage.png", "IJIMOCEONPL": 100002, "EELAMDEHNJF": 108, - "PEJILDNFBDM": "Concert_PlayerPos_ActivityGiledDay_001", + "PEJILDNFBDM": "TransformPos_Activity_SpringFestival_Stair", "GODBHKPHLJL": "TeleportName_01_DecorativeText", "HPHDJNGIGEG": "UIGoldMiningDayMainPageController", "NNFLFJOMAPK": 0, @@ -2248,7 +2248,7 @@ "EELAMDEHNJF": 151, "PEJILDNFBDM": "Zero_PlayerPos_AbyssEnter", "GODBHKPHLJL": "TeleportName_01_DecorativeText", - "HPHDJNGIGEG": "UIYorozuyaDifficultWidgetController", + "HPHDJNGIGEG": "UIAbyssS2EntrancePageController", "NNFLFJOMAPK": 0, "ILHKKGMIIEL": 0, "BNDGHLOKGPE": 2, @@ -4116,7 +4116,10 @@ 70520, 70521 ], - "NFDGMJMKHOK": [], + "NFDGMJMKHOK": [ + 117, + 123 + ], "FJIEAJBHKLC": false }, { @@ -10912,7 +10915,8 @@ 70436 ], "NFDGMJMKHOK": [ - 117 + 117, + 123 ], "FJIEAJBHKLC": false }, @@ -10937,7 +10941,8 @@ 7044201 ], "NFDGMJMKHOK": [ - 117 + 117, + 123 ], "FJIEAJBHKLC": false }, @@ -10962,7 +10967,8 @@ 70436 ], "NFDGMJMKHOK": [ - 117 + 117, + 123 ], "FJIEAJBHKLC": false }, @@ -10987,7 +10993,8 @@ 70437 ], "NFDGMJMKHOK": [ - 117 + 117, + 123 ], "FJIEAJBHKLC": false }, @@ -11012,7 +11019,8 @@ 70438 ], "NFDGMJMKHOK": [ - 117 + 117, + 123 ], "FJIEAJBHKLC": false }, @@ -11037,7 +11045,8 @@ 70439 ], "NFDGMJMKHOK": [ - 117 + 117, + 123 ], "FJIEAJBHKLC": false }, @@ -11062,7 +11071,112 @@ 70440 ], "NFDGMJMKHOK": [ - 117 + 117, + 123 + ], + "FJIEAJBHKLC": false + }, + { + "OPFEAMDPIAG": 113000178, + "LANJNPHPJEH": 70, + "HLEAEPDDBLE": 0, + "JOGGOAJIAJJ": "", + "KAOMKKBEKOF": "", + "OBPOMMPNBOE": "UI/Sprite/A3DynamicLoad/NavigationPage/UnPacker/ShopPic/IconStorage.png", + "IJIMOCEONPL": 7017201, + "EELAMDEHNJF": 103, + "PEJILDNFBDM": "FortuneHIA_PlayerPos_Activity_TinyTitan_tele2", + "GODBHKPHLJL": "TeleportName_01_DecorativeText", + "HPHDJNGIGEG": "", + "NNFLFJOMAPK": 0, + "ILHKKGMIIEL": 0, + "BNDGHLOKGPE": 1, + "KCKKEMJNJBG": [], + "LKMJDLABMBA": [], + "NOFNIIEJKJJ": [ + 70436 + ], + "NFDGMJMKHOK": [ + 117, + 123 + ], + "FJIEAJBHKLC": false + }, + { + "OPFEAMDPIAG": 113000179, + "LANJNPHPJEH": 70, + "HLEAEPDDBLE": 0, + "JOGGOAJIAJJ": "", + "KAOMKKBEKOF": "", + "OBPOMMPNBOE": "UI/Sprite/A3DynamicLoad/NavigationPage/UnPacker/ShopPic/IconStorage.png", + "IJIMOCEONPL": 7017201, + "EELAMDEHNJF": 103, + "PEJILDNFBDM": "FortuneHIA_PlayerPos_Activity_TinyTitan_tele2", + "GODBHKPHLJL": "TeleportName_01_DecorativeText", + "HPHDJNGIGEG": "", + "NNFLFJOMAPK": 0, + "ILHKKGMIIEL": 0, + "BNDGHLOKGPE": 1, + "KCKKEMJNJBG": [], + "LKMJDLABMBA": [], + "NOFNIIEJKJJ": [ + 70437 + ], + "NFDGMJMKHOK": [ + 117, + 123 + ], + "FJIEAJBHKLC": false + }, + { + "OPFEAMDPIAG": 113000180, + "LANJNPHPJEH": 70, + "HLEAEPDDBLE": 0, + "JOGGOAJIAJJ": "", + "KAOMKKBEKOF": "", + "OBPOMMPNBOE": "UI/Sprite/A3DynamicLoad/NavigationPage/UnPacker/ShopPic/IconStorage.png", + "IJIMOCEONPL": 7017201, + "EELAMDEHNJF": 103, + "PEJILDNFBDM": "FortuneHIA_PlayerPos_Activity_TinyTitan_tele2", + "GODBHKPHLJL": "TeleportName_01_DecorativeText", + "HPHDJNGIGEG": "", + "NNFLFJOMAPK": 0, + "ILHKKGMIIEL": 0, + "BNDGHLOKGPE": 1, + "KCKKEMJNJBG": [], + "LKMJDLABMBA": [], + "NOFNIIEJKJJ": [ + 70439 + ], + "NFDGMJMKHOK": [ + 117, + 123 + ], + "FJIEAJBHKLC": false + }, + { + "OPFEAMDPIAG": 113000181, + "LANJNPHPJEH": 70, + "HLEAEPDDBLE": 0, + "JOGGOAJIAJJ": "", + "KAOMKKBEKOF": "", + "OBPOMMPNBOE": "UI/Sprite/A3DynamicLoad/NavigationPage/UnPacker/ShopPic/IconStorage.png", + "IJIMOCEONPL": 7017201, + "EELAMDEHNJF": 103, + "PEJILDNFBDM": "FortuneHIA_PlayerPos_Activity_TinyTitan_tele2", + "GODBHKPHLJL": "TeleportName_01_DecorativeText", + "HPHDJNGIGEG": "", + "NNFLFJOMAPK": 0, + "ILHKKGMIIEL": 0, + "BNDGHLOKGPE": 1, + "KCKKEMJNJBG": [], + "LKMJDLABMBA": [], + "NOFNIIEJKJJ": [ + 70440 + ], + "NFDGMJMKHOK": [ + 117, + 123 ], "FJIEAJBHKLC": false }, @@ -12170,6 +12284,32 @@ ], "FJIEAJBHKLC": false }, + { + "OPFEAMDPIAG": 115000054, + "LANJNPHPJEH": 140, + "HLEAEPDDBLE": 0, + "JOGGOAJIAJJ": "", + "KAOMKKBEKOF": "", + "OBPOMMPNBOE": "", + "IJIMOCEONPL": 100011, + "EELAMDEHNJF": 108, + "PEJILDNFBDM": "TransformPos_Activity_SpringFestival_Zhidaibu", + "GODBHKPHLJL": "TeleportName_01_DecorativeText", + "HPHDJNGIGEG": "", + "NNFLFJOMAPK": 0, + "ILHKKGMIIEL": 0, + "BNDGHLOKGPE": 1, + "KCKKEMJNJBG": [], + "LKMJDLABMBA": [], + "NOFNIIEJKJJ": [ + 70052 + ], + "NFDGMJMKHOK": [ + 117, + 123 + ], + "FJIEAJBHKLC": false + }, { "OPFEAMDPIAG": 115000061, "LANJNPHPJEH": 140, @@ -12794,6 +12934,58 @@ ], "FJIEAJBHKLC": false }, + { + "OPFEAMDPIAG": 115000089, + "LANJNPHPJEH": 140, + "HLEAEPDDBLE": 0, + "JOGGOAJIAJJ": "", + "KAOMKKBEKOF": "", + "OBPOMMPNBOE": "", + "IJIMOCEONPL": 100011, + "EELAMDEHNJF": 108, + "PEJILDNFBDM": "TransformPos_Activity_SpringFestival_Stair", + "GODBHKPHLJL": "TeleportName_01_DecorativeText", + "HPHDJNGIGEG": "", + "NNFLFJOMAPK": 0, + "ILHKKGMIIEL": 0, + "BNDGHLOKGPE": 0, + "KCKKEMJNJBG": [], + "LKMJDLABMBA": [], + "NOFNIIEJKJJ": [ + 70055 + ], + "NFDGMJMKHOK": [ + 117, + 123 + ], + "FJIEAJBHKLC": false + }, + { + "OPFEAMDPIAG": 115000090, + "LANJNPHPJEH": 140, + "HLEAEPDDBLE": 0, + "JOGGOAJIAJJ": "", + "KAOMKKBEKOF": "", + "OBPOMMPNBOE": "", + "IJIMOCEONPL": 100011, + "EELAMDEHNJF": 101, + "PEJILDNFBDM": "TransformPos_Activity_SpringFestival_D5_chat_12_end", + "GODBHKPHLJL": "TeleportName_01_DecorativeText", + "HPHDJNGIGEG": "", + "NNFLFJOMAPK": 0, + "ILHKKGMIIEL": 0, + "BNDGHLOKGPE": 0, + "KCKKEMJNJBG": [], + "LKMJDLABMBA": [], + "NOFNIIEJKJJ": [ + 70055 + ], + "NFDGMJMKHOK": [ + 117, + 123 + ], + "FJIEAJBHKLC": false + }, { "OPFEAMDPIAG": 115000091, "LANJNPHPJEH": 140, diff --git a/FileCfg/TimeConfigTemplateTb.json b/FileCfg/TimeConfigTemplateTb.json index 529f3b47..11c82f83 100644 --- a/FileCfg/TimeConfigTemplateTb.json +++ b/FileCfg/TimeConfigTemplateTb.json @@ -1,5 +1,10 @@ { "GHFLHABGNDH": [ + { + "OPFEAMDPIAG": "AbyssS2_Agent_Release", + "JAGIJOLOMAM": 0, + "BPCLKADELFF": "2025-03-21 10:00:00" + }, { "OPFEAMDPIAG": "AbyssS2_trial_release", "JAGIJOLOMAM": 0, diff --git a/FileCfg/TipsConfigTemplateTb.json b/FileCfg/TipsConfigTemplateTb.json index ef28c7e6..bc53d427 100644 Binary files a/FileCfg/TipsConfigTemplateTb.json and b/FileCfg/TipsConfigTemplateTb.json differ diff --git a/FileCfg/TransitionConfigTemplateTb.json b/FileCfg/TransitionConfigTemplateTb.json index 17b91c75..79d6a7a1 100644 --- a/FileCfg/TransitionConfigTemplateTb.json +++ b/FileCfg/TransitionConfigTemplateTb.json @@ -10437,7 +10437,7 @@ "LKJKHAFGFGE": 0, "NEEMNPDMAFE": 1500, "JEEJJDCJCGE": 0, - "ABENMLIJGDK": 2, + "ABENMLIJGDK": 0, "JEEFKAKJMOH": 16112, "NJBEIINEINF": true, "KFHKGELKJBD": "", diff --git a/FileCfg/UnlockConfigTemplateTb.json b/FileCfg/UnlockConfigTemplateTb.json index 05806c78..c2607205 100644 --- a/FileCfg/UnlockConfigTemplateTb.json +++ b/FileCfg/UnlockConfigTemplateTb.json @@ -6165,7 +6165,8 @@ "OPFEAMDPIAG": 30030, "JOGGOAJIAJJ": null, "FPKBDPBANDN": [ - 7005199 + 7005199, + 7021501 ], "GLKCAKOJEAL": 0, "EDOMFMNMFGL": 0, diff --git a/TextMap/TextMapTemplateTb.json b/TextMap/TextMapTemplateTb.json index a0e6733c..6e3fcced 100644 Binary files a/TextMap/TextMapTemplateTb.json and b/TextMap/TextMapTemplateTb.json differ diff --git a/TextMap/TextMap_CHTTemplateTb.json b/TextMap/TextMap_CHTTemplateTb.json index 351228fc..191e35f7 100644 Binary files a/TextMap/TextMap_CHTTemplateTb.json and b/TextMap/TextMap_CHTTemplateTb.json differ diff --git a/TextMap/TextMap_DETemplateTb.json b/TextMap/TextMap_DETemplateTb.json index 1eebcf30..2123fedf 100644 Binary files a/TextMap/TextMap_DETemplateTb.json and b/TextMap/TextMap_DETemplateTb.json differ diff --git a/TextMap/TextMap_ENTemplateTb.json b/TextMap/TextMap_ENTemplateTb.json index 2313ec61..e06ce966 100644 Binary files a/TextMap/TextMap_ENTemplateTb.json and b/TextMap/TextMap_ENTemplateTb.json differ diff --git a/TextMap/TextMap_ESTemplateTb.json b/TextMap/TextMap_ESTemplateTb.json index d1792dba..4e26d524 100644 Binary files a/TextMap/TextMap_ESTemplateTb.json and b/TextMap/TextMap_ESTemplateTb.json differ diff --git a/TextMap/TextMap_FRTemplateTb.json b/TextMap/TextMap_FRTemplateTb.json index 572771bc..01a4b94d 100644 Binary files a/TextMap/TextMap_FRTemplateTb.json and b/TextMap/TextMap_FRTemplateTb.json differ diff --git a/TextMap/TextMap_IDTemplateTb.json b/TextMap/TextMap_IDTemplateTb.json index e884d96f..aafa8ff6 100644 Binary files a/TextMap/TextMap_IDTemplateTb.json and b/TextMap/TextMap_IDTemplateTb.json differ diff --git a/TextMap/TextMap_JATemplateTb.json b/TextMap/TextMap_JATemplateTb.json index f168dc8b..f1859370 100644 Binary files a/TextMap/TextMap_JATemplateTb.json and b/TextMap/TextMap_JATemplateTb.json differ diff --git a/TextMap/TextMap_KOTemplateTb.json b/TextMap/TextMap_KOTemplateTb.json index 8d2c65ea..9e666c08 100644 Binary files a/TextMap/TextMap_KOTemplateTb.json and b/TextMap/TextMap_KOTemplateTb.json differ diff --git a/TextMap/TextMap_Login_DETemplateTb.json b/TextMap/TextMap_Login_DETemplateTb.json index d6666d86..42a40f31 100644 --- a/TextMap/TextMap_Login_DETemplateTb.json +++ b/TextMap/TextMap_Login_DETemplateTb.json @@ -305,7 +305,7 @@ "Setting_Graphic_Option7": "Antialiasing", "Setting_Graphic_Option8": "Reflexion", "Setting_Graphic_Option9": "Volumetrischer Nebel", - "Setting_Graphic_Option_CharacterDynamicHighPrecision": "Hochpräzise Figurenanimation", + "Setting_Graphic_Option_CharacterDynamicHighPrecision": "Hochpräzise Figurenauflösung", "Setting_Graphic_Option_CharacterDynamicHighPrecisionOpen": "Global", "Setting_Graphic_Option_CharacterDynamicHighPrecisionPartiallyOpen": "Dynamisch", "Setting_Graphic_Option_DISABLE": "Deaktivieren", @@ -478,7 +478,7 @@ "Setting_INPUT_OptionTitle5": "Stadt", "Setting_INPUT_OptionTitle6": "CITY", "Setting_INPUT_OptionTitle7": "Spielbrett", - "Setting_INPUT_SlideButton": "Wische während des Kampfes, um die Taste auszulösen.ßßß", + "Setting_INPUT_SlideButton": "Wische zur Auslösung der Tasten im Kampf", "Setting_INPUT_Tips1": "Widersprüchliche Tastenbelegung:", "Setting_INPUT_Tips2": "„{0}“ und „{1}“", "Setting_INPUT_Tips3": "Es besteht ein Konflikt bei der Tastenbelegung. Das System wird automatisch die Tastenbelegung für die beiden Funktionen wechseln. Willst du fortfahren?", @@ -580,8 +580,8 @@ "Setting_OTHER_Value7_1": "Aktivieren", "Setting_OTHER_Value7_2": "Deaktivieren", "Setting_OTHER_Value9_1": "Empfohlener Stil", - "Setting_OTHER_Value9_2": "Alles in Fettschrift anzeigen", - "Setting_OTHER_Value9_3": "Alles in normalem Schriftsatz anzeigen", + "Setting_OTHER_Value9_2": "Alles in Fettschrift", + "Setting_OTHER_Value9_3": "Nicht-Fettschrift", "Setting_Photo_Activity_Ready": "Anforderungen erfüllt", "Setting_Push_Content1": "Die Batterie ist voll. Weitermachen mit dem „Geschäft“!", "Setting_Push_Title1": "Batterie zu 100\u00A0% geladen!", diff --git a/TextMap/TextMap_Login_ENTemplateTb.json b/TextMap/TextMap_Login_ENTemplateTb.json index e72ecd67..7009a58a 100644 --- a/TextMap/TextMap_Login_ENTemplateTb.json +++ b/TextMap/TextMap_Login_ENTemplateTb.json @@ -217,11 +217,11 @@ "Setting_Account_Value3": "View Here", "Setting_Account_Value5": "View Here", "Setting_AnisotropicSampling": "Anisotropic Sampling", - "Setting_AnisotropicSampling_16x": "×16", - "Setting_AnisotropicSampling_1x": "×1", - "Setting_AnisotropicSampling_2x": "×2", - "Setting_AnisotropicSampling_4x": "×4", - "Setting_AnisotropicSampling_8x": "×8", + "Setting_AnisotropicSampling_16x": "16x", + "Setting_AnisotropicSampling_1x": "1x", + "Setting_AnisotropicSampling_2x": "2x", + "Setting_AnisotropicSampling_4x": "4x", + "Setting_AnisotropicSampling_8x": "8x", "Setting_Button_01": "Select", "Setting_Button_02": "Return", "Setting_Button_03": "Return", diff --git a/TextMap/TextMap_Login_FRTemplateTb.json b/TextMap/TextMap_Login_FRTemplateTb.json index 09b4fec0..33a4c1c2 100644 --- a/TextMap/TextMap_Login_FRTemplateTb.json +++ b/TextMap/TextMap_Login_FRTemplateTb.json @@ -217,11 +217,11 @@ "Setting_Account_Value3": "Voir ici", "Setting_Account_Value5": "Voir ici", "Setting_AnisotropicSampling": "Filtrage anisotrope", - "Setting_AnisotropicSampling_16x": "×16", - "Setting_AnisotropicSampling_1x": "×1", - "Setting_AnisotropicSampling_2x": "×2", - "Setting_AnisotropicSampling_4x": "×4", - "Setting_AnisotropicSampling_8x": "×8", + "Setting_AnisotropicSampling_16x": "16x", + "Setting_AnisotropicSampling_1x": "1x", + "Setting_AnisotropicSampling_2x": "2x", + "Setting_AnisotropicSampling_4x": "4x", + "Setting_AnisotropicSampling_8x": "8x", "Setting_Button_01": "Sélectionner", "Setting_Button_02": "Retour", "Setting_Button_03": "Retour", @@ -305,7 +305,7 @@ "Setting_Graphic_Option7": "Anti-Aliasing", "Setting_Graphic_Option8": "Reflets spéculaires", "Setting_Graphic_Option9": "Brouillard volumétrique", - "Setting_Graphic_Option_CharacterDynamicHighPrecision": "Animation des personnages de haute précision", + "Setting_Graphic_Option_CharacterDynamicHighPrecision": "Résolution dynamique des personnages", "Setting_Graphic_Option_CharacterDynamicHighPrecisionOpen": "Global", "Setting_Graphic_Option_CharacterDynamicHighPrecisionPartiallyOpen": "Dynamique", "Setting_Graphic_Option_DISABLE": "Désactiver", @@ -478,6 +478,7 @@ "Setting_INPUT_OptionTitle5": "Ville", "Setting_INPUT_OptionTitle6": "CITY", "Setting_INPUT_OptionTitle7": "Damier", + "Setting_INPUT_SlideButton": "Faites glisser pour déclencher les boutons en combat", "Setting_INPUT_Tips1": "Conflit de configuration de {LAYOUT_CONTROLLER#boutons}{LAYOUT_FALLBACK#touches}\u00A0:", "Setting_INPUT_Tips2": "{0} et {1}", "Setting_INPUT_Tips3": "{LAYOUT_CONTROLLER#Boutons}{LAYOUT_FALLBACK#Touches} en conflit dans la configuration actuelle. Le système va automatiquement les échanger. Échanger les {LAYOUT_CONTROLLER#boutons}{LAYOUT_FALLBACK#touches}\u00A0?", diff --git a/TextMap/TextMap_Login_IDTemplateTb.json b/TextMap/TextMap_Login_IDTemplateTb.json index 4d3a0506..273b34c1 100644 --- a/TextMap/TextMap_Login_IDTemplateTb.json +++ b/TextMap/TextMap_Login_IDTemplateTb.json @@ -265,7 +265,7 @@ "Setting_Difficulty_Btn": "Pilih", "Setting_Difficulty_Close": "Mode Kasual", "Setting_Difficulty_Close_Detail": "Mode yang berfokus pada alur cerita.\nSaat menjalankan Cerita Utama, tingkat kesulitan pertarungan lebih rendah. Cocok untuk pemain yang ingin bersantai.", - "Setting_Difficulty_Des": "Dapat diubah kapan saja melalui Setelan", + "Setting_Difficulty_Des": "Ubah kapan saja melalui Setelan", "Setting_Difficulty_Open": "Mode Tantangan", "Setting_Difficulty_Open_Detail": "Mode yang seimbang antara pertarungan dan alur cerita.\nSaat menjalankan Cerita Utama, tingkat kesulitan pertarungan lebih tinggi. Cocok untuk pemain yang menyukai tantangan.", "Setting_Difficulty_Tips01": "Mulai ulang pertarungan ini?", diff --git a/TextMap/TextMap_Login_JATemplateTb.json b/TextMap/TextMap_Login_JATemplateTb.json index 74b609c2..296443cd 100644 --- a/TextMap/TextMap_Login_JATemplateTb.json +++ b/TextMap/TextMap_Login_JATemplateTb.json @@ -29,7 +29,7 @@ "ErrorTipsButton2": "再接続", "ErrorTitle_1": "エラー", "Error_AccountServerFail": "AccountServerの取得に失敗しました、{0}", - "Error_StopServer01": "新エリー都は現在メンテナンス中です。調律テスト開始日時は{0}です、乞うご期待ください。", + "Error_StopServer01": "新エリー都は現在メンテナンス中です。調律テスト開始日時は{0}です、どうぞご期待ください。", "Error_StopServer02": "今回の調律テストは終了いたしました。プロキシの皆様、また会える日を心待ちにしております！", "Error_UpdateFail01": "最新バージョンがあります。ゲームを再起動してください。", "General_Button_Detail": "詳細", @@ -478,6 +478,7 @@ "Setting_INPUT_OptionTitle5": "メインシティ", "Setting_INPUT_OptionTitle6": "CITY", "Setting_INPUT_OptionTitle7": "TVアレイ", + "Setting_INPUT_SlideButton": "戦闘中、ボタンスワイプで操作可能", "Setting_INPUT_Tips1": "{LAYOUT_KEYBOARD#キー}{LAYOUT_FALLBACK#ボタン}の重複：", "Setting_INPUT_Tips2": "[{0}] と [{1}]", "Setting_INPUT_Tips3": "{LAYOUT_KEYBOARD#キー}{LAYOUT_FALLBACK#ボタン}同士の設定が重複しているため、システムが自動的に{LAYOUT_KEYBOARD#キー}{LAYOUT_FALLBACK#ボタン}の入れ替えを行います。続行しますか？", @@ -642,7 +643,7 @@ "UIText_383": "身分証明書", "UIText_384": "OK", "UIText_421": "その他", - "XboxAlert_CommGeneral": "申し訳ありませんが、現在、他のユーザーと会話することはできません。しばらく経ってからもう一度お試しください。_JP0D", + "XboxAlert_CommGeneral": "申し訳ありませんが、現在、他のユーザーと会話することはできません。しばらく経ってからもう一度お試しください。", "XboxAlert_Communication": "申し訳ございません、現在の権限設定では、他のユーザーとのチャットはできません。", "XboxAlert_CrossComm": "申し訳ございません、現在の権限設定では、Xbox ネットワークで他のユーザーとのチャットはできません。", "XboxAlert_CrossPlatform": "申し訳ございません、現在の権限設定では、Xbox ネットワーク以外のプラットフォームで他のユーザーとプレイすることはできません。", diff --git a/TextMap/TextMap_Login_KOTemplateTb.json b/TextMap/TextMap_Login_KOTemplateTb.json index a7a66ece..71793885 100644 --- a/TextMap/TextMap_Login_KOTemplateTb.json +++ b/TextMap/TextMap_Login_KOTemplateTb.json @@ -478,7 +478,7 @@ "Setting_INPUT_OptionTitle5": "도시", "Setting_INPUT_OptionTitle6": "CITY", "Setting_INPUT_OptionTitle7": "보드", - "Setting_INPUT_SlideButton": "전투 중 슬라이드하여 버튼 발동 가능", + "Setting_INPUT_SlideButton": "전투 중 드래그하여 버튼 발동 가능", "Setting_INPUT_Tips1": "버튼 설정 충돌:", "Setting_INPUT_Tips2": "[{0}] 및 [{1}]", "Setting_INPUT_Tips3": "기능 버튼 설정 충돌, 시스템이 자동으로 기능 버튼 설정을 교체합니다. 교체하시겠습니까?", diff --git a/TextMap/TextMap_Login_RUTemplateTb.json b/TextMap/TextMap_Login_RUTemplateTb.json index 9086860a..8089650b 100644 --- a/TextMap/TextMap_Login_RUTemplateTb.json +++ b/TextMap/TextMap_Login_RUTemplateTb.json @@ -305,7 +305,7 @@ "Setting_Graphic_Option7": "Сглаживание", "Setting_Graphic_Option8": "Зеркальные отражения", "Setting_Graphic_Option9": "Объёмный туман", - "Setting_Graphic_Option_CharacterDynamicHighPrecision": "Высокая точность анимации персонажей", + "Setting_Graphic_Option_CharacterDynamicHighPrecision": "Высокая точность персонажей в динамике", "Setting_Graphic_Option_CharacterDynamicHighPrecisionOpen": "Глобальное", "Setting_Graphic_Option_CharacterDynamicHighPrecisionPartiallyOpen": "Динамическое", "Setting_Graphic_Option_DISABLE": "Выкл.", @@ -645,8 +645,8 @@ "UIText_421": "Другое", "XboxAlert_CommGeneral": "К сожалению, пока вы не можете общаться с другими пользователями, попробуйте позже.", "XboxAlert_Communication": "К сожалению, текущие настройки прав доступа запрещают вам общаться с другими пользователями.", - "XboxAlert_CrossComm": "К сожалению, текущие настройки прав доступа запрещают вам общаться с пользователями на других платформах, кроме сети Xbox.", - "XboxAlert_CrossPlatform": "К сожалению, текущие настройки прав доступа запрещают вам играть с пользователями на других платформах, кроме сети Xbox.", + "XboxAlert_CrossComm": "К сожалению, текущие настройки прав доступа запрещают вам общаться с пользователями на других платформах, кроме Cети Xbox.", + "XboxAlert_CrossPlatform": "К сожалению, текущие настройки прав доступа запрещают вам играть с пользователями на других платформах, кроме Cети Xbox.", "XboxAlert_Multiplayer": "К сожалению, совместный режим с текущими правами доступа недоступен.", "XboxAlert_Title": "Конфликт прав доступа", "XboxAlert_UGC": "К сожалению, текущие настройки прав доступа запрещают вам просматривать контент, созданный другими пользователями.", diff --git a/TextMap/TextMap_Login_THTemplateTb.json b/TextMap/TextMap_Login_THTemplateTb.json index a22be0b6..d7a1454e 100644 --- a/TextMap/TextMap_Login_THTemplateTb.json +++ b/TextMap/TextMap_Login_THTemplateTb.json @@ -216,12 +216,12 @@ "Setting_Account_Value2": "กดเพื่อดู", "Setting_Account_Value3": "กดเพื่อดู", "Setting_Account_Value5": "กดเพื่อดู", - "Setting_AnisotropicSampling": "การสุ่มตัวอย่างแบบแอนไอโซโทรปิก", - "Setting_AnisotropicSampling_16x": "×16", - "Setting_AnisotropicSampling_1x": "×1", - "Setting_AnisotropicSampling_2x": "×2", - "Setting_AnisotropicSampling_4x": "×4", - "Setting_AnisotropicSampling_8x": "×8", + "Setting_AnisotropicSampling": "ตัวกรอง Anisotropic", + "Setting_AnisotropicSampling_16x": "16x", + "Setting_AnisotropicSampling_1x": "1x", + "Setting_AnisotropicSampling_2x": "2x", + "Setting_AnisotropicSampling_4x": "4x", + "Setting_AnisotropicSampling_8x": "8x", "Setting_Button_01": "เลือก", "Setting_Button_02": "กลับ", "Setting_Button_03": "กลับไป", @@ -478,7 +478,7 @@ "Setting_INPUT_OptionTitle5": "เมือง", "Setting_INPUT_OptionTitle6": "CITY", "Setting_INPUT_OptionTitle7": "กระดานหมากรุก", - "Setting_INPUT_SlideButton": "แตะปุ่มนี้ในระหว่างการต่อสู้", + "Setting_INPUT_SlideButton": "สไลด์ในระหว่างการต่อสู้เพื่อทำให้เกิดปุ่มกด", "Setting_INPUT_Tips1": "ตำแหน่งปุ่มขัดแย้ง:", "Setting_INPUT_Tips2": "[{0}] และ [{1}]", "Setting_INPUT_Tips3": "ตำแหน่งปุ่มฟังก์ชันมีความขัดแย้ง ระบบจะทำการสลับปุ่มฟังก์ชันโดยอัตโนมัติ ยืนยันที่จะสลับหรือไม่?", diff --git a/TextMap/TextMap_PTTemplateTb.json b/TextMap/TextMap_PTTemplateTb.json index 499b41f6..f02d1b16 100644 Binary files a/TextMap/TextMap_PTTemplateTb.json and b/TextMap/TextMap_PTTemplateTb.json differ diff --git a/TextMap/TextMap_RUTemplateTb.json b/TextMap/TextMap_RUTemplateTb.json index e9570e2d..2002ecd2 100644 Binary files a/TextMap/TextMap_RUTemplateTb.json and b/TextMap/TextMap_RUTemplateTb.json differ diff --git a/TextMap/TextMap_THTemplateTb.json b/TextMap/TextMap_THTemplateTb.json index f7e7458d..90a78195 100644 Binary files a/TextMap/TextMap_THTemplateTb.json and b/TextMap/TextMap_THTemplateTb.json differ diff --git a/TextMap/TextMap_VITemplateTb.json b/TextMap/TextMap_VITemplateTb.json index 55780076..bbc4975f 100644 Binary files a/TextMap/TextMap_VITemplateTb.json and b/TextMap/TextMap_VITemplateTb.json differ