diff --git a/Data/Abyss_Fixed02LayerBuff_04.json b/Data/Abyss_Fixed02LayerBuff_04.json index b035824..4bf13a2 100644 --- a/Data/Abyss_Fixed02LayerBuff_04.json +++ b/Data/Abyss_Fixed02LayerBuff_04.json @@ -14,13 +14,6 @@ { "$type": "ApplyModifier", "ModifierName": "Abyss_Fixed02LayerBuff_04_StunDestroyRecoverModifier", - "Predicates": [ - { - "$type": "ByIsStunDestroyed", - "IsStunDestroyed": true, - "Target": "Target" - } - ], "Target": "Target" } ], diff --git a/Data/Abyss_Fixed02LayerBuff_07.json b/Data/Abyss_Fixed02LayerBuff_07.json index d5715de..0d927fc 100644 --- a/Data/Abyss_Fixed02LayerBuff_07.json +++ b/Data/Abyss_Fixed02LayerBuff_07.json @@ -24,7 +24,7 @@ "Abyss_Fixed02LayerBuff_07_BuffModifier": { "Duration": "%AS_Duration", "MaxStackingNumber": 3, - "ModifierStacking": "Multiple", + "ModifierStacking": "MultipleRefresh", "Properties": { "Actor_AddedDamageRatio": "%AS_AddedDamageRatio", "Actor_DamageTakeRatio": "%AS_DamageTakeRatio" diff --git a/Data/Abyss_PeriodicLayerBuff_04_02.json b/Data/Abyss_PeriodicLayerBuff_04_02.json index bb6cb5d..2519f87 100644 --- a/Data/Abyss_PeriodicLayerBuff_04_02.json +++ b/Data/Abyss_PeriodicLayerBuff_04_02.json @@ -20,7 +20,7 @@ }, "Duration": "%Duration", "MaxStackingNumber": 3, - "ModifierStacking": "Multiple", + "ModifierStacking": "MultipleRefresh", "Properties": { "Actor_BaseAttackRatio": "%AS_BaseAtkRatio", "Actor_ElementMysteryDelta": "%AS_ElementMysteryDelta" diff --git a/Data/Aokaku_UniqueSkill.json b/Data/Aokaku_UniqueSkill.json index 76cc351..5258dfa 100644 --- a/Data/Aokaku_UniqueSkill.json +++ b/Data/Aokaku_UniqueSkill.json @@ -189,6 +189,11 @@ "ModifierName": "AokakuUniqueModifier", "Target": "TeamAvatars" }, + { + "$type": "RemoveModifier", + "ModifierName": "AokakuUniqueModifier", + "Target": "Self" + }, { "$type": "SetAbilitySpecialByExpression", "DoRefresh": false, diff --git a/Data/AudioResourceData.json b/Data/AudioResourceData.json index ea58a7c..fd9196b 100644 Binary files a/Data/AudioResourceData.json and b/Data/AudioResourceData.json differ diff --git a/Data/Card_DailyUse_11009480.json b/Data/Card_DailyUse_11009480.json index d318352..690ce67 100644 --- a/Data/Card_DailyUse_11009480.json +++ b/Data/Card_DailyUse_11009480.json @@ -22,6 +22,7 @@ { "$type": "DecreaseHPAction", "Amount": 0, + "IgnoreInvincible": "true", "Percentage": "%AddedEnemyHPRatio_01", "Predicates": [ { diff --git a/Data/Card_Exchange_2001613.json b/Data/Card_Exchange_2001613.json index 5556817..2383ea6 100644 --- a/Data/Card_Exchange_2001613.json +++ b/Data/Card_Exchange_2001613.json @@ -11,7 +11,7 @@ "OnHitOther": [ { "$type": "RandomOperator", - "Odds": "%RecoverOdds", + "Odds": "%RecoveryOdds", "OnSuccess": [ { "$type": "ModifyPerfectSwitchPointAction", diff --git a/Data/ConfigNewbie.json b/Data/ConfigNewbie.json index 722f120..7558d98 100644 --- a/Data/ConfigNewbie.json +++ b/Data/ConfigNewbie.json @@ -27617,6 +27617,17 @@ "HighLightPath": "RewardNoProgressBg", "HighLightSkipConsole": false }, + { + "ExtraIsChild": true, + "ExtraPrefab": "RewardBtnRow", + "ExtraType": 1, + "HighLightAddSortingOrder": true, + "HighLightButtonClick": false, + "HighLightIgnoreLightLoop": 0, + "HighLightMuteClickNextCB": false, + "HighLightPath": "Btn/Icon", + "HighLightSkipConsole": false + }, { "ExtraIsChild": true, "ExtraPrefab": "RewardBtnRow", @@ -27657,7 +27668,7 @@ }, { "ExtraType": 0, - "HighLightAddSortingOrder": false, + "HighLightAddSortingOrder": true, "HighLightButtonClick": false, "HighLightIgnoreLightLoop": 0, "HighLightMuteClickNextCB": false, @@ -27666,7 +27677,7 @@ }, { "ExtraType": 0, - "HighLightAddSortingOrder": true, + "HighLightAddSortingOrder": false, "HighLightButtonClick": false, "HighLightIgnoreLightLoop": 0, "HighLightMuteClickNextCB": false, diff --git a/Data/DeathXIII_AddBreakStunRatio.json b/Data/DeathXIII_AddBreakStunRatio.json index 4e631a3..1cd4649 100644 --- a/Data/DeathXIII_AddBreakStunRatio.json +++ b/Data/DeathXIII_AddBreakStunRatio.json @@ -1,37 +1,39 @@ { "AbilityName": "DeathXIII_AddBreakStunRatio", "AbilitySpecials": { - "AS_AddedBreakStunRatio": { - "Value": 2 + "AS_PartStun": { + "Value": 0.0 + }, + "AS_PartStunRatio": { + "Value": 0.25 } }, "AbilityStacking": "Unique", "DefaultModifier": { + "OnAdded": [ + { + "$type": "SetAbilitySpecialByExpression", + "DoRefresh": true, + "Expression": "property(MaxStun)*specials(AS_PartStunRatio)", + "ParamName": "AS_PartStun", + "Target": "Self", + "ValueType": "Float" + } + ], "OnBeingHitPre": [ { - "$type": "ModifyAttackDataAction", + "$type": "RecoverStunAction", + "Amount": "%AS_PartStun", + "Percentage": 0, "Predicates": [ { - "$type": "ByOr", - "Predicates": [ - { - "$type": "ByAnimTagList", - "TagList": [ - "ParryAid" - ] - }, - { - "$type": "ByAnimTagList", - "TagList": [ - "AssaultAid" - ] - } + "$type": "ByAnimTagList", + "TagList": [ + "ParryAid" ] } ], - "PropertyKey": "Actor_AddedBreakStunRatio", - "PropertyValue": "%AS_AddedBreakStunRatio", - "Target": "Target" + "Target": "Self" } ] } diff --git a/Data/Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam.json b/Data/Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam.json new file mode 100644 index 0000000..60a8aad --- /dev/null +++ b/Data/Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam.json @@ -0,0 +1,16 @@ +{ + "AbilityName": "Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam", + "AbilityStacking": "Unique", + "OnAbilityStart": [ + { + "$type": "TriggerAbilityAction", + "AbilityName": "Device_SkyScraper_AttackTheftWall_LaserBeam_LP01", + "Target": "Self" + }, + { + "$type": "TriggerAbilityAction", + "AbilityName": "Device_SkyScraper_AttackTheftWall_LaserBeam_LP02", + "Target": "Self" + } + ] +} \ No newline at end of file diff --git a/Data/Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam_OnePack.json b/Data/Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam_OnePack.json new file mode 100644 index 0000000..d1800f6 --- /dev/null +++ b/Data/Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam_OnePack.json @@ -0,0 +1,16 @@ +{ + "AbilityName": "Device_SkyScraper_AttackTheftWall_Trigger_LaserBeam_OnePack", + "AbilityStacking": "Unique", + "OnAbilityStart": [ + { + "$type": "TriggerAbilityAction", + "AbilityName": "Device_SkyScraper_AttackTheftWall_LaserBeam_LP01", + "Target": "Self" + }, + { + "$type": "TriggerAbilityAction", + "AbilityName": "Device_SkyScraper_AttackTheftWall_LaserBeam_LP02", + "Target": "Self" + } + ] +} \ No newline at end of file diff --git a/Data/HollowEntityGroup.json b/Data/HollowEntityGroup.json index 49ebecc..4f0d584 100644 --- a/Data/HollowEntityGroup.json +++ b/Data/HollowEntityGroup.json @@ -5900,7 +5900,7 @@ "$type": "CHollowNPCEntityConfig", "BehaviorScript": 1020809, "ID": 1020809, - "InteractIconTextureSheetID": 10221, + "InteractIconTextureSheetID": 10000, "NPCType": 1, "NpcHp": 1, "ObstacleSubstate": [ @@ -13202,7 +13202,7 @@ }, { "$type": "CHollowNPCEntityConfig", - "BehaviorScript": 1981517, + "BehaviorScript": 19815114, "Category": [ "NoneInteractEventWithAnim" ], @@ -13241,7 +13241,7 @@ }, { "$type": "CHollowNPCEntityConfig", - "BehaviorScript": 1981517, + "BehaviorScript": 19815115, "Category": [ "NoneInteractEventWithAnim" ], @@ -13277,7 +13277,7 @@ }, { "$type": "CHollowNPCEntityConfig", - "BehaviorScript": 1981517, + "BehaviorScript": 19815116, "Category": [ "NoneInteractEventWithAnim" ], @@ -13350,7 +13350,7 @@ }, { "$type": "CHollowNPCEntityConfig", - "BehaviorScript": 1981517, + "BehaviorScript": 19815118, "Category": [ "NoneInteractEventWithAnim" ], diff --git a/Data/JaneDoe_BornSoundAction.json b/Data/JaneDoe_BornSoundAction.json index 3f63fca..a2fff0f 100644 --- a/Data/JaneDoe_BornSoundAction.json +++ b/Data/JaneDoe_BornSoundAction.json @@ -71,6 +71,76 @@ ], "Target": "Self" }, + { + "$type": "FireEffect", + "EffectPattern": "Eff_Monster_JaneDoe_Born_03_Spark", + "FireEffectPosRot": { + "CoordsOption": "ReferTarget", + "Offset": { + "AngleOffset": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "IsUseRotationXZ": true, + "IsUseRotationY": true, + "PositionOffset": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + "TargetOption": { + "$type": "ConfigPosRotReferTarget", + "AttachPoint": "HeadPoint", + "OffsetReferTarget": "Self" + } + }, + "Predicates": [ + { + "$type": "ByIsInZoneTags", + "Tags": [ + "Slime" + ] + } + ], + "Target": "Self" + }, + { + "$type": "FireEffect", + "EffectPattern": "Eff_Monster_JaneDoe_Born_04_Spark", + "FireEffectPosRot": { + "CoordsOption": "ReferTarget", + "Offset": { + "AngleOffset": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "IsUseRotationXZ": true, + "IsUseRotationY": true, + "PositionOffset": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + "TargetOption": { + "$type": "ConfigPosRotReferTarget", + "AttachPoint": "Skn_Tail_09", + "OffsetReferTarget": "Self" + } + }, + "Predicates": [ + { + "$type": "ByIsInZoneTags", + "Tags": [ + "Slime" + ] + } + ], + "Target": "Self" + }, { "$type": "ModifyMaterialPropertyAction", "ApplyAllRenderers": true, diff --git a/Data/Level_AddMonsterLockLife_30Percent.json b/Data/Level_AddMonsterLockLife_30Percent.json new file mode 100644 index 0000000..8ccd0a4 --- /dev/null +++ b/Data/Level_AddMonsterLockLife_30Percent.json @@ -0,0 +1,32 @@ +{ + "AbilityName": "Level_AddMonsterLockLife_30Percent", + "AbilityStacking": "Unique", + "DefaultModifier": { + "OnAdded": [ + { + "$type": "ApplyModifier", + "ModifierName": "LockLifeModifier", + "Target": "Self" + } + ] + }, + "Modifiers": { + "LockLifeModifier": { + "Duration": -1, + "IgnoreTimeScale": false, + "ModifierMixins": [ + { + "$type": "LockLifePropertyMixin", + "PerformBeHitEffect": true, + "RatioLockList": [ + { + "LockType": "Total", + "LockValue": 0.3 + } + ] + } + ], + "ModifierStacking": "Unique" + } + } +} \ No newline at end of file diff --git a/Data/Level_AddMonsterLockLife_70Percent.json b/Data/Level_AddMonsterLockLife_70Percent.json new file mode 100644 index 0000000..7407df5 --- /dev/null +++ b/Data/Level_AddMonsterLockLife_70Percent.json @@ -0,0 +1,32 @@ +{ + "AbilityName": "Level_AddMonsterLockLife_70Percent", + "AbilityStacking": "Unique", + "DefaultModifier": { + "OnAdded": [ + { + "$type": "ApplyModifier", + "ModifierName": "LockLifeModifier", + "Target": "Self" + } + ] + }, + "Modifiers": { + "LockLifeModifier": { + "Duration": -1, + "IgnoreTimeScale": false, + "ModifierMixins": [ + { + "$type": "LockLifePropertyMixin", + "PerformBeHitEffect": true, + "RatioLockList": [ + { + "LockType": "Total", + "LockValue": 0.7 + } + ] + } + ], + "ModifierStacking": "Unique" + } + } +} \ No newline at end of file diff --git a/Data/Nineveh_BossRush_AbilityManager.json b/Data/Nineveh_BossRush_AbilityManager.json index cefd354..0dc4ece 100644 --- a/Data/Nineveh_BossRush_AbilityManager.json +++ b/Data/Nineveh_BossRush_AbilityManager.json @@ -4,15 +4,20 @@ "DefaultModifier": { "OnAdded": [ { - "$type": "ApplyModifier", - "ModifierName": "RemoveDefaultAbility_Modifier", + "$type": "ApplyAbilityAction", + "AbilityName": "Nineveh_UltimateSkill_Manager", "Predicates": [ { - "$type": "ByIsInZoneTags", - "Tags": [ - "BossRush" - ], - "Target": "Self" + "$type": "ByNot", + "Predicates": [ + { + "$type": "ByIsInZoneTags", + "Tags": [ + "BossRush" + ], + "Target": "Self" + } + ] } ], "Target": "Self" @@ -158,17 +163,6 @@ "Target": "Self" } ] - }, - "RemoveDefaultAbility_Modifier": { - "Duration": -1, - "ModifierStacking": "Unique", - "OnAdded": [ - { - "$type": "RemoveAbilityAction", - "AbilityName": "Nineveh_UltimateSkill_Manager", - "Target": "Self" - } - ] } } } \ No newline at end of file diff --git a/Data/QingYi_DamageReduction.json b/Data/QingYi_DamageReduction.json new file mode 100644 index 0000000..5c13380 --- /dev/null +++ b/Data/QingYi_DamageReduction.json @@ -0,0 +1,74 @@ +{ + "AbilityMixins": [ + { + "$type": "AttachStateWithModifierMixin", + "ConfigList": [ + { + "AnimatorStateName": "Attack_Normal_05", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "DamageTakeRatioModifier" + ] + }, + { + "AnimatorStateName": "Attack_Normal_06", + "FrameCountHigh": 26, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": false, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "DamageTakeRatioModifier" + ] + }, + { + "AnimatorStateName": "Attack_Normal_07", + "FrameCountHigh": 60, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": false, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "DamageTakeRatioModifier" + ] + }, + { + "AnimatorStateName": "Attack_Branch_01_Enhance", + "FrameCountHigh": 0, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": true, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "DamageTakeRatioModifier" + ] + } + ] + } + ], + "AbilityName": "QingYi_DamageReduction", + "AbilitySpecials": { + "AS_DamageTakeRatio": { + "Value": -0.4 + } + }, + "AbilityStacking": "Unique", + "Modifiers": { + "DamageTakeRatioModifier": { + "Duration": -1, + "IgnoreTimeScale": false, + "ModifierStacking": "Unique", + "Properties": { + "Actor_DamageTakeRatio": "%AS_DamageTakeRatio" + } + } + } +} \ No newline at end of file diff --git a/Data/QingYi_LoopControl.json b/Data/QingYi_LoopControl.json index cae5075..f8ebf3f 100644 --- a/Data/QingYi_LoopControl.json +++ b/Data/QingYi_LoopControl.json @@ -62,6 +62,18 @@ "ModifierNameList": [ "Modifier_Attack_Normal_05_Instate" ] + }, + { + "AnimatorStateName": "Attack_Normal_07", + "FrameCountHigh": 9, + "FrameCountLow": 0, + "IsLoop": false, + "LayerIndex": 0, + "MaxFrameCountHigh": false, + "MaxFrameCountLow": false, + "ModifierNameList": [ + "Modifier_Attack_Normal_05_Instate" + ] } ] }, @@ -105,34 +117,25 @@ }, { "ActionList": [ - { - "$type": "SetAnimCtrlerParamAction", - "BoolVal": true, - "ParamName": "Bool_ReachLongTimeThreshold", - "ParamType": 2, - "Predicates": [ - { - "$type": "ByAbilitySpecial", - "CompareType": "Equal", - "Param": 2, - "ParamName": "Attack_05_RepeatTime", - "ParamType": "Integer", - "Target": "Self" - } - ], - "Target": "Self" - }, { "$type": "FireEffect", "EffectPattern": "Eff_QingYi_Attack_Normal_05_13_Flash", "Predicates": [ { "$type": "ByAbilitySpecial", - "CompareType": "Equal", + "CompareType": "GreaterEqual", "Param": 2, "ParamName": "Attack_05_RepeatTime", "ParamType": "Integer", "Target": "Self" + }, + { + "$type": "ByAnimCtrlerParam", + "BoolVal": false, + "CompareType": "Equal", + "ParamName": "Bool_ReachLongTimeThreshold", + "ParamType": 2, + "Target": "Self" } ], "Target": "Self" @@ -142,15 +145,48 @@ "Predicates": [ { "$type": "ByAbilitySpecial", - "CompareType": "Equal", + "CompareType": "GreaterEqual", "Param": 2, "ParamName": "Attack_05_RepeatTime", "ParamType": "Integer", "Target": "Self" + }, + { + "$type": "ByAnimCtrlerParam", + "BoolVal": false, + "CompareType": "Equal", + "ParamName": "Bool_ReachLongTimeThreshold", + "ParamType": 2, + "Target": "Self" } ], "Target": "Self", "soundActionKey": "Play_SFX_Char_Skill_QingYi_Attack_Normal_07_Ready" + }, + { + "$type": "SetAnimCtrlerParamAction", + "BoolVal": true, + "ParamName": "Bool_ReachLongTimeThreshold", + "ParamType": 2, + "Predicates": [ + { + "$type": "ByAbilitySpecial", + "CompareType": "GreaterEqual", + "Param": 2, + "ParamName": "Attack_05_RepeatTime", + "ParamType": "Integer", + "Target": "Self" + }, + { + "$type": "ByAnimCtrlerParam", + "BoolVal": false, + "CompareType": "Equal", + "ParamName": "Bool_ReachLongTimeThreshold", + "ParamType": 2, + "Target": "Self" + } + ], + "Target": "Self" } ], "AnimatorStateName": "Attack_Normal_05", diff --git a/Data/QingYi_Talent_02.json b/Data/QingYi_Talent_02.json index fac6273..ae22678 100644 --- a/Data/QingYi_Talent_02.json +++ b/Data/QingYi_Talent_02.json @@ -1,4 +1,9 @@ { "AbilityName": "QingYi_Talent_02", + "AbilitySpecials": { + "AS_AddPercentage": { + "Value": 1.35 + } + }, "AbilityStacking": "Unique" } \ No newline at end of file diff --git a/Data/TrainingRoomAbility_ForbidStun.json b/Data/TrainingRoomAbility_ForbidStun.json index 50b31b8..decba7b 100644 --- a/Data/TrainingRoomAbility_ForbidStun.json +++ b/Data/TrainingRoomAbility_ForbidStun.json @@ -10,7 +10,7 @@ "Target": "Self" } ], - "OnBuffDamageHitOther": [ + "OnBuffDamageBeingHit": [ { "$type": "ModifyAttackDataAction", "PropertyKey": "Actor_NoStun", diff --git a/Data/sk.json b/Data/sk.json index 4fea65b..1f86d6c 100644 --- a/Data/sk.json +++ b/Data/sk.json @@ -110,8 +110,8 @@ "partLoop": false, "seqName": "sk", "speedParams": { - "param1": 0, - "param2": 100000 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 0.314285725, diff --git a/Data/sk_bullet.json b/Data/sk_bullet.json index 49f9deb..4eea646 100644 --- a/Data/sk_bullet.json +++ b/Data/sk_bullet.json @@ -86,8 +86,8 @@ "partLoop": false, "seqName": "sk_bullet", "speedParams": { - "param1": 0, - "param2": 100000 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 0.25, diff --git a/Data/sk_melee_1.json b/Data/sk_melee_1.json index eb6a0e2..57270c4 100644 --- a/Data/sk_melee_1.json +++ b/Data/sk_melee_1.json @@ -13,7 +13,7 @@ "outWeight": 0.992300153, "tangentMode": 0, "time": 0.007846832, - "value": 0.00143814087, + "value": -0.09478476, "weightedMode": 0 }, { @@ -23,7 +23,7 @@ "outWeight": 0.0753575638, "tangentMode": 1, "time": 0.0114711719, - "value": -5.893656, + "value": -3.43616676, "weightedMode": 0 }, { @@ -32,8 +32,8 @@ "outTangent": 7.15991831, "outWeight": 0.0190567262, "tangentMode": 1, - "time": 0.106958479, - "value": -5.960778, + "time": 0.08239185, + "value": -3.385772, "weightedMode": 0 }, { @@ -42,8 +42,8 @@ "outTangent": 5.14886236, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.1718708, - "value": 0.170788765, + "time": 0.21537137, + "value": -0.010809239, "weightedMode": 0 }, { @@ -52,8 +52,8 @@ "outTangent": 1.64019763, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.200403363, - "value": 2.57184768, + "time": 0.300087541, + "value": 1.03474867, "weightedMode": 0 }, { @@ -62,8 +62,18 @@ "outTangent": -8.505137, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.5058513, - "value": 2.40999031, + "time": 0.751581967, + "value": 1.68435669, + "weightedMode": 0 + }, + { + "inTangent": -52.666275, + "inWeight": 0.333333343, + "outTangent": -52.666275, + "outWeight": 0.333333343, + "tangentMode": 1, + "time": 0.864566267, + "value": -2.78284431, "weightedMode": 0 }, { @@ -72,8 +82,8 @@ "outTangent": -0.5133556, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.5248153, - "value": -0.005355239, + "time": 0.9838451, + "value": -2.90159369, "weightedMode": 0 }, { @@ -82,18 +92,8 @@ "outTangent": -0.4406633, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.5310809, - "value": -0.0117231607, - "weightedMode": 0 - }, - { - "inTangent": -0.0411395654, - "inWeight": 0.118602842, - "outTangent": -0.0411395654, - "outWeight": 0.0, - "tangentMode": 0, - "time": 0.797463536, - "value": -0.013111949, + "time": 0.984789431, + "value": -0.102472, "weightedMode": 0 } ], @@ -102,7 +102,7 @@ "preWrapMode": 8 }, "effectType": 2, - "endFrame": 14, + "endFrame": 21, "idx": 985623936, "speedEuler": { "x": 0.0, @@ -134,7 +134,7 @@ "brakeDestroy": false, "cpDamageInternal": 1, "effectType": 4, - "endFrame": 14, + "endFrame": 21, "idx": -1244023808, "selectTargetType": 0, "startFrame": 0, @@ -174,8 +174,8 @@ "outTangent": 0.277608871, "outWeight": 0.152788535, "tangentMode": 0, - "time": 0.204981983, - "value": 0.9880996, + "time": 0.4091233, + "value": 1.03117073, "weightedMode": 0 }, { @@ -184,18 +184,8 @@ "outTangent": -1.89114952, "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.652263165, - "value": -0.00251585245, - "weightedMode": 0 - }, - { - "inTangent": 0.07728131, - "inWeight": 0.7114915, - "outTangent": 0.07728131, - "outWeight": 0.333333343, - "tangentMode": 0, - "time": 0.7298343, - "value": -0.006585814, + "time": 0.939378, + "value": -0.0743012, "weightedMode": 0 }, { @@ -219,19 +209,19 @@ "weightedMode": 0 } ], - "length": 7, + "length": 6, "postWrapMode": 8, "preWrapMode": 8 }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], "brakeDestroy": false, "effectType": 1, - "endFrame": 14, + "endFrame": 21, "idx": 320360960, "moveType": 1, "pos": { @@ -249,18 +239,18 @@ ], "backFrame": 0, "clipPath": "", - "frameCount": 15, - "frameRate": 43, + "frameCount": 22, + "frameRate": 30, "loop": true, "modelPath": "Assets/NapResources/UI/Animation/Arcade/Game/Companion/CP_weapon_prefab.prefab", "partLoop": false, "seqName": "sk_melee_1", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, - "totalTime": 0.3488372, + "totalTime": 0.733333349, "trackArray": [ { "order": 0, diff --git a/Data/sk_melee_10.json b/Data/sk_melee_10.json index 41f5acb..17cf765 100644 --- a/Data/sk_melee_10.json +++ b/Data/sk_melee_10.json @@ -187,7 +187,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -219,7 +219,7 @@ "seqName": "sk_melee_10", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.1, diff --git a/Data/sk_melee_11.json b/Data/sk_melee_11.json index af6f5f8..4296096 100644 --- a/Data/sk_melee_11.json +++ b/Data/sk_melee_11.json @@ -162,8 +162,8 @@ "outTangent": 0.85931474, "outWeight": 1.0, "tangentMode": 1, - "time": 0.199163675, - "value": 0.9740747, + "time": 0.198279127, + "value": 0.7537109, "weightedMode": 0 }, { @@ -172,8 +172,8 @@ "outTangent": 1.64019763, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.231657088, - "value": 1.02778566, + "time": 0.23077254, + "value": 0.6257202, "weightedMode": 0 }, { @@ -202,7 +202,7 @@ "preWrapMode": 8 }, "effectType": 2, - "endFrame": 21, + "endFrame": 31, "idx": 985623936, "speedEuler": { "x": 0.0, @@ -234,7 +234,7 @@ "brakeDestroy": false, "cpDamageInternal": 1, "effectType": 4, - "endFrame": 21, + "endFrame": 31, "idx": -1244023808, "selectTargetType": 0, "startFrame": 5, @@ -315,13 +315,13 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], "brakeDestroy": false, "effectType": 1, - "endFrame": 21, + "endFrame": 31, "idx": 320360960, "moveType": 1, "pos": { @@ -397,7 +397,7 @@ "preWrapMode": 8 }, "effectType": 3, - "endFrame": 21, + "endFrame": 31, "idx": 2027586304, "scale": { "x": 1.0, @@ -500,7 +500,7 @@ ], "backFrame": 0, "clipPath": "", - "frameCount": 22, + "frameCount": 32, "frameRate": 20, "loop": true, "modelPath": "Assets/NapResources/UI/Animation/Arcade/Game/Companion/CP_weapon_prefab.prefab", @@ -508,10 +508,10 @@ "seqName": "sk_melee_11", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, - "totalTime": 1.1, + "totalTime": 1.6, "trackArray": [ { "order": 0, diff --git a/Data/sk_melee_12.json b/Data/sk_melee_12.json index 16f666d..2566b74 100644 --- a/Data/sk_melee_12.json +++ b/Data/sk_melee_12.json @@ -62,8 +62,8 @@ "outTangent": -0.4406633, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.7267248, - "value": 0.8252642, + "time": 0.684292, + "value": 0.8765788, "weightedMode": 0 }, { @@ -72,14 +72,34 @@ "outTangent": -8.505137, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.805137753, - "value": -0.0321005, + "time": 0.7665625, + "value": -0.214552388, "weightedMode": 0 }, { - "inTangent": -0.0411395654, - "inWeight": 0.118602842, - "outTangent": -0.0411395654, + "inTangent": -4.74210262, + "inWeight": 0.333333343, + "outTangent": -4.74210262, + "outWeight": 0.333333343, + "tangentMode": 1, + "time": 0.816454649, + "value": -0.7893825, + "weightedMode": 0 + }, + { + "inTangent": 2.58287239, + "inWeight": 0.333333343, + "outTangent": 2.58287239, + "outWeight": 0.333333343, + "tangentMode": 1, + "time": 0.9567833, + "value": -0.827744, + "weightedMode": 0 + }, + { + "inTangent": 31.6522655, + "inWeight": 0.334963083, + "outTangent": 31.6522655, "outWeight": 0.0, "tangentMode": 0, "time": 0.9920272, @@ -87,7 +107,7 @@ "weightedMode": 0 } ], - "length": 8, + "length": 10, "postWrapMode": 8, "preWrapMode": 8 }, @@ -215,7 +235,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -247,7 +267,7 @@ "seqName": "sk_melee_12", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 3.0, diff --git a/Data/sk_melee_13.json b/Data/sk_melee_13.json index 379deea..48e77cc 100644 --- a/Data/sk_melee_13.json +++ b/Data/sk_melee_13.json @@ -195,7 +195,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -227,7 +227,7 @@ "seqName": "sk_melee_13", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.75, diff --git a/Data/sk_melee_14.json b/Data/sk_melee_14.json index 921a8be..3e1ed80 100644 --- a/Data/sk_melee_14.json +++ b/Data/sk_melee_14.json @@ -197,7 +197,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -280,7 +280,7 @@ "seqName": "sk_melee_14", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.1, diff --git a/Data/sk_melee_15.json b/Data/sk_melee_15.json index ac29ab5..32870f9 100644 --- a/Data/sk_melee_15.json +++ b/Data/sk_melee_15.json @@ -209,7 +209,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -241,7 +241,7 @@ "seqName": "sk_melee_15", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 2.0, diff --git a/Data/sk_melee_16.json b/Data/sk_melee_16.json index bd3f19b..25b1f3c 100644 --- a/Data/sk_melee_16.json +++ b/Data/sk_melee_16.json @@ -193,7 +193,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } }, { @@ -278,7 +278,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -310,7 +310,7 @@ "seqName": "sk_melee_16", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 2.25, diff --git a/Data/sk_melee_17.json b/Data/sk_melee_17.json index 0daa68c..5b7682f 100644 --- a/Data/sk_melee_17.json +++ b/Data/sk_melee_17.json @@ -215,7 +215,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -247,7 +247,7 @@ "seqName": "sk_melee_17", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.1, diff --git a/Data/sk_melee_18.json b/Data/sk_melee_18.json index 650e522..0e8094b 100644 --- a/Data/sk_melee_18.json +++ b/Data/sk_melee_18.json @@ -215,7 +215,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -244,10 +244,10 @@ "loop": true, "modelPath": "Assets/NapResources/UI/Animation/Arcade/Game/Companion/CP_weapon_prefab.prefab", "partLoop": false, - "seqName": "sk_melee_3", + "seqName": "sk_melee_18", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.1, diff --git a/Data/sk_melee_19.json b/Data/sk_melee_19.json index 650e522..994012f 100644 --- a/Data/sk_melee_19.json +++ b/Data/sk_melee_19.json @@ -215,7 +215,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -244,10 +244,10 @@ "loop": true, "modelPath": "Assets/NapResources/UI/Animation/Arcade/Game/Companion/CP_weapon_prefab.prefab", "partLoop": false, - "seqName": "sk_melee_3", + "seqName": "sk_melee_19", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.1, diff --git a/Data/sk_melee_2.json b/Data/sk_melee_2.json index 5c9635d..7672f9c 100644 --- a/Data/sk_melee_2.json +++ b/Data/sk_melee_2.json @@ -35,8 +35,8 @@ "partLoop": false, "seqName": "sk_melee_2", "speedParams": { - "param1": 0, - "param2": 0 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.5, diff --git a/Data/sk_melee_20.json b/Data/sk_melee_20.json index 650e522..f6f93df 100644 --- a/Data/sk_melee_20.json +++ b/Data/sk_melee_20.json @@ -215,7 +215,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -244,10 +244,10 @@ "loop": true, "modelPath": "Assets/NapResources/UI/Animation/Arcade/Game/Companion/CP_weapon_prefab.prefab", "partLoop": false, - "seqName": "sk_melee_3", + "seqName": "sk_melee_20", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.1, diff --git a/Data/sk_melee_3.json b/Data/sk_melee_3.json index 650e522..692f9d3 100644 --- a/Data/sk_melee_3.json +++ b/Data/sk_melee_3.json @@ -62,24 +62,24 @@ "outTangent": -0.4406633, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.5852496, + "time": 0.5428541, "value": 1.76871061, "weightedMode": 0 }, { - "inTangent": -8.505137, - "inWeight": 0.333333343, - "outTangent": -8.505137, - "outWeight": 0.333333343, + "inTangent": -38.9593163, + "inWeight": 0.124648295, + "outTangent": -19.0823689, + "outWeight": 0.215073884, "tangentMode": 1, - "time": 0.6479717, - "value": 0.0388355255, + "time": 0.719210148, + "value": -3.30853486, "weightedMode": 0 }, { - "inTangent": -0.0411395654, - "inWeight": 0.118602842, - "outTangent": -0.0411395654, + "inTangent": 168.4449, + "inWeight": 0.08929347, + "outTangent": 168.4449, "outWeight": 0.0, "tangentMode": 0, "time": 0.797463536, @@ -215,7 +215,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -247,7 +247,7 @@ "seqName": "sk_melee_3", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.1, diff --git a/Data/sk_melee_4.json b/Data/sk_melee_4.json index 20ada3d..be62c78 100644 --- a/Data/sk_melee_4.json +++ b/Data/sk_melee_4.json @@ -22,8 +22,8 @@ "outTangent": 5.14886236, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.166003019, - "value": 0.036564894, + "time": 0.05860567, + "value": 0.137349591, "weightedMode": 0 }, { @@ -32,8 +32,8 @@ "outTangent": 1.64019763, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.192562044, - "value": 3.12794852, + "time": 0.100609943, + "value": 3.10985351, "weightedMode": 0 }, { @@ -42,8 +42,8 @@ "outTangent": -8.505137, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.2272598, - "value": 3.10031319, + "time": 0.157026455, + "value": 3.09383655, "weightedMode": 0 }, { @@ -52,8 +52,8 @@ "outTangent": -9.280811, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.234943688, - "value": -2.99711585, + "time": 0.173631549, + "value": -2.72582936, "weightedMode": 0 }, { @@ -62,8 +62,8 @@ "outTangent": -3.79285932, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.270363539, - "value": -3.152012, + "time": 0.231222168, + "value": -2.8156054, "weightedMode": 0 }, { @@ -72,8 +72,8 @@ "outTangent": 2.16403985, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.295637965, - "value": 3.09659338, + "time": 0.268205374, + "value": 3.09168053, "weightedMode": 0 }, { @@ -82,8 +82,8 @@ "outTangent": -3.411227, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.3317101, - "value": 3.05622268, + "time": 0.326856583, + "value": 3.06828213, "weightedMode": 0 }, { @@ -92,8 +92,8 @@ "outTangent": -6.516668, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.335030675, - "value": -2.97323012, + "time": 0.33636716, + "value": -2.71198535, "weightedMode": 0 }, { @@ -102,8 +102,8 @@ "outTangent": 3.94608259, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.3797538, - "value": -3.014403, + "time": 0.40908435, + "value": -2.73584867, "weightedMode": 0 }, { @@ -112,8 +112,8 @@ "outTangent": 9.340996, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.393968642, - "value": 2.99845886, + "time": 0.4280853, + "value": 3.03480268, "weightedMode": 0 }, { @@ -122,8 +122,8 @@ "outTangent": -2.88736129, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.442214727, - "value": 3.09475541, + "time": 0.506530643, + "value": 3.090615, "weightedMode": 0 }, { @@ -132,8 +132,8 @@ "outTangent": -7.91257524, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.4539159, - "value": -3.01800656, + "time": 0.5296676, + "value": -2.73793721, "weightedMode": 0 }, { @@ -142,8 +142,8 @@ "outTangent": 6.740977, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.499212682, - "value": -3.02428126, + "time": 0.603317559, + "value": -2.741574, "weightedMode": 0 }, { @@ -152,8 +152,8 @@ "outTangent": 17.3619576, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.504457355, - "value": 3.09858322, + "time": 0.6077335, + "value": 3.09283376, "weightedMode": 0 }, { @@ -162,8 +162,8 @@ "outTangent": -8.556669, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.5529677, - "value": 3.135915, + "time": 0.6866086, + "value": 3.11447072, "weightedMode": 0 }, { @@ -172,8 +172,8 @@ "outTangent": -20.2409725, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.5547643, - "value": -3.418925, + "time": 0.6879876, + "value": -2.74038577, "weightedMode": 0 }, { @@ -182,8 +182,8 @@ "outTangent": 13.7233152, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.5998297, - "value": -3.50820065, + "time": 0.761261344, + "value": -2.792129, "weightedMode": 0 }, { @@ -192,8 +192,8 @@ "outTangent": 3.07137322, "outWeight": 1.0, "tangentMode": 1, - "time": 0.6054091, - "value": 3.16167188, + "time": 0.771875143, + "value": 3.129399, "weightedMode": 0 }, { @@ -202,8 +202,8 @@ "outTangent": -40.8775978, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.657259762, - "value": 3.02291036, + "time": 0.856181264, + "value": 3.04897475, "weightedMode": 0 }, { @@ -212,18 +212,18 @@ "outTangent": -1.264178, "outWeight": 1.0, "tangentMode": 1, - "time": 0.6605559, - "value": -3.82094359, + "time": 0.864436567, + "value": -2.849665, "weightedMode": 0 }, { - "inTangent": -0.233823881, - "inWeight": 0.9474779, + "inTangent": -7.91474438, + "inWeight": 0.7828832, "outTangent": 66.31241, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.698026657, - "value": -3.722539, + "time": 0.925361753, + "value": -2.79263067, "weightedMode": 0 }, { @@ -232,8 +232,18 @@ "outTangent": 8.956167, "outWeight": 0.387644351, "tangentMode": 1, - "time": 0.7181334, - "value": -0.01894784, + "time": 0.9421773, + "value": 1.38940048, + "weightedMode": 0 + }, + { + "inTangent": -38.1085358, + "inWeight": 0.333333343, + "outTangent": -38.1085358, + "outWeight": 0.333333343, + "tangentMode": 1, + "time": 0.9941264, + "value": 0.975106359, "weightedMode": 0 }, { @@ -242,12 +252,12 @@ "outTangent": -0.0411395654, "outWeight": 0.0, "tangentMode": 0, - "time": 0.797463536, + "time": 0.9997052, "value": -0.013111949, "weightedMode": 0 } ], - "length": 24, + "length": 25, "postWrapMode": 8, "preWrapMode": 8 }, @@ -261,7 +271,7 @@ }, "speedParam": { "param1": 11, - "param2": -10000 + "param2": -8000 }, "startFrame": 0, "trackOrder": 0 @@ -308,7 +318,7 @@ "brakeDestroy": false, "cpDamageInternal": 0, "effectType": 4, - "endFrame": 8, + "endFrame": 9, "idx": 1583687168, "selectTargetType": 0, "startFrame": 6, @@ -332,10 +342,10 @@ "brakeDestroy": false, "cpDamageInternal": 0, "effectType": 4, - "endFrame": 11, + "endFrame": 13, "idx": -1695902720, "selectTargetType": 0, - "startFrame": 8, + "startFrame": 9, "trackOrder": 1 }, { @@ -356,10 +366,10 @@ "brakeDestroy": false, "cpDamageInternal": 0, "effectType": 4, - "endFrame": 14, + "endFrame": 18, "idx": 1962770432, "selectTargetType": 0, - "startFrame": 11, + "startFrame": 13, "trackOrder": 1 }, { @@ -380,10 +390,10 @@ "brakeDestroy": false, "cpDamageInternal": 0, "effectType": 4, - "endFrame": 17, + "endFrame": 23, "idx": 411953664, "selectTargetType": 0, - "startFrame": 14, + "startFrame": 18, "trackOrder": 1 }, { @@ -404,10 +414,10 @@ "brakeDestroy": false, "cpDamageInternal": 0, "effectType": 4, - "endFrame": 20, + "endFrame": 29, "idx": -1142828544, "selectTargetType": 0, - "startFrame": 17, + "startFrame": 23, "trackOrder": 1 }, { @@ -485,7 +495,7 @@ }, "param": { "param1": 11, - "param2": 100000 + "param2": 1000 } } ], @@ -517,7 +527,7 @@ "seqName": "sk_melee_4", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 0.6976744, diff --git a/Data/sk_melee_5.json b/Data/sk_melee_5.json index c8d3445..40e2028 100644 --- a/Data/sk_melee_5.json +++ b/Data/sk_melee_5.json @@ -13,7 +13,7 @@ "outWeight": 0.992300153, "tangentMode": 0, "time": 0.007846832, - "value": 0.00143814087, + "value": -0.0101524172, "weightedMode": 0 }, { @@ -22,8 +22,8 @@ "outTangent": -0.09578882, "outWeight": 0.0753575638, "tangentMode": 1, - "time": 0.0233425163, - "value": -3.234232, + "time": 0.02613241, + "value": -1.91277063, "weightedMode": 0 }, { @@ -32,8 +32,8 @@ "outTangent": 7.15991831, "outWeight": 0.0190567262, "tangentMode": 1, - "time": 0.054134693, - "value": -3.47567081, + "time": 0.0624685064, + "value": -2.05474, "weightedMode": 0 }, { @@ -42,8 +42,8 @@ "outTangent": 5.14886236, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.07687399, - "value": 0.170788765, + "time": 0.08930186, + "value": 0.08942805, "weightedMode": 0 }, { @@ -52,8 +52,8 @@ "outTangent": 1.64019763, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.0872928649, - "value": 2.57184768, + "time": 0.101596586, + "value": 1.50128353, "weightedMode": 0 }, { @@ -62,8 +62,8 @@ "outTangent": -0.4406633, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.227822289, - "value": 1.76871061, + "time": 0.267427385, + "value": 1.02902794, "weightedMode": 0 }, { @@ -72,8 +72,8 @@ "outTangent": -8.505137, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.250725716, - "value": 0.0388355255, + "time": 0.2944544, + "value": 0.0118377544, "weightedMode": 0 }, { @@ -82,8 +82,8 @@ "outTangent": -7.61189651, "outWeight": 0.254892975, "tangentMode": 1, - "time": 0.261695832, - "value": -1.54285073, + "time": 0.3073996, + "value": -0.9182154, "weightedMode": 0 }, { @@ -92,8 +92,8 @@ "outTangent": 7.19159031, "outWeight": 1.0, "tangentMode": 1, - "time": 0.4126921, - "value": -2.0836792, + "time": 0.485581756, + "value": -1.2362299, "weightedMode": 0 }, { @@ -102,8 +102,8 @@ "outTangent": 21.24055, "outWeight": 0.4461816, "tangentMode": 1, - "time": 0.434306949, - "value": -0.01877366, + "time": 0.511088252, + "value": -0.0220372379, "weightedMode": 0 }, { @@ -112,8 +112,8 @@ "outTangent": 15.57183, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.465890348, - "value": -0.00166904926, + "time": 0.548357964, + "value": -0.0119795017, "weightedMode": 0 }, { @@ -122,8 +122,8 @@ "outTangent": 8.008176, "outWeight": 0.192365617, "tangentMode": 1, - "time": 0.4725206, - "value": 2.01471758, + "time": 0.556181967, + "value": 1.17368329, "weightedMode": 0 }, { @@ -132,8 +132,8 @@ "outTangent": -11.1552544, "outWeight": 1.0, "tangentMode": 1, - "time": 0.619511247, - "value": 1.9796623, + "time": 0.729637265, + "value": 1.15307033, "weightedMode": 0 }, { @@ -142,8 +142,8 @@ "outTangent": 0.159640089, "outWeight": 1.0, "tangentMode": 1, - "time": 0.6360364, - "value": 0.0535714477, + "time": 0.74913764, + "value": 0.0205026716, "weightedMode": 0 }, { @@ -152,8 +152,8 @@ "outTangent": -190.728363, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.6546965, - "value": -0.0569413, + "time": 0.7711574, + "value": -0.0444803275, "weightedMode": 0 }, { @@ -162,18 +162,18 @@ "outTangent": -10.5366488, "outWeight": 0.273742974, "tangentMode": 1, - "time": 0.658234954, - "value": -2.402446, + "time": 0.7753329, + "value": -1.42366922, "weightedMode": 0 }, { - "inTangent": 0.0, - "inWeight": 0.0, - "outTangent": 0.0, - "outWeight": 0.0, - "tangentMode": 1, - "time": 0.7749738, - "value": -2.73591852, + "inTangent": 2.61469269, + "inWeight": 0.331505954, + "outTangent": 57.5419846, + "outWeight": 1.0, + "tangentMode": 65, + "time": 0.8964749, + "value": -1.50130093, "weightedMode": 0 }, { @@ -182,8 +182,28 @@ "outTangent": 2.455662, "outWeight": 0.5448209, "tangentMode": 1, - "time": 0.7829515, - "value": 0.0126757622, + "time": 0.9225038, + "value": -0.003544557, + "weightedMode": 0 + }, + { + "inTangent": 9.76362, + "inWeight": 1.0, + "outTangent": -0.342331856, + "outWeight": 0.333333343, + "tangentMode": 1, + "time": 0.9326354, + "value": 1.47442377, + "weightedMode": 0 + }, + { + "inTangent": -48.667778, + "inWeight": 0.333333343, + "outTangent": -48.667778, + "outWeight": 0.333333343, + "tangentMode": 1, + "time": 0.9949082, + "value": 1.3255676, "weightedMode": 0 }, { @@ -192,12 +212,12 @@ "outTangent": 0.0, "outWeight": 0.0, "tangentMode": 1, - "time": 0.8243888, - "value": -0.008056641, + "time": 0.998096168, + "value": -0.0157354977, "weightedMode": 0 } ], - "length": 19, + "length": 21, "postWrapMode": 8, "preWrapMode": 8 }, @@ -346,8 +366,18 @@ "outTangent": 0.277608871, "outWeight": 0.152788535, "tangentMode": 0, - "time": 0.204981983, - "value": 0.9880996, + "time": 0.354181945, + "value": -0.121698976, + "weightedMode": 0 + }, + { + "inTangent": 0.7628384, + "inWeight": 0.333333343, + "outTangent": 0.7628384, + "outWeight": 0.333333343, + "tangentMode": 0, + "time": 0.4674433, + "value": 0.127689183, "weightedMode": 0 }, { @@ -356,8 +386,8 @@ "outTangent": -1.89114952, "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.652263165, - "value": -0.00251585245, + "time": 0.665446758, + "value": -0.126874983, "weightedMode": 0 }, { @@ -366,8 +396,18 @@ "outTangent": 0.07728131, "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.7298343, - "value": -0.006585814, + "time": 0.764929533, + "value": 0.120184205, + "weightedMode": 0 + }, + { + "inTangent": -0.7434626, + "inWeight": 0.333333343, + "outTangent": -0.7434626, + "outWeight": 0.333333343, + "tangentMode": 0, + "time": 0.948884547, + "value": -0.09675039, "weightedMode": 0 }, { @@ -391,13 +431,13 @@ "weightedMode": 0 } ], - "length": 7, + "length": 9, "postWrapMode": 8, "preWrapMode": 8 }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -422,17 +462,17 @@ "backFrame": 0, "clipPath": "", "frameCount": 66, - "frameRate": 30, + "frameRate": 60, "loop": true, "modelPath": "Assets/NapResources/UI/Animation/Arcade/Game/Companion/CP_weapon_prefab.prefab", "partLoop": false, "seqName": "sk_melee_5", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, - "totalTime": 2.2, + "totalTime": 1.1, "trackArray": [ { "order": 0, diff --git a/Data/sk_melee_6.json b/Data/sk_melee_6.json index f440dc2..cbe2af9 100644 --- a/Data/sk_melee_6.json +++ b/Data/sk_melee_6.json @@ -22,8 +22,8 @@ "outTangent": -0.09578882, "outWeight": 0.0753575638, "tangentMode": 1, - "time": 0.0222324356, - "value": -4.319559, + "time": 0.0210192688, + "value": -3.68331671, "weightedMode": 0 }, { @@ -32,8 +32,8 @@ "outTangent": 7.15991831, "outWeight": 0.0190567262, "tangentMode": 1, - "time": 0.0738538355, - "value": -4.66274357, + "time": 0.07264067, + "value": -4.026501, "weightedMode": 0 }, { @@ -47,23 +47,13 @@ "weightedMode": 0 }, { - "inTangent": 1.64019763, + "inTangent": 1.63917875, "inWeight": 0.333333343, - "outTangent": 1.64019763, + "outTangent": 1.63917875, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.11756701, - "value": 2.57184768, - "weightedMode": 0 - }, - { - "inTangent": -0.4406633, - "inWeight": 0.333333343, - "outTangent": -0.4406633, - "outWeight": 0.333333343, - "tangentMode": 1, - "time": 0.3203143, - "value": 2.83499479, + "time": 0.217367738, + "value": 3.76442552, "weightedMode": 0 }, { @@ -77,43 +67,23 @@ "weightedMode": 0 }, { - "inTangent": -1.88150477, + "inTangent": 2.02369833, "inWeight": 0.333333343, - "outTangent": -1.88150477, + "outTangent": 2.02369833, "outWeight": 0.333333343, "tangentMode": 1, - "time": 0.3649063, - "value": -3.71139479, + "time": 0.470484853, + "value": -4.57670069, "weightedMode": 0 }, { - "inTangent": -0.0411395654, - "inWeight": 0.118602842, - "outTangent": -0.0411395654, - "outWeight": 0.0, + "inTangent": 0.07288484, + "inWeight": 0.333333343, + "outTangent": 0.07288484, + "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.535176, - "value": -3.532103, - "weightedMode": 0 - }, - { - "inTangent": 6.97580528, - "inWeight": 0.0, - "outTangent": 6.97580528, - "outWeight": 0.305274457, - "tangentMode": 0, - "time": 0.559120834, - "value": 2.19754148, - "weightedMode": 0 - }, - { - "inTangent": -6.17306137, - "inWeight": 0.2887004, - "outTangent": -6.17306137, - "outWeight": 0.0, - "tangentMode": 0, - "time": 0.698381, - "value": 2.20567, + "time": 0.631239831, + "value": 2.9810164, "weightedMode": 0 }, { @@ -122,8 +92,8 @@ "outTangent": 0.0, "outWeight": 0.0, "tangentMode": 0, - "time": 0.7041218, - "value": 0.07812485, + "time": 0.7329097, + "value": 0.0283521712, "weightedMode": 0 }, { @@ -137,7 +107,7 @@ "weightedMode": 0 } ], - "length": 13, + "length": 10, "postWrapMode": 8, "preWrapMode": 8 }, @@ -261,9 +231,9 @@ "curve": { "keys": [ { - "inTangent": 0.13246046, + "inTangent": 0.166259438, "inWeight": 0.0, - "outTangent": 0.13246046, + "outTangent": 0.166259438, "outWeight": 0.333333343, "tangentMode": 34, "time": 0.00653457642, @@ -276,7 +246,7 @@ "outTangent": 0.06410432, "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.60015, + "time": 0.479473531, "value": 0.0932637453, "weightedMode": 0 }, @@ -286,8 +256,8 @@ "outTangent": 0.9917227, "outWeight": 0.6148991, "tangentMode": 0, - "time": 0.698036134, - "value": -0.119188681, + "time": 0.6115561, + "value": -0.114260875, "weightedMode": 0 }, { @@ -296,8 +266,8 @@ "outTangent": 4.848739, "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.7415092, - "value": -0.0620366968, + "time": 0.692141533, + "value": -0.05710889, "weightedMode": 0 }, { @@ -306,8 +276,8 @@ "outTangent": 1.03511381, "outWeight": 0.7084076, "tangentMode": 0, - "time": 0.79277885, - "value": 1.01220286, + "time": 0.718178868, + "value": 1.07133651, "weightedMode": 0 }, { @@ -347,7 +317,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -379,7 +349,7 @@ "seqName": "sk_melee_6", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.0, diff --git a/Data/sk_melee_7.json b/Data/sk_melee_7.json index c76e76f..4d24d9e 100644 --- a/Data/sk_melee_7.json +++ b/Data/sk_melee_7.json @@ -225,7 +225,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -257,7 +257,7 @@ "seqName": "sk_melee_7", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 1.0, diff --git a/Data/sk_melee_8.json b/Data/sk_melee_8.json index a76afd7..7dbe55d 100644 --- a/Data/sk_melee_8.json +++ b/Data/sk_melee_8.json @@ -130,8 +130,8 @@ "z": -7.0 }, "speedParam": { - "param1": 11, - "param2": -8000 + "param1": 0, + "param2": 0 }, "startFrame": 0, "trackOrder": 0 @@ -289,7 +289,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -321,7 +321,7 @@ "seqName": "sk_melee_8", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 2.0, diff --git a/Data/sk_melee_9.json b/Data/sk_melee_9.json index 10a4078..0920eb8 100644 --- a/Data/sk_melee_9.json +++ b/Data/sk_melee_9.json @@ -264,8 +264,8 @@ "outTangent": 2.718686, "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.8765851, - "value": 1.003876, + "time": 0.87438786, + "value": 1.1671412, "weightedMode": 0 }, { @@ -295,7 +295,7 @@ }, "param": { "param1": 11, - "param2": 10000 + "param2": 1000 } } ], @@ -327,7 +327,7 @@ "seqName": "sk_melee_9", "speedParams": { "param1": 44, - "param2": 100000 + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 2.0, diff --git a/Data/sk_range_1.json b/Data/sk_range_1.json index 45a5d26..f607ed9 100644 --- a/Data/sk_range_1.json +++ b/Data/sk_range_1.json @@ -9,9 +9,9 @@ "curve": { "keys": [ { - "inTangent": -1.45248771, + "inTangent": -1.45248735, "inWeight": 0.0, - "outTangent": -1.45248771, + "outTangent": -1.45248735, "outWeight": 0.333333343, "tangentMode": 34, "time": -0.00447464, @@ -19,22 +19,22 @@ "weightedMode": 0 }, { - "inTangent": 1.17000449, + "inTangent": 0.322272122, "inWeight": 0.333333343, - "outTangent": 1.17000449, + "outTangent": 0.322272122, "outWeight": 0.333333343, "tangentMode": 34, - "time": 0.06571464, + "time": 0.06571466, "value": -0.09978613, "weightedMode": 0 }, { - "inTangent": -0.450873137, + "inTangent": -0.249306917, "inWeight": 0.333333343, - "outTangent": -0.450873137, + "outTangent": -0.249306917, "outWeight": 0.333333343, "tangentMode": 34, - "time": 0.355704665, + "time": 0.590163648, "value": 1.0, "weightedMode": 0 }, @@ -44,14 +44,14 @@ "outTangent": -0.111540735, "outWeight": 0.214419544, "tangentMode": 0, - "time": 0.5672655, + "time": 0.9727729, "value": 0.006882023, "weightedMode": 0 }, { - "inTangent": -0.0153804682, + "inTangent": -0.256902456, "inWeight": 0.333333343, - "outTangent": -0.0153804682, + "outTangent": -0.256902456, "outWeight": 0.0, "tangentMode": 34, "time": 0.9985962, @@ -71,7 +71,7 @@ ], "brakeDestroy": false, "effectType": 1, - "endFrame": 14, + "endFrame": 24, "idx": 542308352, "moveType": 1, "pos": { @@ -93,33 +93,33 @@ "curve": { "keys": [ { - "inTangent": 0.218288839, + "inTangent": -41.8081131, "inWeight": 0.0, - "outTangent": 0.218288839, + "outTangent": -41.8081131, "outWeight": 0.333333343, "tangentMode": 34, "time": -0.00082355924, - "value": -3.559808, + "value": 0.0006637833, "weightedMode": 0 }, { - "inTangent": 1.56441486, - "inWeight": 0.658201635, - "outTangent": 1.56441486, + "inTangent": -11.7433882, + "inWeight": 0.7924056, + "outTangent": -11.7433882, + "outWeight": 0.449298084, + "tangentMode": 0, + "time": 0.0414075553, + "value": -1.76493931, + "weightedMode": 0 + }, + { + "inTangent": 22.2620525, + "inWeight": 0.325993419, + "outTangent": 22.2620525, "outWeight": 0.333333343, "tangentMode": 0, - "time": 0.118978351, - "value": -3.5336566, - "weightedMode": 0 - }, - { - "inTangent": 57.9505043, - "inWeight": 0.333333343, - "outTangent": 57.9505043, - "outWeight": 0.08091493, - "tangentMode": 0, - "time": 0.121502504, - "value": -0.02742982, + "time": 0.128128409, + "value": -1.657956, "weightedMode": 0 }, { @@ -128,8 +128,38 @@ "outTangent": 1.82764673, "outWeight": 0.154728845, "tangentMode": 0, - "time": 0.1463855, - "value": 2.2010088, + "time": 0.2746817, + "value": 0.5145514, + "weightedMode": 0 + }, + { + "inTangent": 2.50880122, + "inWeight": 0.333333343, + "outTangent": 2.50880122, + "outWeight": 0.333333343, + "tangentMode": 0, + "time": 0.313392252, + "value": 0.912622, + "weightedMode": 0 + }, + { + "inTangent": -0.856332541, + "inWeight": 0.333333343, + "outTangent": -0.856332541, + "outWeight": 0.333333343, + "tangentMode": 0, + "time": 0.71168375, + "value": 1.38715255, + "weightedMode": 0 + }, + { + "inTangent": -26.57004, + "inWeight": 0.333333343, + "outTangent": -26.57004, + "outWeight": 0.333333343, + "tangentMode": 0, + "time": 0.7932903, + "value": -1.32498491, "weightedMode": 0 }, { @@ -138,37 +168,27 @@ "outTangent": 0.264914036, "outWeight": 0.560899, "tangentMode": 0, - "time": 0.540827036, - "value": 2.04783821, + "time": 0.882172048, + "value": -2.0232687, "weightedMode": 0 }, { - "inTangent": -0.156166732, + "inTangent": 17.5674953, "inWeight": 0.333333343, - "outTangent": -0.156166732, - "outWeight": 0.195787117, - "tangentMode": 0, - "time": 0.5446215, - "value": -0.0257458985, - "weightedMode": 0 - }, - { - "inTangent": -15.8096123, - "inWeight": 0.333333343, - "outTangent": -15.8096123, + "outTangent": 17.5674953, "outWeight": 0.0, "tangentMode": 34, - "time": 0.5454407, - "value": -0.03869629, + "time": 0.99705565, + "value": -0.005051587, "weightedMode": 0 } ], - "length": 7, + "length": 9, "postWrapMode": 8, "preWrapMode": 8 }, "effectType": 2, - "endFrame": 14, + "endFrame": 24, "idx": 1081232512, "speedEuler": { "x": 0.0, @@ -187,26 +207,26 @@ "brakeDestroy": false, "bullet": 0, "effectType": 5, - "endFrame": 7, + "endFrame": 9, "idx": 233591296, - "startFrame": 6, + "startFrame": 8, "trackOrder": 2 } ], "backFrame": 0, "clipPath": "", - "frameCount": 15, - "frameRate": 20, + "frameCount": 25, + "frameRate": 31, "loop": false, "modelPath": "Assets/NapResources/UI/Animation/Arcade/Game/Companion/CP_weapon_prefab.prefab", "partLoop": false, "seqName": "sk_range_1", "speedParams": { - "param1": 0, - "param2": 0 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, - "totalTime": 0.75, + "totalTime": 0.8064516, "trackArray": [ { "order": 0, diff --git a/Data/sk_range_2.json b/Data/sk_range_2.json index 9a39612..f2ff4c8 100644 --- a/Data/sk_range_2.json +++ b/Data/sk_range_2.json @@ -156,8 +156,8 @@ "partLoop": false, "seqName": "sk_range_2", "speedParams": { - "param1": 0, - "param2": 100000 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 0.375, diff --git a/Data/sk_range_3.json b/Data/sk_range_3.json index 42bc4b9..e0fccdb 100644 --- a/Data/sk_range_3.json +++ b/Data/sk_range_3.json @@ -86,8 +86,8 @@ "partLoop": false, "seqName": "sk_range_3", "speedParams": { - "param1": 0, - "param2": 100000 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 0.5, diff --git a/Data/sk_range_4.json b/Data/sk_range_4.json index 49f9deb..18e8f63 100644 --- a/Data/sk_range_4.json +++ b/Data/sk_range_4.json @@ -84,10 +84,10 @@ "loop": false, "modelPath": "Assets/Scenes/Stage_SkyScraper/DemoMesh/Cube_059_Cube_028.fbx", "partLoop": false, - "seqName": "sk_bullet", + "seqName": "sk_range_4", "speedParams": { - "param1": 0, - "param2": 100000 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 0.25, diff --git a/Data/sk_range_5.json b/Data/sk_range_5.json index cb717a9..34d1849 100644 --- a/Data/sk_range_5.json +++ b/Data/sk_range_5.json @@ -86,8 +86,8 @@ "partLoop": false, "seqName": "sk_range_5", "speedParams": { - "param1": 0, - "param2": 100000 + "param1": 44, + "param2": 1000 }, "topSpeed": 99.0, "totalTime": 0.25, diff --git a/FileCfg/10480563344334136587.json b/FileCfg/10480563344334136587.json index 4b2cedf..faaf0e3 100644 --- a/FileCfg/10480563344334136587.json +++ b/FileCfg/10480563344334136587.json @@ -19,7 +19,7 @@ "EPNBBBCEEMK": "QuestPopWindowType_Explore", "AFGEHNHNIDJ": "Assets/NapResources/UI/Sprite/A1DynamicLoad/MissionGet/UnPacker/MissionIconExplore.png", "MKPEOANADIM": "Assets/NapResources/UI/Sprite/A1DynamicLoad/NavigationPage/UnPacker/MapPic/Event01_Pic.png", - "NHGGEOPNHHM": "" + "NHGGEOPNHHM": "EventLocation_02" }, { "NGPCCDGBLLK": 219702, diff --git a/FileCfg/13727199490284653960.json b/FileCfg/13727199490284653960.json index bab9c33..7314c7f 100644 --- a/FileCfg/13727199490284653960.json +++ b/FileCfg/13727199490284653960.json @@ -16,8 +16,7 @@ "NOAJNACMIEC": [ 2, 4, - 5, - 17 + 5 ], "FJHCDCCMCKP": [ 205070201, @@ -149,10 +148,9 @@ 205070522 ], "NOAJNACMIEC": [ - 2, + 25, 4, - 5, - 17 + 26 ], "FJHCDCCMCKP": [ 205070201, @@ -172,12 +170,12 @@ 205070524 ], "NOAJNACMIEC": [ - 2, + 25, 4, - 5, + 26, 8, - 9, - 10, + 27, + 28, 11 ], "FJHCDCCMCKP": [ @@ -198,12 +196,12 @@ 205070526 ], "NOAJNACMIEC": [ - 2, + 25, 4, - 5, + 26, 8, - 9, - 10, + 27, + 28, 11 ], "FJHCDCCMCKP": [ @@ -224,12 +222,12 @@ 205070528 ], "NOAJNACMIEC": [ - 2, + 25, 4, - 5, + 26, 8, - 9, - 10, + 27, + 28, 11 ], "FJHCDCCMCKP": [ @@ -250,12 +248,12 @@ 205070530 ], "NOAJNACMIEC": [ - 2, + 25, 4, - 5, + 26, 8, - 9, - 10, + 27, + 28, 11 ], "FJHCDCCMCKP": [ diff --git a/FileCfg/15186815016194517077.json b/FileCfg/15186815016194517077.json index 797f44f..28e1363 100644 --- a/FileCfg/15186815016194517077.json +++ b/FileCfg/15186815016194517077.json @@ -277,7 +277,7 @@ "COCMBAOGOFP": 1228101001, "MLKGCHGIDDN": 1228101002, "MBKKOGMCJMC": 1228101261, - "HMDBHPEMEEL": 4030132, + "HMDBHPEMEEL": 4030135, "DHGONMEBBDO": 1, "GIHHIFADDGG": 1000962, "LMINLPCGAKA": 1002303, @@ -293,7 +293,7 @@ "COCMBAOGOFP": 1228101001, "MLKGCHGIDDN": 1228101002, "MBKKOGMCJMC": 1228101271, - "HMDBHPEMEEL": 0, + "HMDBHPEMEEL": 4030135, "DHGONMEBBDO": 6, "GIHHIFADDGG": 1000963, "LMINLPCGAKA": 1002305, diff --git a/FileCfg/18234532823109020000.json b/FileCfg/18234532823109020000.json index e2dbe16..41f1bf8 100644 --- a/FileCfg/18234532823109020000.json +++ b/FileCfg/18234532823109020000.json @@ -39,71 +39,71 @@ "NNNFJOMEJBP": 10020001, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, - "KLKJKAEKLMB": 1013006120, - "BCNKKKMAMDG": 0 + "KLKJKAEKLMB": 1013006110, + "BCNKKKMAMDG": 1013006120 }, { "NNNFJOMEJBP": 10020002, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013016110, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013016110 }, { "NNNFJOMEJBP": 10020003, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013006220, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013006220 }, { "NNNFJOMEJBP": 10020004, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013016210, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013016210 }, { "NNNFJOMEJBP": 10020005, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013006320, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013006320 }, { "NNNFJOMEJBP": 10020006, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013016310, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013016310 }, { "NNNFJOMEJBP": 10020007, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013006420, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013006420 }, { "NNNFJOMEJBP": 10020008, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013016410, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013016410 }, { "NNNFJOMEJBP": 10020009, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013006520, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013006520 }, { "NNNFJOMEJBP": 10020010, "NCCDLNIFECA": 0, "EGAGNKPGFLP": 1, "KLKJKAEKLMB": 1013016510, - "BCNKKKMAMDG": 0 + "BCNKKKMAMDG": 1013016510 }, { "NNNFJOMEJBP": 10030001, diff --git a/FileCfg/7011738137837809076.json b/FileCfg/7011738137837809076.json index de8f90c..ae18605 100644 --- a/FileCfg/7011738137837809076.json +++ b/FileCfg/7011738137837809076.json @@ -483,7 +483,7 @@ "OGBELBEBKIO": 31, "MBGOHEIEKNP": 0, "FFPBEKHOFNP": "UI/Sprite/A1DynamicLoad/Activity/Ver1_1/ActivityQuestionAnswer/UnPacker/IDPhoto38.png", - "BLDBBFLDONA": 1171, + "BLDBBFLDONA": 0, "BIKFBDALJLC": 0, "DPKDPLGNLPI": "HSC_Screen_Left_Title_36", "AOCPADCAPCM": 100104, @@ -497,7 +497,7 @@ "OGBELBEBKIO": 32, "MBGOHEIEKNP": 0, "FFPBEKHOFNP": "UI/Sprite/A1DynamicLoad/Activity/Ver1_1/ActivityQuestionAnswer/UnPacker/IDPhoto38.png", - "BLDBBFLDONA": 1171, + "BLDBBFLDONA": 0, "BIKFBDALJLC": 0, "DPKDPLGNLPI": "HSC_Screen_Left_Title_37", "AOCPADCAPCM": 100102, diff --git a/FileCfg/AbilityConfigTemplateTb.json b/FileCfg/AbilityConfigTemplateTb.json index 5a241d2..3a7c203 100644 --- a/FileCfg/AbilityConfigTemplateTb.json +++ b/FileCfg/AbilityConfigTemplateTb.json @@ -4182,6 +4182,23 @@ "ICLMADGBHLP": "", "PJCODPBCCEE": "" }, + { + "BOOGIMBHOOM": 11251002, + "DDGHPKCFJCN": "", + "GCCKFFOAGCF": "", + "JLIIOILOGOM": "QingYi_DamageReduction", + "LAEOMEPAJCA": 0, + "EFOPIEOHMMC": "AS_DamageTakeRatio:-0.40", + "GOMILGELDEB": "", + "ADFLOAEIGNN": "", + "NMOADDHNDDI": "", + "GJKHNGALFBL": "", + "OINOPKJHLCK": "", + "PHEPEGIJCDD": "", + "HGNNIMCKGAL": "", + "ICLMADGBHLP": "", + "PJCODPBCCEE": "" + }, { "BOOGIMBHOOM": 11251101, "DDGHPKCFJCN": "", @@ -4205,7 +4222,7 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_Talent_02", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "", + "EFOPIEOHMMC": "AS_AddPercentage:1.35", "GOMILGELDEB": "", "ADFLOAEIGNN": "", "NMOADDHNDDI": "", @@ -4256,8 +4273,8 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_UniqueSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.015", - "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.020", + "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.020", + "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.027", "ADFLOAEIGNN": "AS_AddedBreakStunRatio_Talent_02:0.15", "NMOADDHNDDI": "AS_AddedDamageRatio:0.03", "GJKHNGALFBL": "AS_DefaultStackCount:5", @@ -4273,8 +4290,8 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_UniqueSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.018", - "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.024", + "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.024", + "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.033", "ADFLOAEIGNN": "AS_AddedBreakStunRatio_Talent_02:0.15", "NMOADDHNDDI": "AS_AddedDamageRatio:0.03", "GJKHNGALFBL": "AS_DefaultStackCount:5", @@ -4290,8 +4307,8 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_UniqueSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.020", - "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.027", + "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.027", + "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.037", "ADFLOAEIGNN": "AS_AddedBreakStunRatio_Talent_02:0.15", "NMOADDHNDDI": "AS_AddedDamageRatio:0.03", "GJKHNGALFBL": "AS_DefaultStackCount:5", @@ -4307,8 +4324,8 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_UniqueSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.022", - "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.030", + "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.030", + "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.041", "ADFLOAEIGNN": "AS_AddedBreakStunRatio_Talent_02:0.15", "NMOADDHNDDI": "AS_AddedDamageRatio:0.03", "GJKHNGALFBL": "AS_DefaultStackCount:5", @@ -4324,8 +4341,8 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_UniqueSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.025", - "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.034", + "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.034", + "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.046", "ADFLOAEIGNN": "AS_AddedBreakStunRatio_Talent_02:0.15", "NMOADDHNDDI": "AS_AddedDamageRatio:0.03", "GJKHNGALFBL": "AS_DefaultStackCount:5", @@ -4341,8 +4358,8 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_UniqueSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.028", - "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.038", + "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.037", + "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.050", "ADFLOAEIGNN": "AS_AddedBreakStunRatio_Talent_02:0.15", "NMOADDHNDDI": "AS_AddedDamageRatio:0.03", "GJKHNGALFBL": "AS_DefaultStackCount:5", @@ -4358,8 +4375,8 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "QingYi_UniqueSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.030", - "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.040", + "EFOPIEOHMMC": "AS_StunDamageTakeRatio_X:0.040", + "GOMILGELDEB": "AS_StunDamageTakeRatio_X_Talent_02:0.054", "ADFLOAEIGNN": "AS_AddedBreakStunRatio_Talent_02:0.15", "NMOADDHNDDI": "AS_AddedDamageRatio:0.03", "GJKHNGALFBL": "AS_DefaultStackCount:5", @@ -4499,7 +4516,7 @@ "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.200", "NMOADDHNDDI": "AS_BaseBuffCriticalDamageDelta:0.50", "GJKHNGALFBL": "AS_ExtraBuffCriticalDelta:0.0010", - "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.30", + "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.50", "PHEPEGIJCDD": "AS_IgnoreDefenceRatio_Talent_02:-0.15", "HGNNIMCKGAL": "", "ICLMADGBHLP": "", @@ -4513,10 +4530,10 @@ "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_Duration:10.0", "GOMILGELDEB": "AS_BuffAddDuration:5.0", - "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.210", + "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.250", "NMOADDHNDDI": "AS_BaseBuffCriticalDamageDelta:0.50", "GJKHNGALFBL": "AS_ExtraBuffCriticalDelta:0.0011", - "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.30", + "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.50", "PHEPEGIJCDD": "AS_IgnoreDefenceRatio_Talent_02:-0.15", "HGNNIMCKGAL": "", "ICLMADGBHLP": "", @@ -4530,10 +4547,10 @@ "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_Duration:10.0", "GOMILGELDEB": "AS_BuffAddDuration:5.0", - "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.220", + "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.280", "NMOADDHNDDI": "AS_BaseBuffCriticalDamageDelta:0.50", "GJKHNGALFBL": "AS_ExtraBuffCriticalDelta:0.0012", - "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.30", + "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.50", "PHEPEGIJCDD": "AS_IgnoreDefenceRatio_Talent_02:-0.15", "HGNNIMCKGAL": "", "ICLMADGBHLP": "", @@ -4547,10 +4564,10 @@ "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_Duration:10.0", "GOMILGELDEB": "AS_BuffAddDuration:5.0", - "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.230", + "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.310", "NMOADDHNDDI": "AS_BaseBuffCriticalDamageDelta:0.50", "GJKHNGALFBL": "AS_ExtraBuffCriticalDelta:0.0013", - "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.30", + "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.50", "PHEPEGIJCDD": "AS_IgnoreDefenceRatio_Talent_02:-0.15", "HGNNIMCKGAL": "", "ICLMADGBHLP": "", @@ -4564,10 +4581,10 @@ "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_Duration:10.0", "GOMILGELDEB": "AS_BuffAddDuration:5.0", - "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.240", + "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.340", "NMOADDHNDDI": "AS_BaseBuffCriticalDamageDelta:0.50", "GJKHNGALFBL": "AS_ExtraBuffCriticalDelta:0.0014", - "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.30", + "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.50", "PHEPEGIJCDD": "AS_IgnoreDefenceRatio_Talent_02:-0.15", "HGNNIMCKGAL": "", "ICLMADGBHLP": "", @@ -4581,10 +4598,10 @@ "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_Duration:10.0", "GOMILGELDEB": "AS_BuffAddDuration:5.0", - "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.250", + "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.370", "NMOADDHNDDI": "AS_BaseBuffCriticalDamageDelta:0.50", "GJKHNGALFBL": "AS_ExtraBuffCriticalDelta:0.0015", - "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.30", + "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.50", "PHEPEGIJCDD": "AS_IgnoreDefenceRatio_Talent_02:-0.15", "HGNNIMCKGAL": "", "ICLMADGBHLP": "", @@ -4601,7 +4618,7 @@ "ADFLOAEIGNN": "AS_BaseBuffCriticalDelta:0.400", "NMOADDHNDDI": "AS_BaseBuffCriticalDamageDelta:0.50", "GJKHNGALFBL": "AS_ExtraBuffCriticalDelta:0.0016", - "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.30", + "OINOPKJHLCK": "AS_ExtraBuffCriticalDamageDelta_Talent_02:0.50", "PHEPEGIJCDD": "AS_IgnoreDefenceRatio_Talent_02:-0.15", "HGNNIMCKGAL": "", "ICLMADGBHLP": "", @@ -4613,7 +4630,7 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "JaneDoe_MathSkill", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_AddedElementAccumulationRatio:0.15", + "EFOPIEOHMMC": "AS_AddedElementAccumulationRatio:0.20", "GOMILGELDEB": "AS_ExtraAddedElementAccumulationRatio:0.15", "ADFLOAEIGNN": "", "NMOADDHNDDI": "", @@ -5378,7 +5395,7 @@ "GCCKFFOAGCF": "", "JLIIOILOGOM": "DeathXIII_AddBreakStunRatio", "LAEOMEPAJCA": 0, - "EFOPIEOHMMC": "AS_AddedBreakStunRatio:2", + "EFOPIEOHMMC": "AS_PartStunRatio:0.25", "GOMILGELDEB": "", "ADFLOAEIGNN": "", "NMOADDHNDDI": "", @@ -13556,7 +13573,7 @@ "JLIIOILOGOM": "Weapon_Ability_14126", "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_AddedDamageRatio_Physics:0.120", - "GOMILGELDEB": "AS_Duration:8.0", + "GOMILGELDEB": "AS_Duration:10.0", "ADFLOAEIGNN": "AS_IntervalCD:0.5", "NMOADDHNDDI": "AS_ElementAccumulationRatio:0.40", "GJKHNGALFBL": "", @@ -13573,7 +13590,7 @@ "JLIIOILOGOM": "Weapon_Ability_14126", "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_AddedDamageRatio_Physics:0.150", - "GOMILGELDEB": "AS_Duration:8.0", + "GOMILGELDEB": "AS_Duration:10.0", "ADFLOAEIGNN": "AS_IntervalCD:0.5", "NMOADDHNDDI": "AS_ElementAccumulationRatio:0.50", "GJKHNGALFBL": "", @@ -13590,7 +13607,7 @@ "JLIIOILOGOM": "Weapon_Ability_14126", "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_AddedDamageRatio_Physics:0.180", - "GOMILGELDEB": "AS_Duration:8.0", + "GOMILGELDEB": "AS_Duration:10.0", "ADFLOAEIGNN": "AS_IntervalCD:0.5", "NMOADDHNDDI": "AS_ElementAccumulationRatio:0.60", "GJKHNGALFBL": "", @@ -13607,7 +13624,7 @@ "JLIIOILOGOM": "Weapon_Ability_14126", "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_AddedDamageRatio_Physics:0.210", - "GOMILGELDEB": "AS_Duration:8.0", + "GOMILGELDEB": "AS_Duration:10.0", "ADFLOAEIGNN": "AS_IntervalCD:0.5", "NMOADDHNDDI": "AS_ElementAccumulationRatio:0.70", "GJKHNGALFBL": "", @@ -13624,7 +13641,7 @@ "JLIIOILOGOM": "Weapon_Ability_14126", "LAEOMEPAJCA": 0, "EFOPIEOHMMC": "AS_AddedDamageRatio_Physics:0.240", - "GOMILGELDEB": "AS_Duration:8.0", + "GOMILGELDEB": "AS_Duration:10.0", "ADFLOAEIGNN": "AS_IntervalCD:0.5", "NMOADDHNDDI": "AS_ElementAccumulationRatio:0.80", "GJKHNGALFBL": "", diff --git a/FileCfg/AbyssGroupDutyTemplateTb.json b/FileCfg/AbyssGroupDutyTemplateTb.json index 1e26edd..e4c324a 100644 --- a/FileCfg/AbyssGroupDutyTemplateTb.json +++ b/FileCfg/AbyssGroupDutyTemplateTb.json @@ -239,6 +239,46 @@ 101001472 ], "GBCPNMECKCN": 2 + }, + { + "KELNJNKGPAM": 25, + "NIGEACMDIMO": 101001, + "DDPEFEKBMCM": [ + 101001473, + 101001474, + 101001475 + ], + "GBCPNMECKCN": 1 + }, + { + "KELNJNKGPAM": 26, + "NIGEACMDIMO": 101001, + "DDPEFEKBMCM": [ + 101001476, + 101001477, + 101001478 + ], + "GBCPNMECKCN": 1 + }, + { + "KELNJNKGPAM": 27, + "NIGEACMDIMO": 101001, + "DDPEFEKBMCM": [ + 101001479, + 101001480, + 101001481 + ], + "GBCPNMECKCN": 1 + }, + { + "KELNJNKGPAM": 28, + "NIGEACMDIMO": 101001, + "DDPEFEKBMCM": [ + 101001482, + 101001483, + 101001484 + ], + "GBCPNMECKCN": 1 } ] } \ No newline at end of file diff --git a/FileCfg/AbyssPeriodicDutyDropTemplateTb.json b/FileCfg/AbyssPeriodicDutyDropTemplateTb.json index 7d912d4..d77dc31 100644 --- a/FileCfg/AbyssPeriodicDutyDropTemplateTb.json +++ b/FileCfg/AbyssPeriodicDutyDropTemplateTb.json @@ -48,8 +48,7 @@ "NOAJNACMIEC": [ 2, 4, - 5, - 17 + 5 ], "AKDNMOHHKFN": [ 20 diff --git a/FileCfg/AbyssPeriodicDutyTemplateTb.json b/FileCfg/AbyssPeriodicDutyTemplateTb.json index 2f3285d..546cc30 100644 --- a/FileCfg/AbyssPeriodicDutyTemplateTb.json +++ b/FileCfg/AbyssPeriodicDutyTemplateTb.json @@ -2071,6 +2071,174 @@ "LNMAEBKDCOA": "AbyssText_Duty_CampName_HAND", "CIIHDAEFNKO": "", "LHGIPEJFKCD": 2 + }, + { + "NGPCCDGBLLK": 101001473, + "MNCDOKNPIBD": 1, + "HHKFOICCBFG": "2", + "OALJOBGFJNP": "1071040442", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001473", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/HIA.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/B_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_HIA", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 15 + }, + { + "NGPCCDGBLLK": 101001474, + "MNCDOKNPIBD": 2, + "HHKFOICCBFG": "2", + "OALJOBGFJNP": "1071040443", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001474", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/HIA.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/A_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_HIA", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 30 + }, + { + "NGPCCDGBLLK": 101001475, + "MNCDOKNPIBD": 3, + "HHKFOICCBFG": "2", + "OALJOBGFJNP": "1071040444", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001475", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/HIA.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/S_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_HIA", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 45 + }, + { + "NGPCCDGBLLK": 101001476, + "MNCDOKNPIBD": 1, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040445", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001476", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/B_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 9 + }, + { + "NGPCCDGBLLK": 101001477, + "MNCDOKNPIBD": 2, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040446", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001477", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/A_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 18 + }, + { + "NGPCCDGBLLK": 101001478, + "MNCDOKNPIBD": 3, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040447", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001478", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/S_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 27 + }, + { + "NGPCCDGBLLK": 101001479, + "MNCDOKNPIBD": 1, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040448", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001479", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/B_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 1 + }, + { + "NGPCCDGBLLK": 101001480, + "MNCDOKNPIBD": 2, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040449", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001480", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/A_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 2 + }, + { + "NGPCCDGBLLK": 101001481, + "MNCDOKNPIBD": 3, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040450", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001481", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/S_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 3 + }, + { + "NGPCCDGBLLK": 101001482, + "MNCDOKNPIBD": 1, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040451", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001482", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/B_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 3 + }, + { + "NGPCCDGBLLK": 101001483, + "MNCDOKNPIBD": 2, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040452", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001483", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/A_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 6 + }, + { + "NGPCCDGBLLK": 101001484, + "MNCDOKNPIBD": 3, + "HHKFOICCBFG": "3", + "OALJOBGFJNP": "1071040453", + "CKFKBHDFMIJ": "AbyssText_Duty_Des_101001484", + "NIGEACMDIMO": 101001, + "FHJCKMALNDN": "UI/Sprite/A1DynamicLoad/IconAbyssCamp/UnPacker/Obsidian.png", + "PLLMGMCILEA": true, + "IBPLCJDCKED": "UI/Sprite/A1DynamicLoad/Hollow/IconSettlement/Packer/S_Level_S.png", + "LNMAEBKDCOA": "AbyssText_Duty_CampName_Obsidian", + "CIIHDAEFNKO": "", + "LHGIPEJFKCD": 9 } ] } \ No newline at end of file diff --git a/FileCfg/AbyssRewardQuestGroupTemplateTb.json b/FileCfg/AbyssRewardQuestGroupTemplateTb.json index ef44b8f..4f196f3 100644 --- a/FileCfg/AbyssRewardQuestGroupTemplateTb.json +++ b/FileCfg/AbyssRewardQuestGroupTemplateTb.json @@ -1186,7 +1186,7 @@ "NFFDNKDOBEJ": "LimboClueSystem_RewardDesc_121", "KJMDLJKAJGG": 15, "OHHLJKMAKED": "1071070151", - "PCBMFGJCLDA": 105031115, + "PCBMFGJCLDA": 105031121, "KIIOIMPBEBJ": 175, "CGMMBPBOEFL": "" }, @@ -1196,7 +1196,7 @@ "NFFDNKDOBEJ": "LimboClueSystem_RewardDesc_122", "KJMDLJKAJGG": 11, "OHHLJKMAKED": "1071070152", - "PCBMFGJCLDA": 105031116, + "PCBMFGJCLDA": 105031122, "KIIOIMPBEBJ": 200, "CGMMBPBOEFL": "" }, @@ -1206,7 +1206,7 @@ "NFFDNKDOBEJ": "LimboClueSystem_RewardDesc_123", "KJMDLJKAJGG": 12, "OHHLJKMAKED": "1071070153", - "PCBMFGJCLDA": 105031117, + "PCBMFGJCLDA": 105031123, "KIIOIMPBEBJ": 200, "CGMMBPBOEFL": "" }, @@ -1216,7 +1216,7 @@ "NFFDNKDOBEJ": "LimboClueSystem_RewardDesc_124", "KJMDLJKAJGG": 13, "OHHLJKMAKED": "1071070154", - "PCBMFGJCLDA": 105031118, + "PCBMFGJCLDA": 105031124, "KIIOIMPBEBJ": 200, "CGMMBPBOEFL": "" }, @@ -1226,7 +1226,7 @@ "NFFDNKDOBEJ": "LimboClueSystem_RewardDesc_125", "KJMDLJKAJGG": 14, "OHHLJKMAKED": "1071070155", - "PCBMFGJCLDA": 105031119, + "PCBMFGJCLDA": 105031125, "KIIOIMPBEBJ": 200, "CGMMBPBOEFL": "" }, @@ -1236,7 +1236,7 @@ "NFFDNKDOBEJ": "LimboClueSystem_RewardDesc_126", "KJMDLJKAJGG": 15, "OHHLJKMAKED": "1071070156", - "PCBMFGJCLDA": 105031120, + "PCBMFGJCLDA": 105031126, "KIIOIMPBEBJ": 200, "CGMMBPBOEFL": "" } diff --git a/FileCfg/AccessConfigTemplateTb.json b/FileCfg/AccessConfigTemplateTb.json index f4bdca7..6b06b5f 100644 --- a/FileCfg/AccessConfigTemplateTb.json +++ b/FileCfg/AccessConfigTemplateTb.json @@ -2354,15 +2354,15 @@ }, { "INENODAOAIE": 12001, - "HICAJEMFEMO": 2, - "ANBLOOJEHOL": 1039, - "IAJMMDCJABO": "TextMap_Access_HadalZoneShop", + "HICAJEMFEMO": 1, + "ANBLOOJEHOL": 17, + "IAJMMDCJABO": "TextMap_Access_Activity", "OAPOMMBDHDI": 1, - "AEIMPECIPMP": 17, - "OAJBMCKNKKI": "TextMap_Access_Activity", - "BGLOIDPIKLL": 1, - "BEPFENLAMLO": 23, - "OHCGJNBMINO": "TextMap_Access_BP", + "AEIMPECIPMP": 23, + "OAJBMCKNKKI": "TextMap_Access_BP", + "BGLOIDPIKLL": 0, + "BEPFENLAMLO": 0, + "OHCGJNBMINO": "", "KDBCADKGFID": 0, "OGHEJBLNKMA": 0, "NAKCBJGFOJO": "", @@ -5061,6 +5061,48 @@ "FKHNDJCNNCM": 0, "GMJPDBDAAGF": "" }, + { + "INENODAOAIE": 100100030, + "HICAJEMFEMO": 1, + "ANBLOOJEHOL": 42, + "IAJMMDCJABO": "ActivityJumpName", + "OAPOMMBDHDI": 0, + "AEIMPECIPMP": 0, + "OAJBMCKNKKI": "", + "BGLOIDPIKLL": 0, + "BEPFENLAMLO": 0, + "OHCGJNBMINO": "", + "KDBCADKGFID": 0, + "OGHEJBLNKMA": 0, + "NAKCBJGFOJO": "", + "AAPPJBPIELL": 0, + "BBLACJDNKFG": 0, + "KKJMBIDHHNN": "", + "MNOHBLAACBO": 0, + "FKHNDJCNNCM": 0, + "GMJPDBDAAGF": "" + }, + { + "INENODAOAIE": 100100031, + "HICAJEMFEMO": 2, + "ANBLOOJEHOL": 112000002, + "IAJMMDCJABO": "ActivityJumpName", + "OAPOMMBDHDI": 0, + "AEIMPECIPMP": 0, + "OAJBMCKNKKI": "", + "BGLOIDPIKLL": 0, + "BEPFENLAMLO": 0, + "OHCGJNBMINO": "", + "KDBCADKGFID": 0, + "OGHEJBLNKMA": 0, + "NAKCBJGFOJO": "", + "AAPPJBPIELL": 0, + "BBLACJDNKFG": 0, + "KKJMBIDHHNN": "", + "MNOHBLAACBO": 0, + "FKHNDJCNNCM": 0, + "GMJPDBDAAGF": "" + }, { "INENODAOAIE": 100111001, "HICAJEMFEMO": 2, diff --git a/FileCfg/ActivityDesignTemplateTb.json b/FileCfg/ActivityDesignTemplateTb.json index 8078046..26154e1 100644 --- a/FileCfg/ActivityDesignTemplateTb.json +++ b/FileCfg/ActivityDesignTemplateTb.json @@ -151,8 +151,7 @@ 1098, 1099, 1100, - 1101, - 1102 + 1101 ] } ] diff --git a/FileCfg/ActivityPeriodTemplateTb.json b/FileCfg/ActivityPeriodTemplateTb.json index e6d4596..1275ee4 100644 --- a/FileCfg/ActivityPeriodTemplateTb.json +++ b/FileCfg/ActivityPeriodTemplateTb.json @@ -542,7 +542,7 @@ }, { "BKIONCDHNKO": 1097, - "BGOJJKFBNGA": "2-18", + "BGOJJKFBNGA": "0-18", "PDNDPLIGNDI": "", "OHHLJKMAKED": "", "KEDDNECIEPB": "", @@ -560,7 +560,7 @@ }, { "BKIONCDHNKO": 1099, - "BGOJJKFBNGA": "0-18", + "BGOJJKFBNGA": "2-18", "PDNDPLIGNDI": "", "OHHLJKMAKED": "", "KEDDNECIEPB": "", @@ -587,7 +587,7 @@ }, { "BKIONCDHNKO": 1102, - "BGOJJKFBNGA": "4-18", + "BGOJJKFBNGA": "5-18", "PDNDPLIGNDI": "", "OHHLJKMAKED": "", "KEDDNECIEPB": "", diff --git a/FileCfg/ActivityPeriodTipsTemplateTb.json b/FileCfg/ActivityPeriodTipsTemplateTb.json index 0acf7a5..ee7ec0a 100644 --- a/FileCfg/ActivityPeriodTipsTemplateTb.json +++ b/FileCfg/ActivityPeriodTipsTemplateTb.json @@ -27,6 +27,15 @@ "MDNNIFIPANM": null, "LMNAJPBDGAC": 0 }, + { + "BKIONCDHNKO": 1014, + "JPAFACJPICL": 0, + "BJEHBOMEFHP": 0, + "PPPBBEOFKCC": 0, + "BMPJGBHPIEN": null, + "MDNNIFIPANM": null, + "LMNAJPBDGAC": 0 + }, { "BKIONCDHNKO": 1015, "JPAFACJPICL": 0, diff --git a/FileCfg/ActivityQuestJumpTemplateTb.json b/FileCfg/ActivityQuestJumpTemplateTb.json index 63e913b..28edf8f 100644 --- a/FileCfg/ActivityQuestJumpTemplateTb.json +++ b/FileCfg/ActivityQuestJumpTemplateTb.json @@ -293,6 +293,18 @@ "JPAFACJPICL": 14, "HEGJEBBJBBB": 0, "KLOPDIMDNAE": 0, + "IGKFLEPDLCD": [ + 10120116 + ], + "INENODAOAIE": 100100004, + "JMFIHBGDLEE": 0, + "PJOPHOCNIEP": 10002 + }, + { + "MNPKABFEAKK": 10001115, + "JPAFACJPICL": 15, + "HEGJEBBJBBB": 0, + "KLOPDIMDNAE": 0, "IGKFLEPDLCD": [ 10120130 ], @@ -301,8 +313,8 @@ "PJOPHOCNIEP": 10002 }, { - "MNPKABFEAKK": 10001115, - "JPAFACJPICL": 15, + "MNPKABFEAKK": 10001116, + "JPAFACJPICL": 16, "HEGJEBBJBBB": 0, "KLOPDIMDNAE": 0, "IGKFLEPDLCD": [ @@ -313,8 +325,8 @@ "PJOPHOCNIEP": 10002 }, { - "MNPKABFEAKK": 10001116, - "JPAFACJPICL": 16, + "MNPKABFEAKK": 10001117, + "JPAFACJPICL": 17, "HEGJEBBJBBB": 0, "KLOPDIMDNAE": 0, "IGKFLEPDLCD": [ @@ -325,8 +337,8 @@ "PJOPHOCNIEP": 10002 }, { - "MNPKABFEAKK": 10001117, - "JPAFACJPICL": 17, + "MNPKABFEAKK": 10001118, + "JPAFACJPICL": 18, "HEGJEBBJBBB": 0, "KLOPDIMDNAE": 0, "IGKFLEPDLCD": [ @@ -337,8 +349,20 @@ "PJOPHOCNIEP": 10002 }, { - "MNPKABFEAKK": 10001118, - "JPAFACJPICL": 18, + "MNPKABFEAKK": 10001119, + "JPAFACJPICL": 19, + "HEGJEBBJBBB": 0, + "KLOPDIMDNAE": 0, + "IGKFLEPDLCD": [ + 10120123 + ], + "INENODAOAIE": 100100004, + "JMFIHBGDLEE": 0, + "PJOPHOCNIEP": 10002 + }, + { + "MNPKABFEAKK": 10001120, + "JPAFACJPICL": 20, "HEGJEBBJBBB": 0, "KLOPDIMDNAE": 0, "IGKFLEPDLCD": [ @@ -349,8 +373,8 @@ "PJOPHOCNIEP": 10002 }, { - "MNPKABFEAKK": 10001119, - "JPAFACJPICL": 19, + "MNPKABFEAKK": 10001121, + "JPAFACJPICL": 21, "HEGJEBBJBBB": 0, "KLOPDIMDNAE": 0, "IGKFLEPDLCD": [ @@ -359,6 +383,54 @@ "INENODAOAIE": 100112005, "JMFIHBGDLEE": 100112005, "PJOPHOCNIEP": 10002 + }, + { + "MNPKABFEAKK": 10001122, + "JPAFACJPICL": 22, + "HEGJEBBJBBB": 0, + "KLOPDIMDNAE": 0, + "IGKFLEPDLCD": [ + 10120135 + ], + "INENODAOAIE": 100111001, + "JMFIHBGDLEE": 0, + "PJOPHOCNIEP": 10002 + }, + { + "MNPKABFEAKK": 10001123, + "JPAFACJPICL": 23, + "HEGJEBBJBBB": 0, + "KLOPDIMDNAE": 0, + "IGKFLEPDLCD": [ + 10120136 + ], + "INENODAOAIE": 100112004, + "JMFIHBGDLEE": 0, + "PJOPHOCNIEP": 10002 + }, + { + "MNPKABFEAKK": 10001124, + "JPAFACJPICL": 24, + "HEGJEBBJBBB": 0, + "KLOPDIMDNAE": 0, + "IGKFLEPDLCD": [ + 10120137 + ], + "INENODAOAIE": 100112004, + "JMFIHBGDLEE": 0, + "PJOPHOCNIEP": 10002 + }, + { + "MNPKABFEAKK": 10001125, + "JPAFACJPICL": 25, + "HEGJEBBJBBB": 0, + "KLOPDIMDNAE": 0, + "IGKFLEPDLCD": [ + 10120138 + ], + "INENODAOAIE": 100100004, + "JMFIHBGDLEE": 100112005, + "PJOPHOCNIEP": 10002 } ] } \ No newline at end of file diff --git a/FileCfg/ActivityQuestRuleTemplateTb.json b/FileCfg/ActivityQuestRuleTemplateTb.json index 55f26a9..994c28c 100644 --- a/FileCfg/ActivityQuestRuleTemplateTb.json +++ b/FileCfg/ActivityQuestRuleTemplateTb.json @@ -1,5 +1,15 @@ { "KHHABHLHAFG": [ + { + "NCCDLNIFECA": 5000002, + "PKGDAADGMJC": [], + "HPOBILPAIOL": 0, + "PBCFBFHNEGG": [ + 10002 + ], + "CGDNIJPICJN": 0, + "AOEMLFDJCKD": 0 + }, { "NCCDLNIFECA": 5000021, "PKGDAADGMJC": [ @@ -62,16 +72,6 @@ "PBCFBFHNEGG": [], "CGDNIJPICJN": 0, "AOEMLFDJCKD": 0 - }, - { - "NCCDLNIFECA": 102102001, - "PKGDAADGMJC": [], - "HPOBILPAIOL": 0, - "PBCFBFHNEGG": [ - 10002 - ], - "CGDNIJPICJN": 0, - "AOEMLFDJCKD": 0 } ] } \ No newline at end of file diff --git a/FileCfg/ArchiveFileQuestTemplateTb.json b/FileCfg/ArchiveFileQuestTemplateTb.json index 5e5c51a..4ae7880 100644 --- a/FileCfg/ArchiveFileQuestTemplateTb.json +++ b/FileCfg/ArchiveFileQuestTemplateTb.json @@ -632,6 +632,7 @@ 108012043, 108012051, 108012053, + 108012061, 108012062, 108012063 ], diff --git a/FileCfg/ArchivePerformTemplateTb.json b/FileCfg/ArchivePerformTemplateTb.json index 2867f06..829826d 100644 --- a/FileCfg/ArchivePerformTemplateTb.json +++ b/FileCfg/ArchivePerformTemplateTb.json @@ -910,6 +910,13 @@ "MEIPIOCBIOA": "Quest_VHSPerformTarget_108012053", "JIAODHAGPFG": 1511036 }, + { + "NGPCCDGBLLK": 108012061, + "PEAELPCHHPG": "QuestName_108010061", + "OJDIEIJKKML": "QuestDesc_108010061", + "MEIPIOCBIOA": "Quest_VHSPerformTarget_108012062", + "JIAODHAGPFG": 55110002 + }, { "NGPCCDGBLLK": 108012062, "PEAELPCHHPG": "Quest_VHSPerformName_108012062", diff --git a/FileCfg/AvatarSkillTemplateTb.json b/FileCfg/AvatarSkillTemplateTb.json index 861b754..25342c4 100644 --- a/FileCfg/AvatarSkillTemplateTb.json +++ b/FileCfg/AvatarSkillTemplateTb.json @@ -9187,8 +9187,8 @@ "ANBCLJEPLIJ": 0, "CCHBOLBIKFP": 1760, "IDPGPLLFOOL": 160, - "HJAPONNOLKN": 1100, - "JOAKEIKABKD": 50, + "HJAPONNOLKN": 1910, + "JOAKEIKABKD": 90, "LIFABNCNMOG": 4800, "BKIACLHLNLF": 0, "AHMGEEGPBBJ": 28676, @@ -9403,8 +9403,8 @@ "ANBCLJEPLIJ": 0, "CCHBOLBIKFP": 28400, "IDPGPLLFOOL": 2590, - "HJAPONNOLKN": 24390, - "JOAKEIKABKD": 1110, + "HJAPONNOLKN": 19040, + "JOAKEIKABKD": 870, "LIFABNCNMOG": 43810, "BKIACLHLNLF": 0, "AHMGEEGPBBJ": 260438, @@ -9465,7 +9465,7 @@ "LJDINANJIMB": 0, "GHGHFFAPGCG": 6, "FAJDLANKMBJ": [ - 750000 + 800000 ] }, { @@ -9499,8 +9499,8 @@ "ANBCLJEPLIJ": 0, "CCHBOLBIKFP": 0, "IDPGPLLFOOL": 0, - "HJAPONNOLKN": 27130, - "JOAKEIKABKD": 1240, + "HJAPONNOLKN": 24930, + "JOAKEIKABKD": 1140, "LIFABNCNMOG": 0, "BKIACLHLNLF": 0, "AHMGEEGPBBJ": 142738, @@ -9523,8 +9523,8 @@ "ANBCLJEPLIJ": 0, "CCHBOLBIKFP": 0, "IDPGPLLFOOL": 0, - "HJAPONNOLKN": 34280, - "JOAKEIKABKD": 1560, + "HJAPONNOLKN": 30430, + "JOAKEIKABKD": 1390, "LIFABNCNMOG": 0, "BKIACLHLNLF": 0, "AHMGEEGPBBJ": 249738, @@ -9547,8 +9547,8 @@ "ANBCLJEPLIJ": 0, "CCHBOLBIKFP": 0, "IDPGPLLFOOL": 0, - "HJAPONNOLKN": 16680, - "JOAKEIKABKD": 760, + "HJAPONNOLKN": 12830, + "JOAKEIKABKD": 590, "LIFABNCNMOG": 0, "BKIACLHLNLF": 0, "AHMGEEGPBBJ": 249738, @@ -9571,8 +9571,8 @@ "ANBCLJEPLIJ": 0, "CCHBOLBIKFP": 37640, "IDPGPLLFOOL": 3430, - "HJAPONNOLKN": 32770, - "JOAKEIKABKD": 1490, + "HJAPONNOLKN": 27900, + "JOAKEIKABKD": 1270, "LIFABNCNMOG": 0, "BKIACLHLNLF": 0, "AHMGEEGPBBJ": 353314, @@ -9652,13 +9652,13 @@ "BMMNCDBFCLH": "", "FAOPCELLJJK": 0, "DHPPJFNABCE": 0, - "DBCLIJIIACJ": 1886, + "DBCLIJIIACJ": 2134, "MINEAOOLGDH": 1, "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 27797, - 41695 + 41695, + 33356 ] }, { @@ -9677,13 +9677,13 @@ "BMMNCDBFCLH": "", "FAOPCELLJJK": 0, "DHPPJFNABCE": 0, - "DBCLIJIIACJ": 4811, + "DBCLIJIIACJ": 5206, "MINEAOOLGDH": 1, "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 44329, - 66493 + 66493, + 53194 ] }, { @@ -9702,13 +9702,13 @@ "BMMNCDBFCLH": "", "FAOPCELLJJK": 0, "DHPPJFNABCE": 0, - "DBCLIJIIACJ": 6386, + "DBCLIJIIACJ": 6878, "MINEAOOLGDH": 1, "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 55082, - 82623 + 82623, + 66098 ] }, { @@ -9727,13 +9727,13 @@ "BMMNCDBFCLH": "", "FAOPCELLJJK": 0, "DHPPJFNABCE": 0, - "DBCLIJIIACJ": 11820, + "DBCLIJIIACJ": 12745, "MINEAOOLGDH": 1, "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 103694, - 155541 + 155541, + 124433 ] }, { @@ -9752,13 +9752,13 @@ "BMMNCDBFCLH": "", "FAOPCELLJJK": 0, "DHPPJFNABCE": 0, - "DBCLIJIIACJ": 7193, + "DBCLIJIIACJ": 7671, "MINEAOOLGDH": 1, "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 53509, - 80264 + 80264, + 64211 ] }, { @@ -9777,13 +9777,13 @@ "BMMNCDBFCLH": "", "FAOPCELLJJK": 0, "DHPPJFNABCE": 0, - "DBCLIJIIACJ": 21166, + "DBCLIJIIACJ": 22662, "MINEAOOLGDH": 1, "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 167529, - 251293 + 251293, + 201034 ] }, { @@ -9807,8 +9807,8 @@ "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 208300, - 208300 + 249960, + 249960 ] }, { @@ -9832,8 +9832,8 @@ "LJDINANJIMB": 0, "GHGHFFAPGCG": 0, "FAJDLANKMBJ": [ - 111667, - 111667 + 134000, + 134000 ] }, { @@ -9857,8 +9857,8 @@ "LJDINANJIMB": 0, "GHGHFFAPGCG": 1, "FAJDLANKMBJ": [ - 52500, - 157500 + 78750, + 126000 ] }, { @@ -9883,7 +9883,7 @@ "GHGHFFAPGCG": 2, "FAJDLANKMBJ": [ 425544, - 297881 + 212772 ] }, { @@ -9907,7 +9907,7 @@ "LJDINANJIMB": 0, "GHGHFFAPGCG": 3, "FAJDLANKMBJ": [ - 65000, + 97500, 0 ] }, @@ -9932,7 +9932,7 @@ "LJDINANJIMB": 0, "GHGHFFAPGCG": 3, "FAJDLANKMBJ": [ - 65000, + 97500, 0 ] }, @@ -9958,7 +9958,7 @@ "GHGHFFAPGCG": 3, "FAJDLANKMBJ": [ 0, - 142451 + 113961 ] }, { @@ -10133,7 +10133,7 @@ "GHGHFFAPGCG": 7, "FAJDLANKMBJ": [ 0, - 187450 + 149960 ] }, { @@ -10232,8 +10232,8 @@ "LJDINANJIMB": 0, "GHGHFFAPGCG": 9, "FAJDLANKMBJ": [ - 271791, - 217451 + 407686, + 173961 ] }, { diff --git a/FileCfg/BattleChallengeConfigTemplateTb.json b/FileCfg/BattleChallengeConfigTemplateTb.json index 540300d..afe5d62 100644 --- a/FileCfg/BattleChallengeConfigTemplateTb.json +++ b/FileCfg/BattleChallengeConfigTemplateTb.json @@ -2154,7 +2154,7 @@ "LIPPHFAAJEE": "", "NLJNMMEKKHI": true, "PIGNFCEIADL": true, - "MNBKJACLOGL": 999910024, + "MNBKJACLOGL": 999999999, "NMHNGOJGOIH": 1, "GPNFAGKDNFK": 1, "COPCKEDOJDE": "12", diff --git a/FileCfg/BattleEventConfigTemplateTb.json b/FileCfg/BattleEventConfigTemplateTb.json index 9d76ecc..debdeca 100644 --- a/FileCfg/BattleEventConfigTemplateTb.json +++ b/FileCfg/BattleEventConfigTemplateTb.json @@ -27206,8 +27206,8 @@ "PCLHMPPJFNE": false, "EKJHFGFOHOF": false, "MKBDNFDOAFF": 3, - "HAPKLIHGLJI": "Instant", - "OCIBIBAADDL": 3000, + "HAPKLIHGLJI": "Normal", + "OCIBIBAADDL": -1, "EGCCMBLKDOH": "", "HMLNOPHJECK": "Chapter3", "AOFLAINHJGO": [], diff --git a/FileCfg/BuddyBattleTemplateTb.json b/FileCfg/BuddyBattleTemplateTb.json index 3211c60..49e349e 100644 --- a/FileCfg/BuddyBattleTemplateTb.json +++ b/FileCfg/BuddyBattleTemplateTb.json @@ -1167,7 +1167,7 @@ "NDPBPNPJKHH": 0, "INMGOIHIHLN": 200, "KBGFDMBEOME": 500000, - "BEBHDDHLONN": 0, + "BEBHDDHLONN": 1044012, "ACNLDLFHFED": 2148562546817341400, "ICACAEJDGEI": 1728920844253829466, "JFJPBGNNDNP": [], diff --git a/FileCfg/CafeConfigTemplateTb.json b/FileCfg/CafeConfigTemplateTb.json index 2db6bd3..52ee018 100644 --- a/FileCfg/CafeConfigTemplateTb.json +++ b/FileCfg/CafeConfigTemplateTb.json @@ -600,7 +600,7 @@ "NGPCCDGBLLK": 51, "PJJPCNEKBMO": "CafeMenuName10", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription10", @@ -620,7 +620,7 @@ "NGPCCDGBLLK": 52, "PJJPCNEKBMO": "CafeMenuName28", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription28", @@ -640,7 +640,7 @@ "NGPCCDGBLLK": 53, "PJJPCNEKBMO": "CafeMenuName22", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription22", @@ -660,7 +660,7 @@ "NGPCCDGBLLK": 54, "PJJPCNEKBMO": "CafeMenuName07", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription07", @@ -684,7 +684,7 @@ "NGPCCDGBLLK": 55, "PJJPCNEKBMO": "CafeMenuName27", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription27", @@ -708,7 +708,7 @@ "NGPCCDGBLLK": 56, "PJJPCNEKBMO": "CafeMenuName26", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription26", @@ -732,7 +732,7 @@ "NGPCCDGBLLK": 57, "PJJPCNEKBMO": "CafeMenuName23", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription23", @@ -750,7 +750,7 @@ "NGPCCDGBLLK": 58, "PJJPCNEKBMO": "CafeMenuName08", "ADHOPOCKPOI": 10, - "FEFNEGDJMBI": 3200, + "FEFNEGDJMBI": 0, "LPDGCALINGE": "", "GDOOOOLKBIO": false, "JGOPJDNINCL": "CafeMenuDescription08", diff --git a/FileCfg/ConditionConfigTemplateTb.json b/FileCfg/ConditionConfigTemplateTb.json index f274e9e..08c132a 100644 Binary files a/FileCfg/ConditionConfigTemplateTb.json and b/FileCfg/ConditionConfigTemplateTb.json differ diff --git a/FileCfg/ErrorCodeTemplateTb.json b/FileCfg/ErrorCodeTemplateTb.json index 2531dde..3712e9f 100644 --- a/FileCfg/ErrorCodeTemplateTb.json +++ b/FileCfg/ErrorCodeTemplateTb.json @@ -820,7 +820,7 @@ "NGPCCDGBLLK": 1509, "FEONLLNOENL": 2, "GIIMFPFKJDM": "ErrorTitle_1", - "FBMLEJMJPGJ": "RET_Item_Full" + "FBMLEJMJPGJ": "RET_ITEM_OVERFLOW_DESC_01" }, { "NGPCCDGBLLK": 1510, diff --git a/FileCfg/HSCClientEventTemplateTb.json b/FileCfg/HSCClientEventTemplateTb.json index 7d79abe..55d9ff4 100644 --- a/FileCfg/HSCClientEventTemplateTb.json +++ b/FileCfg/HSCClientEventTemplateTb.json @@ -1455,7 +1455,7 @@ "IOOIEKEGNKK": "HSC_Event_Day4_07", "BLCJCFKAKJN": "", "FOOIEDEHBBO": "HSC_Option_Day4_07", - "JMBNHIFNHFF": "HSC_Option_Day4_15", + "JMBNHIFNHFF": "HSC_Option_Day4_02", "PHLGHFCBEEP": "", "CODILMMHAJB": 1, "PMIBNNAHODJ": "HSC_Event_Day4_15", @@ -1764,8 +1764,8 @@ ], "DDNPBOPIGCC": 0, "CDAHPNBECCJ": "HSC_ScreenTitle_01|HSC_ScreenText_01", - "FGIFPOEJOBB": "HSC_ScreenTitle_02|HSC_StageTitle_1090001", - "MLCDFEBDNPN": "HSC_ScreenTitle_03|HSC_ScreenText_17", + "FGIFPOEJOBB": "HSC_ScreenTitle_02|HSC_StageTitle_1090002", + "MLCDFEBDNPN": "HSC_ScreenTitle_03|HSC_ScreenText_13", "EKCNFOIDGCB": "", "IOOIEKEGNKK": "HSC_Event_Day5_09", "BLCJCFKAKJN": "", diff --git a/FileCfg/HollowEventTemplateTb.json b/FileCfg/HollowEventTemplateTb.json index db94842..2c2e8cc 100644 Binary files a/FileCfg/HollowEventTemplateTb.json and b/FileCfg/HollowEventTemplateTb.json differ diff --git a/FileCfg/HollowMapTemplateTb.json b/FileCfg/HollowMapTemplateTb.json index 769ada5..b1a37d5 100644 --- a/FileCfg/HollowMapTemplateTb.json +++ b/FileCfg/HollowMapTemplateTb.json @@ -1678,7 +1678,7 @@ "DKLEDNDDCFH": [], "GNFHAPKBPGK": 0, "AMNHMMMFJKO": 0, - "OMFPGOLMLPF": 1030811 + "OMFPGOLMLPF": 1030814 }, { "NGPCCDGBLLK": 10313, diff --git a/FileCfg/HollowQuestTemplateTb.json b/FileCfg/HollowQuestTemplateTb.json index a23a270..ca94988 100644 --- a/FileCfg/HollowQuestTemplateTb.json +++ b/FileCfg/HollowQuestTemplateTb.json @@ -5944,8 +5944,7 @@ "Normal" ], "MPCDJLPEOAG": [ - "Corrupted", - "Ether" + "Energy" ], "IOLABFOADAM": "HollowClient_10010318", "GCFAGCHDHBC": 1, @@ -5989,8 +5988,7 @@ "BJOAKPDCFNA": [], "OBDOOENIHJK": false, "BBKMMOFMKGO": [ - "Ether", - "Fire" + "Ether" ], "IELEICFKDDP": 0, "JHCJIAGIJJD": [], diff --git a/FileCfg/InterKnotConfigTemplateTb.json b/FileCfg/InterKnotConfigTemplateTb.json index 5bc5bfb..0dd01da 100644 --- a/FileCfg/InterKnotConfigTemplateTb.json +++ b/FileCfg/InterKnotConfigTemplateTb.json @@ -2889,7 +2889,7 @@ { "NGPCCDGBLLK": 9701, "JJHBNDNOBIE": 0, - "OHHLJKMAKED": "1100140017", + "OHHLJKMAKED": "1100140016", "JGMCDKEOFKN": "", "ADCNALHKBPI": 0, "DBAKEGDGMDA": 9997, @@ -2926,7 +2926,7 @@ { "NGPCCDGBLLK": 9702, "JJHBNDNOBIE": 0, - "OHHLJKMAKED": "1100140017", + "OHHLJKMAKED": "1100140016", "JGMCDKEOFKN": "", "ADCNALHKBPI": 0, "DBAKEGDGMDA": 9997, diff --git a/FileCfg/JumpCheckConfigTemplateTb.json b/FileCfg/JumpCheckConfigTemplateTb.json index 1b20ee9..3fffc9b 100644 --- a/FileCfg/JumpCheckConfigTemplateTb.json +++ b/FileCfg/JumpCheckConfigTemplateTb.json @@ -154,6 +154,13 @@ "KFMNKEPOOJO": 3, "FJKBHNNENOK": 5000002 }, + { + "OLNFIJPBICC": 306, + "EAAPNBNIIEJ": [], + "HCGJKHJOAAN": "TeleportJumpFailedInfo_Activity", + "KFMNKEPOOJO": 3, + "FJKBHNNENOK": 5000021 + }, { "OLNFIJPBICC": 401, "EAAPNBNIIEJ": [], diff --git a/FileCfg/LevelAbilityConfigTemplateTb.json b/FileCfg/LevelAbilityConfigTemplateTb.json index 3692380..67284fe 100644 --- a/FileCfg/LevelAbilityConfigTemplateTb.json +++ b/FileCfg/LevelAbilityConfigTemplateTb.json @@ -2032,9 +2032,9 @@ ], "DFONIPHAIBE": [], "MBIJOALOPPI": [], - "EFOPIEOHMMC": "AS_AddedBreakStunRatio_NormalAtk:0.25", - "GOMILGELDEB": "AS_AddedDamageRatio_IsQTE:0.5", - "ADFLOAEIGNN": "AS_AddedDamageRatio_InStun:0.3", + "EFOPIEOHMMC": "AS_AddedBreakStunRatio_NormalAtk:0.15", + "GOMILGELDEB": "AS_AddedDamageRatio_IsQTE:1", + "ADFLOAEIGNN": "AS_AddedDamageRatio_InStun:0.5", "NMOADDHNDDI": "", "GJKHNGALFBL": "", "CHOJBPNAEOB": "62001031_Description", diff --git a/FileCfg/LoadingPageTipsTemplateTb.json b/FileCfg/LoadingPageTipsTemplateTb.json index 4091986..fc8a3d0 100644 --- a/FileCfg/LoadingPageTipsTemplateTb.json +++ b/FileCfg/LoadingPageTipsTemplateTb.json @@ -9503,6 +9503,19 @@ "CDHMNJBFHJL": "", "GNNPMBENGCF": "" }, + { + "NGPCCDGBLLK": 1013008204, + "LPDGCALINGE": "", + "JJHBNDNOBIE": 1, + "BCCKLPCLGAC": 4, + "JKDCKLBAJKM": "", + "ALFKPOGGAFF": "Activity_Chat_ActivityQuestioner_30160068_27", + "DNFADBCKKKN": "", + "PFDABMLPLOC": "", + "NPCBCLLFBIK": "", + "CDHMNJBFHJL": "", + "GNNPMBENGCF": "" + }, { "NGPCCDGBLLK": 1013008301, "LPDGCALINGE": "", diff --git a/FileCfg/MainCityObjectTemplateTb.json b/FileCfg/MainCityObjectTemplateTb.json index fe80133..c48df02 100644 Binary files a/FileCfg/MainCityObjectTemplateTb.json and b/FileCfg/MainCityObjectTemplateTb.json differ diff --git a/FileCfg/MainCityQuestTemplateTb.json b/FileCfg/MainCityQuestTemplateTb.json index 765e8f6..2c30acf 100644 Binary files a/FileCfg/MainCityQuestTemplateTb.json and b/FileCfg/MainCityQuestTemplateTb.json differ diff --git a/FileCfg/MessageConfigTemplateTb.json b/FileCfg/MessageConfigTemplateTb.json index 625dd4b..e964057 100644 Binary files a/FileCfg/MessageConfigTemplateTb.json and b/FileCfg/MessageConfigTemplateTb.json differ diff --git a/FileCfg/MessageGroupConfigTemplateTb.json b/FileCfg/MessageGroupConfigTemplateTb.json index 213c23e..3f98c5f 100644 --- a/FileCfg/MessageGroupConfigTemplateTb.json +++ b/FileCfg/MessageGroupConfigTemplateTb.json @@ -6484,26 +6484,6 @@ "JAFGOFDBJIP": [], "MGAHBBANLMA": [] }, - { - "OLJJMDOAMMA": 3035003, - "LCHAMHOKIHB": 2, - "LPCOKHGHALG": 0, - "LPDGCALINGE": "30070050", - "AGEBCCCOBDF": 1, - "JMDGJCBENMP": 10079, - "JEAHAKEBNNO": 0, - "JJHBNDNOBIE": 0, - "LDEHHCMAAEO": 0, - "GBCPNMECKCN": 3, - "JFNJDNKNLLP": [], - "JCNPCGCEEIM": "", - "NONAMNGOLAK": "", - "IOOADODDIAJ": "", - "OMBOIDHJLGA": false, - "BCCKLPCLGAC": 0, - "JAFGOFDBJIP": [], - "MGAHBBANLMA": [] - }, { "OLJJMDOAMMA": 3099001, "LCHAMHOKIHB": 2, diff --git a/FileCfg/MonsterCardConfigTemplateTb.json b/FileCfg/MonsterCardConfigTemplateTb.json index b86ae66..c34a5ef 100644 --- a/FileCfg/MonsterCardConfigTemplateTb.json +++ b/FileCfg/MonsterCardConfigTemplateTb.json @@ -3328,12 +3328,68 @@ "ILBJFHDNOMA": "BossCard/UnPacker/CardResources/Unknown", "DGJJOGDMAKD": 200151, "MCLAIOFCHKB": 300151, - "GOOFAADOHOB": 11641, + "GOOFAADOHOB": 11642, "OBBAJNALDCP": "", "BJFKEOJIJJO": "", "BEFLHCLNLMF": [], "DNGAJNCKCDF": "CardSkillDesc_30020" }, + { + "NGPCCDGBLLK": 30022, + "LDCOBLOCGJJ": "NPCName_101172481", + "LLPFCLBBHIM": 3, + "NGMHKILHMAN": false, + "HKHNGIPANJH": "CardDesc_30022", + "NCEJECEJOBA": [], + "DLJCFPBDGGF": [ + 30020 + ], + "AMOGGGDKFFB": 290, + "KLKHBFMCBFH": false, + "DCADMHMHEGH": 100151, + "CDCFLFOBLFI": 0, + "IGHDFCOIGEJ": [ + 2, + 2, + 2, + 2, + 2, + 2 + ], + "KFOBBLKPAAP": "UI/Sprite/A1DynamicLoad/BossCard/UnPacker/BossCardLv03/Monster_JaneDoe.png", + "AEDBKCLPLLN": false, + "EFHMPKFFIAE": [ + "Ether", + "NotPro" + ], + "GNIDIFNDGHO": [ + "Metro", + "SkyScraper" + ], + "HBAFBNFOCGJ": null, + "LIJHBFNHKDD": 0, + "PLKKDMGEODE": false, + "AFMBHLAIKMP": 290, + "NONAMNGOLAK": "GroupDesc_290", + "MFCENPHOBOP": 0, + "MFFBNANEFMM": "CardQuote_30022", + "LPDGCALINGE": "", + "AECDOOELOIM": "CardObtain_10000", + "HBFFLEDFHID": 2, + "LNOKJOJFOKI": 1, + "CECCEFGAHME": 1, + "IANIDDAMOKL": "NPCName_101172481", + "IMECKCFKJDH": "BossCardLv03/Monster_JaneDoe", + "KOIPPLFJJJC": "BossCardLv03/Monster_JaneDoe", + "ILBJFHDNOMA": "BossCard/UnPacker/BossCardLv03/Monster_JaneDoe", + "DGJJOGDMAKD": 200151, + "MCLAIOFCHKB": 300151, + "GOOFAADOHOB": 11641, + "OBBAJNALDCP": "", + "BJFKEOJIJJO": "", + "BEFLHCLNLMF": [], + "DNGAJNCKCDF": "CardSkillDesc_30022" + }, { "NGPCCDGBLLK": 35001, "LDCOBLOCGJJ": "BriefName_Monster_Nineveh", diff --git a/FileCfg/MonsterConfigTemplateTb.json b/FileCfg/MonsterConfigTemplateTb.json index d291396..bfdd808 100644 Binary files a/FileCfg/MonsterConfigTemplateTb.json and b/FileCfg/MonsterConfigTemplateTb.json differ diff --git a/FileCfg/MonsterGroupTemplateTb.json b/FileCfg/MonsterGroupTemplateTb.json index b55410e..3aeae0d 100644 --- a/FileCfg/MonsterGroupTemplateTb.json +++ b/FileCfg/MonsterGroupTemplateTb.json @@ -1838,7 +1838,7 @@ "GOLEIABMODI": [], "DDNKBCKPAGF": 2, "CBENNAEOBKE": [ - 201, + 202, 200 ] }, diff --git a/FileCfg/MonsterSkillTemplateTb.json b/FileCfg/MonsterSkillTemplateTb.json index 61d54d4..f5a3631 100644 --- a/FileCfg/MonsterSkillTemplateTb.json +++ b/FileCfg/MonsterSkillTemplateTb.json @@ -2413,7 +2413,7 @@ { "NGPCCDGBLLK": 116717, "DJABNIKPFEH": null, - "CCHBOLBIKFP": 12500 + "CCHBOLBIKFP": 20000 }, { "NGPCCDGBLLK": 117701, diff --git a/FileCfg/NewbieGroupTemplateTb.json b/FileCfg/NewbieGroupTemplateTb.json index c38c88d..24e6263 100644 --- a/FileCfg/NewbieGroupTemplateTb.json +++ b/FileCfg/NewbieGroupTemplateTb.json @@ -326,7 +326,7 @@ }, { "NGPCCDGBLLK": 32, - "ENFDNAPNGPJ": 0, + "ENFDNAPNGPJ": 4, "PEFILAGFMPF": "1100140008", "IGJGDJFMMEH": [], "GIOJPBONNCE": [], diff --git a/FileCfg/PopupWindowConfigTemplateTb.json b/FileCfg/PopupWindowConfigTemplateTb.json index 381d487..fb455ad 100644 --- a/FileCfg/PopupWindowConfigTemplateTb.json +++ b/FileCfg/PopupWindowConfigTemplateTb.json @@ -2012,7 +2012,7 @@ "MAMFGMJHHLE": 10000, "PCBMFGJCLDA": 0, "JLIPEPNKMNC": 0, - "COBBOMMCABM": false, + "COBBOMMCABM": true, "NLONCBJIMBN": [], "GDJACFEPEGM": 0 }, diff --git a/FileCfg/PostCommentConfigTemplateTb.json b/FileCfg/PostCommentConfigTemplateTb.json index bf31972..ad75c2a 100644 --- a/FileCfg/PostCommentConfigTemplateTb.json +++ b/FileCfg/PostCommentConfigTemplateTb.json @@ -4954,7 +4954,7 @@ "JEAHAKEBNNO": 1100313, "OLJJMDOAMMA": 110031, "IKOCMCDHIAF": 3, - "CFHNKEHINEL": "/UI/Sprite/A1DynamicLoad/InterKnot/UnPacker/IconInterknotAvatar/IconInterKnot0002.png", + "CFHNKEHINEL": "UI/Sprite/A1DynamicLoad/InterKnot/UnPacker/IconInterknotAvatar/IconInterKnot0002.png", "DBDEACLHPGN": "Commentator3_11003", "KIKNOLFDDFN": "Comment3_11003", "FPEPOJHICCE": 0 diff --git a/FileCfg/QuestConfigTemplateTb.json b/FileCfg/QuestConfigTemplateTb.json index 42daa2a..139d56e 100644 Binary files a/FileCfg/QuestConfigTemplateTb.json and b/FileCfg/QuestConfigTemplateTb.json differ diff --git a/FileCfg/RoomInfoTemplateTb.json b/FileCfg/RoomInfoTemplateTb.json index c5ebe54..4061d54 100644 --- a/FileCfg/RoomInfoTemplateTb.json +++ b/FileCfg/RoomInfoTemplateTb.json @@ -33,7 +33,8 @@ ], "PLJHGCHGKGI": 11046, "OCFEILIGFLL": [ - 203 + 203, + 205 ], "JDNPAKJNHLA": 4 }, @@ -435,7 +436,7 @@ "IDMDBLAHBBA": "PlayerPos_A1", "GJHODGDJLJD": [ 11063, - 11261 + 11263 ], "PLJHGCHGKGI": 11063, "OCFEILIGFLL": [ @@ -749,7 +750,8 @@ ], "PLJHGCHGKGI": 11381, "OCFEILIGFLL": [ - 203 + 203, + 205 ], "JDNPAKJNHLA": 3 }, diff --git a/FileCfg/SpecialQuestTemplateTb.json b/FileCfg/SpecialQuestTemplateTb.json index 527014a..bc2ee6a 100644 --- a/FileCfg/SpecialQuestTemplateTb.json +++ b/FileCfg/SpecialQuestTemplateTb.json @@ -5208,7 +5208,7 @@ "CJHGFGEEECG": "", "HNMAMIGKEBC": "", "NHGGEOPNHHM": "", - "BGNNFJIMKIO": true, + "BGNNFJIMKIO": false, "KEHBLCCKMDO": false, "BOPJLGJPKGK": 0, "BGAPHCMLEBL": 6, diff --git a/FileCfg/TeleportConfigTemplateTb.json b/FileCfg/TeleportConfigTemplateTb.json index 263e360..d6b6842 100644 --- a/FileCfg/TeleportConfigTemplateTb.json +++ b/FileCfg/TeleportConfigTemplateTb.json @@ -1338,7 +1338,7 @@ "NGPCCDGBLLK": 1037, "HNKGCOCKIHP": 10, "JJHBNDNOBIE": 0, - "OHHLJKMAKED": "1100140105", + "OHHLJKMAKED": "1040140371", "FMKOPDGFLNM": "TeleportName_01", "OLJCIBPJJIP": "UI/Sprite/A1DynamicLoad/NavigationPage/UnPacker/ShopPic/IconStorage.png", "CIKHJKHMDEL": 100001, @@ -2280,6 +2280,27 @@ "ANMKHJAHNCN": 0, "JMGPAFCAHJL": [], "BPPNCACDPBI": 0 + }, + { + "NGPCCDGBLLK": 112000002, + "HNKGCOCKIHP": 10, + "JJHBNDNOBIE": 0, + "OHHLJKMAKED": "1040140086", + "FMKOPDGFLNM": "TeleportName_01", + "OLJCIBPJJIP": "UI/Sprite/A1DynamicLoad/NavigationPage/UnPacker/ShopPic/IconStorage.png", + "CIKHJKHMDEL": 100001, + "ENPHMLOLOMA": 2, + "ONHDGIGKPJN": "Workshop_PlayerPos_FromCharacterQuest", + "DCKMCPBDHMG": "TeleportName_01_DecorativeText", + "PAJCMAMMDBM": "UIMainStoryPage", + "HJGLMIIAFKL": [], + "NHJCGOCIJOO": [], + "MLNIAIEPGJJ": [], + "ANMKHJAHNCN": 0, + "JMGPAFCAHJL": [ + 117 + ], + "BPPNCACDPBI": 0 } ] } \ No newline at end of file diff --git a/FileCfg/TimeRandomTemplateTb.json b/FileCfg/TimeRandomTemplateTb.json index e72441f..0de0c21 100644 --- a/FileCfg/TimeRandomTemplateTb.json +++ b/FileCfg/TimeRandomTemplateTb.json @@ -5409,7 +5409,9 @@ "KJNMOLOJKCL": 1, "HJFMODIBLIK": 0, "OKJGGDNGMLB": [], - "HEBJEOMBFFI": [], + "HEBJEOMBFFI": [ + 0 + ], "NOMFHDFNBII": false }, { @@ -5767,7 +5769,9 @@ "KJNMOLOJKCL": 0, "HJFMODIBLIK": 0, "OKJGGDNGMLB": [], - "HEBJEOMBFFI": [], + "HEBJEOMBFFI": [ + 0 + ], "NOMFHDFNBII": false }, { diff --git a/FileCfg/TipsConfigTemplateTb.json b/FileCfg/TipsConfigTemplateTb.json index d4102fa..75455f9 100644 Binary files a/FileCfg/TipsConfigTemplateTb.json and b/FileCfg/TipsConfigTemplateTb.json differ diff --git a/FileCfg/TraningQuestTemplateTb.json b/FileCfg/TraningQuestTemplateTb.json index 1dd60e8..92daa42 100644 --- a/FileCfg/TraningQuestTemplateTb.json +++ b/FileCfg/TraningQuestTemplateTb.json @@ -475,7 +475,7 @@ "EDGAJDBNFGB": false, "AAHNBMMNEGJ": false, "JNCJBNOBDKF": "UI/Sprite/A1DynamicLoad/IconRoleCircle/UnPacker/IconRoleCircle24.png", - "OHEEPBCNHOO": "", + "OHEEPBCNHOO": "Jane_Seth_release", "KFHDGIDJKLP": "", "CIBPKBNKIBB": 60, "LPKBLDAEAKB": 0, @@ -496,7 +496,7 @@ "EDGAJDBNFGB": false, "AAHNBMMNEGJ": false, "JNCJBNOBDKF": "UI/Sprite/A1DynamicLoad/IconRoleCircle/UnPacker/IconRoleCircle30.png", - "OHEEPBCNHOO": "", + "OHEEPBCNHOO": "Jane_Seth_release", "KFHDGIDJKLP": "", "CIBPKBNKIBB": 60, "LPKBLDAEAKB": 0, diff --git a/FileCfg/TransitionConfigTemplateTb.json b/FileCfg/TransitionConfigTemplateTb.json index eb63413..fe3eda7 100644 --- a/FileCfg/TransitionConfigTemplateTb.json +++ b/FileCfg/TransitionConfigTemplateTb.json @@ -7959,7 +7959,7 @@ "GJKOOBHHBLI": 0, "IIMCEEMGEAP": 2, "LEHFOMEGCIK": 30032, - "LIHHGLBCBBI": true, + "LIHHGLBCBBI": false, "LGNNMCPALNC": "", "DHDKDGCLFBD": 0, "FMMIIDPFCDP": 0, @@ -17712,6 +17712,22 @@ "GMDLKDLBKOC": 0, "DNECEGIDGMP": 0 }, + { + "NGPCCDGBLLK": 1013008204, + "EDGHPCADEEM": 0, + "KKHEFPCNHBI": 700, + "GJKOOBHHBLI": 0, + "IIMCEEMGEAP": 2, + "LEHFOMEGCIK": 1013008204, + "LIHHGLBCBBI": false, + "LGNNMCPALNC": "", + "DHDKDGCLFBD": 0, + "FMMIIDPFCDP": 0, + "PGCPODOJFHB": 0, + "AECJDHGOGEN": "", + "GMDLKDLBKOC": 0, + "DNECEGIDGMP": 0 + }, { "NGPCCDGBLLK": 1013008301, "EDGHPCADEEM": 0, diff --git a/FileCfg/UIJumpConfigTemplateTb.json b/FileCfg/UIJumpConfigTemplateTb.json index 9020ca9..cb4f276 100644 --- a/FileCfg/UIJumpConfigTemplateTb.json +++ b/FileCfg/UIJumpConfigTemplateTb.json @@ -409,6 +409,17 @@ "LPDGCALINGE": 0, "JMGPAFCAHJL": [] }, + { + "AHBJLGEFBAP": 42, + "HGHHOFBJJON": 1007, + "POFCHDCHHIP": 0, + "DPKFIGCLJPP": "5000021", + "LPDGCALINGE": 0, + "JMGPAFCAHJL": [ + 107, + 306 + ] + }, { "AHBJLGEFBAP": 100, "HGHHOFBJJON": 1005, diff --git a/TextMap/TextMapTemplateTb.json b/TextMap/TextMapTemplateTb.json index 09abea1..0f832a0 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 7ca68b6..3af6917 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 be54302..88ef25e 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 a4cc156..826c3f9 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 bbe08a9..72cbc90 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 a1e43ff..b083c37 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 36db6f7..4090e0e 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 8527c1d..809f2b6 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 dbcb9ca..392acd9 100644 Binary files a/TextMap/TextMap_KOTemplateTb.json and b/TextMap/TextMap_KOTemplateTb.json differ diff --git a/TextMap/TextMap_Login_CHTTemplateTb.json b/TextMap/TextMap_Login_CHTTemplateTb.json index eae69cd..0c56535 100644 --- a/TextMap/TextMap_Login_CHTTemplateTb.json +++ b/TextMap/TextMap_Login_CHTTemplateTb.json @@ -25,7 +25,7 @@ "ErrorDesc_3": "前后端版本不匹配", "ErrorDesc_5": "偵測到有新版本，重新啟動遊戲可更新到最新版本", "ErrorTipsButton1": "重新登入", - "ErrorTipsButton2": "繼續連接", + "ErrorTipsButton2": "繼續連線", "ErrorTitle_1": "提示", "Error_AccountServerFail": "取得AccountServer失敗,{0}", "Error_StopServer01": "新艾利都市政維護中。校準測試開始時間為：{0}，敬請期待", @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "英語", "Setting_LANGUAGE_Option14": "韓語", "Setting_LANGUAGE_Option15": "Français", diff --git a/TextMap/TextMap_Login_DETemplateTb.json b/TextMap/TextMap_Login_DETemplateTb.json index 424038a..3900e4c 100644 --- a/TextMap/TextMap_Login_DETemplateTb.json +++ b/TextMap/TextMap_Login_DETemplateTb.json @@ -111,7 +111,7 @@ "Login_NetConnectErr": "Netzwerkfehler", "Login_Repair_Button01": "Abbrechen", "Login_Repair_Button02": "Reparieren", - "Login_Repair_Desc01": "Die Vollständigkeit der Spieldaten zu überprüfen?", + "Login_Repair_Desc01": "Die Vollständigkeit der Spieldaten jetzt überprüfen?", "Login_Repair_Desc02": "Überprüfung der Vollständigkeit von Ressourcen des Clients ...", "Login_Repair_Desc03": "Einige Dateien fehlen dem Client. Bitte kehre zur Anmeldeseite zurück, um es zu reparieren.", "Login_Repair_Desc04": "Client vollständig. Keine Reparatur nötig.", @@ -145,13 +145,13 @@ "PSN_Session_Name": "Zenless Zone Zero Session", "PlayStation_Download_Des": "Download-Fortschritt", "Pre_download_Complete_Resources": "Gesamte Datenmenge herunterladen", - "Pre_download_Completed": "Vorzeitiges Herunterladen abgeschlossen", - "Pre_download_Content": "Lade die neueste Version vorab herunter, um schneller darauf zugreifen zu können, wenn sie verfügbar ist. Möchtest du das Ressourcenpaket für die neue Version vorab herunterladen?\nRessourcengröße: {0} ", + "Pre_download_Completed": "Vorab-Download abgeschlossen", + "Pre_download_Content": "Lade die neueste Version vorab herunter, um schneller darauf zugreifen zu können, wenn sie verfügbar ist. Möchtest du das Datenpaket für die neue Version vorab herunterladen?\nRessourcengröße: {0} ", "Pre_download_Count": "Berechnung läuft.", - "Pre_download_Restart": "Vorzeitiges Herunterladen fortsetzen", - "Pre_download_Start": "Vorzeitiges Herunterladen", + "Pre_download_Restart": "Vorab-Download fortsetzen", + "Pre_download_Start": "Ressourcen werden vorab heruntergeladen ...", "Pre_download_Suspend": "Herunterladen pausieren", - "Pre_download_Title": "Datenpaket vorzeitig herunterladen", + "Pre_download_Title": "Datenpaket vorab herunterladen", "RET_DISK_NOT_ENOUGH_DESC_01": "Speicherplatz unzureichend. Sorge bitte für mehr freien Festplattenspeicher und versuche es dann erneut.", "RET_FAIL_DESC_01": "Serverfehler -1", "RET_FILE_LENGTH_CHECK_FAILED_DESC_01": "Herunterladen fehlgeschlagen 200", @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "Englisch", "Setting_LANGUAGE_Option14": "Koreanisch", "Setting_LANGUAGE_Option15": "Français", diff --git a/TextMap/TextMap_Login_ENTemplateTb.json b/TextMap/TextMap_Login_ENTemplateTb.json index 0c7baa8..4b3ceba 100644 --- a/TextMap/TextMap_Login_ENTemplateTb.json +++ b/TextMap/TextMap_Login_ENTemplateTb.json @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "English", "Setting_LANGUAGE_Option14": "Korean", "Setting_LANGUAGE_Option15": "Français", diff --git a/TextMap/TextMap_Login_ESTemplateTb.json b/TextMap/TextMap_Login_ESTemplateTb.json index d9b3230..a0f55f7 100644 --- a/TextMap/TextMap_Login_ESTemplateTb.json +++ b/TextMap/TextMap_Login_ESTemplateTb.json @@ -69,7 +69,7 @@ "Login_DownloadServerFail": "No se ha podido obtener la lista de servidores de la versión: {0}", "Login_DownloadServerList": "Obteniendo lista de servidores...", "Login_DownloadTips01": "Actualmente estás usando datos móviles, se consumirán datos ({0}) si continúas con la descarga. ¿Deseas continuar?", - "Login_DownloadTips02": "No has autorizado la descarga mediante la red del operador, por lo que se ha cancelado la descarga. Inténtalo de nuevo en una red WiFi.", + "Login_DownloadTips02": "No has autorizado la descarga mediante la red del operador, por lo que se ha cancelado la descarga. Inténtalo de nuevo en una red wifi.", "Login_DownloadTips03": "Descarga en segundo plano en curso.", "Login_DownloadTips04": "Descarga de recursos completada.", "Login_DownloadTips05": "Descarga de recursos completada. Reinicia el juego para completar la actualización.", @@ -178,8 +178,8 @@ "Resource_Title": "Recursos:", "SettingOperationModeTips1": "Pulsa cualquier botón del ratón o tecla del teclado", "SettingOperationModeTips2": "Pulsa cualquier botón del controlador para cambiar", - "SettingOperationModeTips3": "{LAYOUT_MOBILE#Pulsa}{LAYOUT_CONTROLLER#Presiona}{LAYOUT_KEYBOARD#Haz clic en}{LAYOUT_CONSOLECONTROLLER#Presiona}{LAYOUT_FALLBACK#Presiona} para confirmar los ajustes", - "SettingOperationModeTips4": "{LAYOUT_MOBILE#Pulsa}{LAYOUT_CONTROLLER#Presiona}{LAYOUT_KEYBOARD#Haz clic en}{LAYOUT_CONSOLECONTROLLER#Presiona}{LAYOUT_FALLBACK#Presiona} la imagen de arriba para confirmar la configuración", + "SettingOperationModeTips3": "Pulsa para confirmar los ajustes", + "SettingOperationModeTips4": "Pulsa la imagen de arriba para confirmar la configuración", "SettingOperationModeTitle": "Diseño de la IU", "SettingOperationModeTitleTips": "Después de entrar al juego, puedes hacer ajustes en Ajustes - Entrada. En la interfaz de inicio de sesión / combate / ciudad / Cavidades, presiona en el teclado o pulsa en el controlador para cambiar rápidamente el diseño de la interfaz de usuario.", "Setting_Account_Children_Privacy": "Política de privacidad para menores", @@ -391,7 +391,7 @@ "Setting_INPUT_Option35": "Sintonización", "Setting_INPUT_Option36": "Inventario", "Setting_INPUT_Option37": "Tienda", - "Setting_INPUT_Option38": "Mantener {LAYOUT_MOBILE#pulsado}{LAYOUT_CONTROLLER#presionado}{LAYOUT_KEYBOARD#pulsado}{LAYOUT_CONSOLECONTROLLER#presionado}{LAYOUT_FALLBACK#presionado} para acelerar", + "Setting_INPUT_Option38": "Mantener pulsado para acelerar", "Setting_INPUT_Option39": "Botón de aceleración", "Setting_INPUT_Option4": "Evasión", "Setting_INPUT_Option40": "Activación de evento", @@ -436,7 +436,7 @@ "Setting_INPUT_Value17_3": "Pantalla táctil", "Setting_INPUT_Value21_1": "Desactivar", "Setting_INPUT_Value21_2": "Activar", - "Setting_INPUT_Value51_1": "Hacer clic para activar", + "Setting_INPUT_Value51_1": "Pulsar para activar", "Setting_INPUT_Value51_2": "Soltar para activar", "Setting_Jump_Common01": "Ir a ajustes", "Setting_KeyboardBinding_Option1": "Desplazarse (arriba)", @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "Inglés", "Setting_LANGUAGE_Option14": "Coreano", "Setting_LANGUAGE_Option15": "Français", @@ -494,9 +494,9 @@ "Setting_OTHER_Option7": "Recarga completa", "Setting_OTHER_Option8": "Menú de botones en la esquina superior derecha", "Setting_OTHER_Option9": "Opciones de fuente", - "Setting_OTHER_QTECancel_Option_01": "Activada", - "Setting_OTHER_QTECancel_Option_02": "Desactivada", - "Setting_OTHER_QTECancel_Option_03": "Cerrar", + "Setting_OTHER_QTECancel_Option_01": "Pulsa para cancelar", + "Setting_OTHER_QTECancel_Option_02": "Pulsa dos veces para cancelar", + "Setting_OTHER_QTECancel_Option_03": "Desactivada", "Setting_OTHER_QTECancel_Title": "Cancelación de interrupción de ventana de técnica en cadena", "Setting_OTHER_Title1": "Otros ajustes", "Setting_OTHER_Title2": "Notificaciones (debes habilitar las notificaciones del sistema para poder recibirlas)", @@ -504,8 +504,8 @@ "Setting_OTHER_Value1_2": "Activada", "Setting_OTHER_Value2_1": "Activar", "Setting_OTHER_Value2_2": "Desactivar", - "Setting_OTHER_Value4_1": "{LAYOUT_MOBILE#Pulsar}{LAYOUT_CONTROLLER#Presionar}{LAYOUT_KEYBOARD#Hacer clic}", - "Setting_OTHER_Value4_2": "Mantener {LAYOUT_MOBILE#pulsado}{LAYOUT_CONTROLLER#presionado}{LAYOUT_KEYBOARD#presionado}", + "Setting_OTHER_Value4_1": "Pulsar", + "Setting_OTHER_Value4_2": "Mantener pulsado", "Setting_OTHER_Value5_1": "Según el orden", "Setting_OTHER_Value5_2": "Definir", "Setting_OTHER_Value6_1": "Modo casual", diff --git a/TextMap/TextMap_Login_FRTemplateTb.json b/TextMap/TextMap_Login_FRTemplateTb.json index a451333..2894ede 100644 --- a/TextMap/TextMap_Login_FRTemplateTb.json +++ b/TextMap/TextMap_Login_FRTemplateTb.json @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "Anglais", "Setting_LANGUAGE_Option14": "Coréen", "Setting_LANGUAGE_Option15": "Français", @@ -496,6 +496,7 @@ "Setting_OTHER_Option9": "Options de police", "Setting_OTHER_QTECancel_Option_01": "Appuyer pour annuler", "Setting_OTHER_QTECancel_Option_02": "Appuyer deux fois pour annuler", + "Setting_OTHER_QTECancel_Option_03": "Désactiver", "Setting_OTHER_QTECancel_Title": "Annulation des enchaînements", "Setting_OTHER_Title1": "Autres", "Setting_OTHER_Title2": "Notifications (vous devez activer les notifications systèmes pour recevoir des notifications)", diff --git a/TextMap/TextMap_Login_IDTemplateTb.json b/TextMap/TextMap_Login_IDTemplateTb.json index 7dfa898..fcd9470 100644 --- a/TextMap/TextMap_Login_IDTemplateTb.json +++ b/TextMap/TextMap_Login_IDTemplateTb.json @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "Bahasa Inggris", "Setting_LANGUAGE_Option14": "Bahasa Korea", "Setting_LANGUAGE_Option15": "Français", @@ -494,8 +494,8 @@ "Setting_OTHER_Option7": "Battery Penuh", "Setting_OTHER_Option8": "Label Tombol untuk Menu Kanan Atas", "Setting_OTHER_Option9": "Pilihan Font", - "Setting_OTHER_QTECancel_Option_01": "Tekan untuk membatalkan", - "Setting_OTHER_QTECancel_Option_02": "Dobel-klik untuk membatalkan", + "Setting_OTHER_QTECancel_Option_01": "Tekan", + "Setting_OTHER_QTECancel_Option_02": "Dobel-tap", "Setting_OTHER_QTECancel_Option_03": "Off", "Setting_OTHER_QTECancel_Title": "Cara Membatalkan Chain Attack", "Setting_OTHER_Title1": "Pengaturan Lainnya", diff --git a/TextMap/TextMap_Login_JATemplateTb.json b/TextMap/TextMap_Login_JATemplateTb.json index 694bb0e..0503252 100644 --- a/TextMap/TextMap_Login_JATemplateTb.json +++ b/TextMap/TextMap_Login_JATemplateTb.json @@ -1,8 +1,8 @@ { "CharacterChoose_ManualQTEMode_Close": "「手動連携スキルモード」をオフにしますか？", - "CharacterChoose_ManualQTEMode_Close_Detail": "オフにすると、ブレイク状態の敵に『通常攻撃』、『回避反撃』、『特殊スキル』、『強化特殊スキル』、『クイック支援』、『支援突撃』において重撃効果のある攻撃を与えるだけで、『連携スキル』を発動可能。_JP0A", + "CharacterChoose_ManualQTEMode_Close_Detail": "オフにすると、ブレイク状態の敵に『通常攻撃』、『回避反撃』、『特殊スキル』、『強化特殊スキル』、『クイック支援』、『支援突撃』において重撃効果のある攻撃を与えるだけで、『連携スキル』を発動可能。", "CharacterChoose_ManualQTEMode_Open": "「手動連携スキルモード」をオンにしますか？", - "CharacterChoose_ManualQTEMode_Open_Detail": "オンにすると、ブレイク状態の敵に『通常攻撃』、『回避反撃』、『特殊スキル』、『強化特殊スキル』、『クイック支援』、『支援突撃』において重撃効果のある攻撃を与える際、同時に『通常攻撃』または『特殊攻撃』を押した場合、『連携スキル』を発動しなくなる。_JP0A", + "CharacterChoose_ManualQTEMode_Open_Detail": "オンにすると、ブレイク状態の敵に『通常攻撃』、『回避反撃』、『特殊スキル』、『強化特殊スキル』、『クイック支援』、『支援突撃』において重撃効果のある攻撃を与える際、同時に『通常攻撃』または『特殊攻撃』を押した場合、『連携スキル』を発動しなくなる。", "Click_Login": "ログイン", "CodeText_111": "言語を切り替えるとログイン画面に戻ります、今すぐ切り替えますか？", "CodeText_122": "ゲームを終了しますか？", @@ -369,8 +369,8 @@ "Setting_INPUT_Option15": "マウス呼び出し", "Setting_INPUT_Option16": "OK/キャンセルボタンの配置入れ替え", "Setting_INPUT_Option17": "UIレイアウト", - "Setting_INPUT_Option18": "キャラ切替-前のキャラ", - "Setting_INPUT_Option19": "キャラ切替-次のキャラ", + "Setting_INPUT_Option18": "キャラ切替-前のメンバー", + "Setting_INPUT_Option19": "キャラ切替-次のメンバー", "Setting_INPUT_Option2": "特殊攻撃", "Setting_INPUT_Option20": "コントローラーの振動レベル", "Setting_INPUT_Option21": "コントローラーの振動", @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "英語", "Setting_LANGUAGE_Option14": "韓国語", "Setting_LANGUAGE_Option15": "Français", @@ -475,10 +475,10 @@ "Setting_LANGUAGE_Title4": "キャラボイス", "Setting_LANGUAGE_Title5": "ボイスパックの管理", "Setting_LANGUAGE_Title6": "キーボード配列", - "Setting_OTHER_CHESSBOARD_Option1": "ボンプのプラグイン-クイック使用_JP0A", - "Setting_OTHER_CHESSBOARD_Option2": "TVアレイの加速設定を維持_JP0A", - "Setting_OTHER_CHESSBOARD_Value1_1": "長押し_JP0A", - "Setting_OTHER_CHESSBOARD_Value1_2": "短押し_JP0A", + "Setting_OTHER_CHESSBOARD_Option1": "ボンプのプラグイン-クイック使用", + "Setting_OTHER_CHESSBOARD_Option2": "TVアレイの加速設定を維持", + "Setting_OTHER_CHESSBOARD_Value1_1": "長押し", + "Setting_OTHER_CHESSBOARD_Value1_2": "短押し", "Setting_OTHER_CHESSBOARD_Value2_1": "ON", "Setting_OTHER_CHESSBOARD_Value2_2": "OFF", "Setting_OTHER_ManualQTEMode_Option_01": "自動モード", @@ -494,10 +494,10 @@ "Setting_OTHER_Option7": "バッテリー満タン", "Setting_OTHER_Option8": "メイン画面右上のボタン一覧", "Setting_OTHER_Option9": "フォント", - "Setting_OTHER_QTECancel_Option_01": "短押しでキャンセル_JP0A", - "Setting_OTHER_QTECancel_Option_02": "二回押してキャンセル_JP0A", + "Setting_OTHER_QTECancel_Option_01": "短押しでキャンセル", + "Setting_OTHER_QTECancel_Option_02": "二回押しでキャンセル", "Setting_OTHER_QTECancel_Option_03": "OFF", - "Setting_OTHER_QTECancel_Title": "連携スキルのキャンセル_JP0A", + "Setting_OTHER_QTECancel_Title": "連携スキルのキャンセル", "Setting_OTHER_Title1": "その他の設定", "Setting_OTHER_Title2": "プッシュ通知（デバイス設定で通知を許可した場合のみ有効）", "Setting_OTHER_Value1_1": "OFF", @@ -547,7 +547,7 @@ "Setting_UI_Title01": "キーボード", "Setting_UI_Title02": "マウス", "Setting_UI_Title03": "デフォルトに戻す", - "Setting_UserCenter_Tips01": "【カスタマーセンター-アカウントのセキュリティー】にて設定を行ってください_JP0A", + "Setting_UserCenter_Tips01": "【カスタマーセンター-アカウントのセキュリティー】にて設定を行ってください", "SwitchAccountFaild": "ログアウトに失敗しました！", "UILoginMessageBox01": "OK", "UILoginMessageBox02": "キャンセル", diff --git a/TextMap/TextMap_Login_KOTemplateTb.json b/TextMap/TextMap_Login_KOTemplateTb.json index e33b70e..1c4acdf 100644 --- a/TextMap/TextMap_Login_KOTemplateTb.json +++ b/TextMap/TextMap_Login_KOTemplateTb.json @@ -1,8 +1,8 @@ { "CharacterChoose_ManualQTEMode_Close": "「수동 콤보 스킬 모드」를 종료하시겠습니까?", - "CharacterChoose_ManualQTEMode_Close_Detail": "해당 기능 비활성화 후 [일반 공격], [회피 반격], [특수 스킬], [강화 특수 스킬], [빠른 지원], [지원 돌격]의 강공격이 그로기 상태인 적에게 명중 시 [콤보 스킬]을 발동할 수 있습니다", + "CharacterChoose_ManualQTEMode_Close_Detail": "해당 기능 비활성화 후 [일반 공격], [회피 반격], [특수 스킬], [강화 특수 스킬], [빠른 지원], [지원 돌격]의 강공격이 그로기 상태인 적에게 명중 시 [콤보 스킬]을 발동합니다", "CharacterChoose_ManualQTEMode_Open": "「수동 콤보 스킬 모드」를 사용하시겠습니까?", - "CharacterChoose_ManualQTEMode_Open_Detail": "사용 시 [일반 공격], [회피 반격], [특수 스킬], [강화 특수 스킬], [빠른 지원], [지원 돌격]의 강공격이 그로기 상태인 적에게 명중 시 「일반 공격」 혹은 「특수 공격」을 홀드하면 [콤보 스킬]을 발동하지 않습니다", + "CharacterChoose_ManualQTEMode_Open_Detail": "사용 시 [일반 공격], [회피 반격], [특수 스킬], [강화 특수 스킬], [빠른 지원], [지원 돌격]의 강공격이 그로기 상태인 적에게 명중 시 「일반 공격」 혹은 「특수 공격」을 홀드하면 [콤보 스킬]을 발동하지 않습니다", "Click_Login": "로그인하기", "CodeText_111": "언어 교체 시 로그인 화면으로 돌아갑니다. 교체하시겠습니까?", "CodeText_122": "게임에서 나가시겠습니까?", @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "영어", "Setting_LANGUAGE_Option14": "한국어", "Setting_LANGUAGE_Option15": "Français", diff --git a/TextMap/TextMap_Login_PTTemplateTb.json b/TextMap/TextMap_Login_PTTemplateTb.json index 470966b..2ac1d8f 100644 --- a/TextMap/TextMap_Login_PTTemplateTb.json +++ b/TextMap/TextMap_Login_PTTemplateTb.json @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "Inglês", "Setting_LANGUAGE_Option14": "Coreano", "Setting_LANGUAGE_Option15": "Français", diff --git a/TextMap/TextMap_Login_RUTemplateTb.json b/TextMap/TextMap_Login_RUTemplateTb.json index 55eb6b5..5fa780d 100644 --- a/TextMap/TextMap_Login_RUTemplateTb.json +++ b/TextMap/TextMap_Login_RUTemplateTb.json @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "Английский", "Setting_LANGUAGE_Option14": "Корейский", "Setting_LANGUAGE_Option15": "Français", diff --git a/TextMap/TextMap_Login_THTemplateTb.json b/TextMap/TextMap_Login_THTemplateTb.json index 6d196d3..0803685 100644 --- a/TextMap/TextMap_Login_THTemplateTb.json +++ b/TextMap/TextMap_Login_THTemplateTb.json @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "ภาษาอังกฤษ", "Setting_LANGUAGE_Option14": "ภาษาเกาหลี", "Setting_LANGUAGE_Option15": "Français", @@ -475,7 +475,7 @@ "Setting_LANGUAGE_Title4": "เสียงของเกม", "Setting_LANGUAGE_Title5": "จัดการไฟล์เสียง", "Setting_LANGUAGE_Title6": "การจัดวางคีย์บอร์ด", - "Setting_OTHER_CHESSBOARD_Option1": "ใช้ปลั๊กอิน Bangboo บนกระดานหมากรุกอย่างรวดเร็ว", + "Setting_OTHER_CHESSBOARD_Option1": "ปุ่มลัดการใช้งานปลั๊กอิน Bangboo บนกระดานหมากรุก", "Setting_OTHER_CHESSBOARD_Option2": "บันทึกการตั้งค่าเร่งความเร็วกระดานหมากรุก", "Setting_OTHER_CHESSBOARD_Value1_1": "กดค้าง", "Setting_OTHER_CHESSBOARD_Value1_2": "คลิก", diff --git a/TextMap/TextMap_Login_VITemplateTb.json b/TextMap/TextMap_Login_VITemplateTb.json index f1ab56a..744df31 100644 --- a/TextMap/TextMap_Login_VITemplateTb.json +++ b/TextMap/TextMap_Login_VITemplateTb.json @@ -452,7 +452,7 @@ "Setting_LANGUAGE_Option1": "简体中文", "Setting_LANGUAGE_Option10": "Tiếng Việt", "Setting_LANGUAGE_Option11": "Bahasa Indonesia", - "Setting_LANGUAGE_Option12": "Русский язык", + "Setting_LANGUAGE_Option12": "Русский", "Setting_LANGUAGE_Option13": "Tiếng Anh", "Setting_LANGUAGE_Option14": "Tiếng Hàn", "Setting_LANGUAGE_Option15": "Français", diff --git a/TextMap/TextMap_PTTemplateTb.json b/TextMap/TextMap_PTTemplateTb.json index 299b3a8..7d811d7 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 fbf286f..05c5715 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 e4cb8e8..3ca9580 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 e58cb7d..9d0d9d8 100644 Binary files a/TextMap/TextMap_VITemplateTb.json and b/TextMap/TextMap_VITemplateTb.json differ