From 1d209ec368a324824c21e2982f2313811a74e561 Mon Sep 17 00:00:00 2001 From: SL1900 <43700351+SL1900@users.noreply.github.com> Date: Tue, 22 Sep 2026 12:00:00 +0900 Subject: [PATCH] Update - 1.15.1.137 EN: 1.15.1.137 CN: 1.15.1.136 JP: 1.15.1.140 KR: 1.15.1.142 --- data/bin/Buff.json | 2 +- data/bin/BuffValue.json | 14 +- data/bin/EffectValue.json | 20 +- data/bin/HitDamage.json | 6 +- data/bin/JointDrillLevel.json | 13 +- data/bin/MonsterValueTemplete.json | 1044 +++++++++++++++++ data/bin/MonsterValueTempleteAdjust.json | 48 +- data/bin/buff.bytes | Bin 138153 -> 138142 bytes data/bin/buffvalue.bytes | Bin 112485 -> 112486 bytes data/bin/effectvalue.bytes | Bin 426313 -> 426320 bytes data/bin/hitdamage.bytes | Bin 209910 -> 209910 bytes data/bin/jointdrilllevel.bytes | Bin 4849 -> 4861 bytes data/bin/monstervaluetemplete.bytes | Bin 1113331 -> 1114603 bytes data/bin/monstervaluetempleteadjust.bytes | Bin 82436 -> 82495 bytes data/language/en_us/characterdes.json | 2 +- data/language/en_us/chargetlines.json | 2 +- data/language/en_us/infinitytoweraffix.json | 6 +- data/language/en_us/jointdrill_2_level.json | 6 +- data/language/en_us/jointdrillaffix.json | 8 +- data/language/en_us/potential.json | 6 +- data/language/en_us/skill.json | 2 +- data/language/en_us/uitext.json | 2 +- data/language/ja_jp/dictionarydiagram.json | 2 +- data/language/ja_jp/jointdrillaffix.json | 24 +- data/language/ja_jp/potential.json | 2 +- data/language/ja_jp/uitext.json | 8 +- .../ko_kr/characterarchivebaseinfo.json | 2 +- data/language/ko_kr/jointdrillaffix.json | 10 +- data/language/ko_kr/jointdrillcontrol.json | 2 +- data/language/ko_kr/uitext.json | 2 +- data/language/zh_cn/jointdrillaffix.json | 8 +- lua/game/ui/avg/_cn/config/stsp_13_02.lua | 4 +- lua/game/ui/avg/_en/config/stev_12_02.lua | 4 +- lua/game/ui/avg/_en/config/stev_12_03.lua | 4 +- lua/game/ui/avg/_en/config/stsp_17_02.lua | 2 +- lua/game/ui/avg/_en/config/stsp_17_03.lua | 6 +- lua/game/ui/avg/_en/preset/avguitext.lua | 6 +- lua/game/ui/avg/_jp/config/cg_126_03.lua | 4 +- lua/game/ui/avg/_jp/config/stm03_04.lua | 2 +- lua/game/ui/avg/_jp/preset/avgcharacter.lua | 14 + lua/game/ui/avg/_jp/preset/avgcontacts.lua | 8 + lua/game/ui/avg/_kr/config/stm03_01.lua | 4 +- .../ui/friendex/friendaddstrangerctrl.lua | 4 +- .../data/dataclass/activity/cookieactdata.lua | 4 +- versions.txt | 8 +- 45 files changed, 1208 insertions(+), 107 deletions(-) diff --git a/data/bin/Buff.json b/data/bin/Buff.json index 4dc9c8dcc..2f0d95f24 100644 --- a/data/bin/Buff.json +++ b/data/bin/Buff.json @@ -9647,7 +9647,7 @@ "GroupId": 11701011, "ReduceTime": 0, "BuffTag1": 943565682, - "BuffTag2": -719983267, + "BuffTag2": 0, "BuffTag3": 0, "BuffTag4": 0, "BuffTag5": 0, diff --git a/data/bin/BuffValue.json b/data/bin/BuffValue.json index 7833fc27a..d5af95041 100644 --- a/data/bin/BuffValue.json +++ b/data/bin/BuffValue.json @@ -31722,7 +31722,7 @@ 313010003 ], "BuffEffects": [], - "Time": 15000, + "Time": 25000, "LaminatedNum": 3, "Num": 1, "TimeSuperposition": 2, @@ -31782,7 +31782,7 @@ 720130171 ], "BuffEffects": [], - "Time": 150000, + "Time": 200000, "LaminatedNum": 5, "Num": 1, "TimeSuperposition": 2, @@ -31802,7 +31802,7 @@ 720130172 ], "BuffEffects": [], - "Time": 150000, + "Time": 200000, "LaminatedNum": 5, "Num": 1, "TimeSuperposition": 2, @@ -31822,7 +31822,7 @@ 720130173 ], "BuffEffects": [], - "Time": 150000, + "Time": 200000, "LaminatedNum": 5, "Num": 1, "TimeSuperposition": 2, @@ -31842,7 +31842,7 @@ 720130174 ], "BuffEffects": [], - "Time": 150000, + "Time": 200000, "LaminatedNum": 5, "Num": 1, "TimeSuperposition": 2, @@ -31862,7 +31862,7 @@ 720130175 ], "BuffEffects": [], - "Time": 150000, + "Time": 200000, "LaminatedNum": 5, "Num": 1, "TimeSuperposition": 2, @@ -31882,7 +31882,7 @@ 720130176 ], "BuffEffects": [], - "Time": 150000, + "Time": 200000, "LaminatedNum": 5, "Num": 1, "TimeSuperposition": 2, diff --git a/data/bin/EffectValue.json b/data/bin/EffectValue.json index d6138dac4..02aec4558 100644 --- a/data/bin/EffectValue.json +++ b/data/bin/EffectValue.json @@ -117962,7 +117962,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "-0.05", + "EffectTypeParam1": "-0.02", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -117981,7 +117981,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "-0.05", + "EffectTypeParam1": "-0.025", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118000,7 +118000,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "-0.07", + "EffectTypeParam1": "-0.03", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118019,7 +118019,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "-0.07", + "EffectTypeParam1": "-0.035", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118038,7 +118038,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "-0.1", + "EffectTypeParam1": "-0.047", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118057,7 +118057,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "-0.1", + "EffectTypeParam1": "-0.0625", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118133,7 +118133,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "0.04", + "EffectTypeParam1": "0.05", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118152,7 +118152,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "0.04", + "EffectTypeParam1": "0.05", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118171,7 +118171,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "0.02", + "EffectTypeParam1": "0.05", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", @@ -118190,7 +118190,7 @@ "EffectType": 12, "EffectTypeFirstSubtype": 53, "EffectTypeSecondSubtype": 1, - "EffectTypeParam1": "0.02", + "EffectTypeParam1": "0.05", "EffectTypeParam2": "", "EffectTypeParam3": "", "EffectTypeParam4": "", diff --git a/data/bin/HitDamage.json b/data/bin/HitDamage.json index 5f2aca694..139f47afb 100644 --- a/data/bin/HitDamage.json +++ b/data/bin/HitDamage.json @@ -97454,7 +97454,7 @@ "DamageTag": [], "DamageBonusType": 1, "SkillPercentAmend": [ - 800000, + 700000, 0 ], "SkillAbsAmend": [ @@ -97488,7 +97488,7 @@ "DamageTag": [], "DamageBonusType": 1, "SkillPercentAmend": [ - 900000, + 800000, 0 ], "SkillAbsAmend": [ @@ -97522,7 +97522,7 @@ "DamageTag": [], "DamageBonusType": 1, "SkillPercentAmend": [ - 300000, + 250000, 0 ], "SkillAbsAmend": [ diff --git a/data/bin/JointDrillLevel.json b/data/bin/JointDrillLevel.json index 15d499fb3..ac3ee804a 100644 --- a/data/bin/JointDrillLevel.json +++ b/data/bin/JointDrillLevel.json @@ -820,7 +820,7 @@ "HpBarNum": 25, "BossId": 7010323, "FirstRRDropId": 104, - "RewardPreview": "[[2,50,1],[34,200,0]]", + "RewardPreview": "[[2,50,1],[34,300,0]]", "TimeScore": 680000, "ScorePerSec": 1200, "LevelScore": 400000, @@ -874,7 +874,7 @@ "HpBarNum": 30, "BossId": 7010333, "FirstRRDropId": 104, - "RewardPreview": "[[2,50,1],[34,200,0]]", + "RewardPreview": "[[2,50,1],[34,400,0]]", "TimeScore": 1370000, "ScorePerSec": 2400, "LevelScore": 800000, @@ -928,7 +928,7 @@ "HpBarNum": 40, "BossId": 7010343, "FirstRRDropId": 104, - "RewardPreview": "[[2,50,1],[34,200,0]]", + "RewardPreview": "[[2,50,1],[34,500,0]]", "TimeScore": 2740000, "ScorePerSec": 4800, "LevelScore": 1600000, @@ -982,7 +982,7 @@ "HpBarNum": 60, "BossId": 7010232, "FirstRRDropId": 104, - "RewardPreview": "[[2,50,1],[34,200,0]]", + "RewardPreview": "[[2,50,1],[34,500,0]]", "TimeScore": 4380000, "ScorePerSec": 6200, "LevelScore": 2560000, @@ -993,6 +993,7 @@ 10031, 10032, 10033, + 10034, 10035, 10036, 10037 @@ -1036,7 +1037,7 @@ "HpBarNum": 80, "BossId": 7010254, "FirstRRDropId": 104, - "RewardPreview": "[[2,50,1],[34,200,0]]", + "RewardPreview": "[[2,50,1],[34,500,0]]", "TimeScore": 6800000, "ScorePerSec": 8100, "LevelScore": 3865600, @@ -1047,7 +1048,9 @@ 10031, 10032, 10033, + 10034, 10035, + 10036, 10037, 10038 ], diff --git a/data/bin/MonsterValueTemplete.json b/data/bin/MonsterValueTemplete.json index eb84c3df1..44338c4c3 100644 --- a/data/bin/MonsterValueTemplete.json +++ b/data/bin/MonsterValueTemplete.json @@ -748083,6 +748083,702 @@ "Suppress": 10000, "RCDMARKDMG": 0 }, + "7888011": { + "Id": 7888011, + "TemplateId": 7888, + "Name": "", + "Lv": 6195000, + "Hp": 1946, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 6195000, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7888021": { + "Id": 7888021, + "TemplateId": 7888, + "Name": "", + "Lv": 44850000, + "Hp": 5024, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 44850000, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7888031": { + "Id": 7888031, + "TemplateId": 7888, + "Name": "", + "Lv": 95670000, + "Hp": 8620, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 95670000, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7888041": { + "Id": 7888041, + "TemplateId": 7888, + "Name": "", + "Lv": 630603300, + "Hp": 13235, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 630603300, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7888051": { + "Id": 7888051, + "TemplateId": 7888, + "Name": "", + "Lv": -1318498560, + "Hp": 15358, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": -1318498560, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7888061": { + "Id": 7888061, + "TemplateId": 7888, + "Name": "", + "Lv": -750973162, + "Hp": 17064, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": -750973162, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7889011": { + "Id": 7889011, + "TemplateId": 7889, + "Name": "", + "Lv": 6195000, + "Hp": 1946, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 6195000, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7889021": { + "Id": 7889021, + "TemplateId": 7889, + "Name": "", + "Lv": 44850000, + "Hp": 5024, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 44850000, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7889031": { + "Id": 7889031, + "TemplateId": 7889, + "Name": "", + "Lv": 95670000, + "Hp": 8620, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 95670000, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7889041": { + "Id": 7889041, + "TemplateId": 7889, + "Name": "", + "Lv": 630603300, + "Hp": 13235, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 630603300, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7889051": { + "Id": 7889051, + "TemplateId": 7889, + "Name": "", + "Lv": -1318498560, + "Hp": 15358, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": -1318498560, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7889061": { + "Id": 7889061, + "TemplateId": 7889, + "Name": "", + "Lv": -750973162, + "Hp": 17064, + "Atk": 500, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": -750973162, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, "7881011": { "Id": 7881011, "TemplateId": 7881, @@ -750171,6 +750867,354 @@ "Suppress": 10000, "RCDMARKDMG": 0 }, + "7890011": { + "Id": 7890011, + "TemplateId": 7890, + "Name": "", + "Lv": 61950, + "Hp": 1946, + "Atk": 0, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 0, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7890021": { + "Id": 7890021, + "TemplateId": 7890, + "Name": "", + "Lv": 123900, + "Hp": 5024, + "Atk": 0, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 0, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7890031": { + "Id": 7890031, + "TemplateId": 7890, + "Name": "", + "Lv": 247800, + "Hp": 8620, + "Atk": 0, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 0, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7890041": { + "Id": 7890041, + "TemplateId": 7890, + "Name": "", + "Lv": 11949519, + "Hp": 13235, + "Atk": 0, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 0, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7890051": { + "Id": 7890051, + "TemplateId": 7890, + "Name": "", + "Lv": 35848557, + "Hp": 15358, + "Atk": 0, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 0, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, + "7890061": { + "Id": 7890061, + "TemplateId": 7890, + "Name": "", + "Lv": 73793421, + "Hp": 17064, + "Atk": 0, + "Def": 0, + "CritRate": 0, + "NormalCritRate": 0, + "SkillCritRate": 0, + "UltraCritRate": 0, + "MarkCritRate": 0, + "SummonCritRate": 0, + "ProjectileCritRate": 0, + "OtherCritRate": 0, + "CritResistance": 0, + "CritPower": 0, + "NormalCritPower": 0, + "SkillCritPower": 0, + "UltraCritPower": 0, + "MarkCritPower": 0, + "SummonCritPower": 0, + "ProjectileCritPower": 0, + "OtherCritPower": 10000, + "HitRate": 0, + "Evd": 10000, + "AtkSpd": 0, + "DefPierce": 0, + "DefIgnore": 0, + "WEP": 0, + "FEP": 0, + "SEP": 0, + "AEP": 0, + "LEP": 0, + "DEP": 0, + "WEI": 0, + "FEI": 0, + "SEI": 0, + "AEI": 0, + "LEI": 0, + "DEI": 10000, + "WEE": 10000, + "FEE": 10000, + "SEE": 10000, + "AEE": 10000, + "LEE": 10000, + "DEE": 0, + "WER": 0, + "FER": 0, + "SER": 0, + "AER": 0, + "LER": 0, + "DER": 0, + "Toughness": 0, + "Suppress": 10000, + "RCDMARKDMG": 0 + }, "10000011": { "Id": 10000011, "TemplateId": 10000, diff --git a/data/bin/MonsterValueTempleteAdjust.json b/data/bin/MonsterValueTempleteAdjust.json index 049bb5470..8c5127a07 100644 --- a/data/bin/MonsterValueTempleteAdjust.json +++ b/data/bin/MonsterValueTempleteAdjust.json @@ -25095,6 +25095,36 @@ "SuppressRatio": 0, "SuppressFix": 0 }, + "7010134": { + "Id": 7010134, + "TemplateId": 7885, + "Name": "", + "EET": 3, + "WeakEET": [ + 1, + 2 + ], + "HpRatio": 0, + "HpFix": 0, + "AtkRatio": 0, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 250, + "FERRatio": 0, + "FERFix": 250, + "SERRatio": 0, + "SERFix": 2000, + "AERRatio": 0, + "AERFix": 750, + "LERRatio": 0, + "LERFix": 750, + "DERRatio": 0, + "DERFix": 750, + "ToughnessRatio": -1500, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, "7010141": { "Id": 7010141, "TemplateId": 7887, @@ -25127,7 +25157,7 @@ }, "7010201": { "Id": 7010201, - "TemplateId": 7880, + "TemplateId": 7888, "Name": "", "EET": 0, "WeakEET": [], @@ -25154,7 +25184,7 @@ }, "7010208": { "Id": 7010208, - "TemplateId": 7884, + "TemplateId": 7890, "Name": "", "EET": 0, "WeakEET": [], @@ -25181,7 +25211,7 @@ }, "7010210": { "Id": 7010210, - "TemplateId": 7880, + "TemplateId": 7889, "Name": "", "EET": 0, "WeakEET": [], @@ -25208,7 +25238,7 @@ }, "7010223": { "Id": 7010223, - "TemplateId": 7880, + "TemplateId": 7888, "Name": "", "EET": 0, "WeakEET": [ @@ -25238,7 +25268,7 @@ }, "7010230": { "Id": 7010230, - "TemplateId": 7884, + "TemplateId": 7890, "Name": "", "EET": 0, "WeakEET": [ @@ -25268,7 +25298,7 @@ }, "7010232": { "Id": 7010232, - "TemplateId": 7880, + "TemplateId": 7889, "Name": "", "EET": 0, "WeakEET": [ @@ -25298,7 +25328,7 @@ }, "7010245": { "Id": 7010245, - "TemplateId": 7880, + "TemplateId": 7888, "Name": "", "EET": 2, "WeakEET": [ @@ -25328,7 +25358,7 @@ }, "7010252": { "Id": 7010252, - "TemplateId": 7884, + "TemplateId": 7890, "Name": "", "EET": 2, "WeakEET": [ @@ -25358,7 +25388,7 @@ }, "7010254": { "Id": 7010254, - "TemplateId": 7880, + "TemplateId": 7889, "Name": "", "EET": 2, "WeakEET": [ diff --git a/data/bin/buff.bytes b/data/bin/buff.bytes index fc120a35cacab26964f30f481b025eb4e9cc8fc8..bfdc1da1776cdcd5d1fc8e965005eb7aa014cb04 100644 GIT binary patch delta 37 rcmZ3vonzj1jtwG(LIMmNlc$|xH2@I~pRRp7$lPpLxZSXjv0@bfABYdA delta 48 zcmbQYonz&8jtwG(veFD3lc$|xH2@I~pRRp7$n0_V*7X&C{{sPIvs&SHwL->J@2)#M-A}`wk_Crok`*Hxdl@h4Q7;1_Ii-a{9!WZPUop-;+}r#C6nCrtac#lH;5IphKYN-$}6Tzo&eWt6P*A6 delta 44 ycmezNoaftfo`x32ElkH>PS0v*;+}r#C6nCrGxLG0-yl}iVkYkGDzBI>c>)0Kq7;$< diff --git a/data/bin/jointdrilllevel.bytes b/data/bin/jointdrilllevel.bytes index de17cf661e76be6ca56f9fc6751a9f9b0915f7da..2781422e5cbd01d3ae4dac825b6095a4fad58477 100644 GIT binary patch delta 83 zcmeyU`d4*BGT-FYoZ6Ec_{%4=@&`9xL^vj!3r(DSPk?LkDIs+LHX$C1 delta 83 zcmeyX`cZX5G9RPSau?8Mp bpjh_g>w>yKF;*dvn2FE~#?6zj3TXfUy>%QU diff --git a/data/bin/monstervaluetemplete.bytes b/data/bin/monstervaluetemplete.bytes index f48ffa5e194c549ccbddb0b28de84ca1236910dd..7f50aa0a4151ed5c2a4b8d575657aa94c64dd14d 100644 GIT binary patch delta 773 zcmezT)A@C?i$KU^W(IZ!13g1M13e=~rjLyRtpbd#0!*y}%&h_}tpcpA0&J}U?5zSE ztpc2_0$i;E+*<{B;+{%&$5b$YfIS08_s)mR0vBv07!`K({bHKV|A5~hKRaLUflW;r%mFFg3svgG zz_AyqlucpUye~6lr#C+4(NqF6K?;i#;J*HR0O;$B*nM4#Q1%z947;z}5enN6Ld?VF z>xochKwnRUD#PXL*$Abxp-OT2dMQ*X(AP_$N|Ald3ikE(tfxH6oD$I~5RaQOaNIrt zbm%3J$NxQMp1$BUkGfPULiQGRe0OfBdGDOeEP-(ysFYr1?CJK oy-)>g3cdfQD{HK1oxX7?lWKeKJ02kB1!6uR=HK4?P9TjB0F-tJDF6Tf delta 91 zcmaFe?DF}ivp~pXW(IZ!13g1M13e=~ru&Totpbd#0!*y}%&h_}tpcpA0&J}U?5zSE rtpc2_0$i;E+*<{B;+}4Q@q$O5v%U2*4-oSLF&_}~Z*To9kj4i9&u1P0 diff --git a/data/bin/monstervaluetempleteadjust.bytes b/data/bin/monstervaluetempleteadjust.bytes index 54cb136ef8a89d6c7d2b99fd36394bde7d591328..e3ffac7f60fa72ebb7411c0ad159ba5134a20153 100644 GIT binary patch delta 154 zcmZo^Vcp-tDiAW6nSq_bK+jOmK+lMgsb{0WqNO}x-?JD%z>tCC+T@U>`ja;;^=AL=KnpxlyL~6lu8K#S1=H}bWHD>_;5)n8Y delta 143 zcmdnr!rIcpDiAW6nSq_bK+jOmK+lMgse7ZqqNS7HF7;wOF}Y!p)Z{(OxF*Le6PUbZ zk*eUL?^z5Wpv}Os=>2MD0hkIYpjv_Da+ALC2^&Param2& for &Param3&s, stacking up to &Param4& times.", "Potential.516009.1": "Each time Bubble Frog bounces, increases the squad's &Param1&. Additionally, increases non-Aqua Squadmates' &Param5&.", "Potential.516009.2": "Each time Bubble Frog bounces, increases the squad's &Param1& by &Param2&. Additionally, increases non-Aqua Squadmates' &Param5& by &Param6&. This effect lasts &Param3&s, stacking up to &Param4& times.", - "Potential.516010.1": "After bouncing a certain number of times, Bubble Frog deals Aqua Skill DMG in a large area. Can inflict ##Aqua Mark: Torrent#2008#, while increasing targets' &Param2&.", - "Potential.516010.2": "Every 2 bounces, Bubble Frog deals &Param1& of ATK as Aqua Skill DMG in a large area. Can inflict ##Aqua Mark: Torrent#2008#, while increasing targets' &Param2& by &Param3& for &Param4&s.", + "Potential.516010.1": "After bouncing a certain number of times, Bubble Frog deals Aqua Skill DMG in a large area. Can inflict ##Aqua Mark: Torrent#2008#, while increasing the target's DMG Taken of all Elements.", + "Potential.516010.2": "Every 2 bounces, Bubble Frog deals &Param1& of ATK as Aqua Skill DMG in a large area. Can inflict ##Aqua Mark: Torrent#2008#, while increasing the target's DMG Taken of all Elements by &Param3& for &Param4&s.", "Potential.516011.1": "Can dodge one more time. After Willow dodges, increases own &Param1&.", "Potential.516011.2": "Increases Dodge count by 1.\u000bAfter Willow dodges, increases &Param1& by &Param2& for &Param3&s.", "Potential.516012.1": "When Bubble Frog deals DMG, Willow gains a shield.", @@ -2244,7 +2244,7 @@ "Potential.516025.1": "When entering with the Support Skill, the DMG from diving into the water also inflicts 1 stack of ##Smiling Sanction#4040#. Increases the max stack limit of ##Smiling Sanction#4040#, and additionally increases the target's &Param1&.", "Potential.516025.2": "When entering with Frolic in the Sea (Support Skill), the DMG from diving into the water also inflicts 1 stack of ##Smiling Sanction#4040#. The max stack limit of ##Smiling Sanction#4040# is increased to &Param3& stacks, and each stack additionally increases the target's &Param1& by &Param2&.", "Potential.516026.1": "When a target with ##Smiling Sanction#4040# has ##Aqua Mark#1018# triggered, this target is immediately inflicted with ##Aqua Mark: Torrent#2008# again and receives additional Aqua Mark DMG. The &Param2& received this time is increased based on the stacks of ##Smiling Sanction#4040#.", - "Potential.516026.2": "When a target with ##Smiling Sanction#4040# has ##Aqua Mark#1018# triggered, this target is immediately inflicted with ##Aqua Mark: Torrent#2008# again and receives an additional &Param1& of ATK as Aqua Mark DMG. For each stack of ##Smiling Sanction#4040# this target has, increases the &Param2& received this time by &Param3&. This effect can only be triggered once every 1s.", + "Potential.516026.2": "When a target with ##Smiling Sanction#4040# has ##Aqua Mark#1018# triggered, this target is immediately inflicted with ##Aqua Mark: Torrent#2008# again and receives an additional &Param1& of ATK as Aqua Mark DMG. For each stack of ##Smiling Sanction#4040# this target has, increases the &Param2& received this time by &Param3&. This effect can only be triggered once every &Param4&s.", "Potential.516027.1": "While ##Gentle Warning#4042# is active, additionally increases the squad's &Param1&, and the Main Trekker generates extra Decibels when dealing DMG.", "Potential.516027.2": "While ##Gentle Warning#4042# is active, increases the squad's &Param1& by an additional &Param2&; the Main Trekker generates 8 extra Decibels when dealing DMG. This effect can be triggered once every 5s.", "Potential.516028.1": "Bubble Bath expands over time. When the Main Trekker is inside Bubble Bath, increases her &Param1&.", diff --git a/data/language/en_us/skill.json b/data/language/en_us/skill.json index 7b066df2d..cb69c67be 100644 --- a/data/language/en_us/skill.json +++ b/data/language/en_us/skill.json @@ -1074,7 +1074,7 @@ "Skill.16031002.2": "When tapping the Main Skill button, different effects occur based on the current ##Decibels#4038#.\u000bCurrent Decibels below 100:\u000bSwitches back and forth between Bubble Machine and Megaphone modes.\u000bCurrent Decibels at 100:\u000bConsumes all Decibels at once and launches a Bubble Frog: every bounce creates an impact dealing &Param1& of ATK as AoE Aqua Skill DMG and inflicting ##Aqua Mark: Torrent#2008#, bouncing once every 3s. When Bubble Frog deals DMG, increases the squad's &Param2& by &Param3& for &Param4&s, stacking up to &Param5& times.", "Skill.16032000.1": "Frolic in the Sea", "Skill.16032000.13": "Willow dives into the water, dealing Aqua Skill DMG in a large area and generating a 7m-radius Bubble Bath that continuously deals AoE Aqua Skill DMG.\u000bWillow then follows the Main Trekker, slowly firing bubbles that continuously deal Aqua Skill DMG for 17s. All of the above DMG can inflict ##Aqua Mark: Torrent#2008#.\u000bWhile Willow is on the field, she provides different statuses to the squad based on the current ##Decibels#4039#:\u000bGentle Warning: Decibels ≤40, increases &Param4&\u000bSafety Alert: 40< Decibels ≤100, additionally increases &Param6&", - "Skill.16032000.2": "Willow dives into the water, dealing &Param1& of ATK as Aqua Skill DMG in a large area and generating a 7m-radius Bubble Bath that deals &Param2& of ATK as AoE Aqua Skill DMG every 2s.\u000bWillow then follows the Main Trekker, slowly firing bubbles, continuously dealing &Param3& of ATK as Aqua Skill DMG for 17s. All of the above DMG can inflict ##Aqua Mark: Torrent#2008#.\u000bWhile Willow is on the field, she provides different statuses to the squad based on the current ##Decibels#4039#:\u000bGentle Warning: Decibels ≤40, increases &Param4& by &Param5&\u000bSafety Alert: 40< Decibels ≤100, additionally increases &Param6& by &Param7&.", + "Skill.16032000.2": "Willow dives into the water, dealing &Param1& of ATK as Aqua Skill DMG in a large area and generating a 7m-radius Bubble Bath that deals &Param2& of ATK as AoE Aqua Skill DMG every 3s.\u000bWillow then follows the Main Trekker, slowly firing bubbles, continuously dealing &Param3& of ATK as Aqua Skill DMG for 17s. All of the above DMG can inflict ##Aqua Mark: Torrent#2008#.\u000bWhile Willow is on the field, she provides different statuses to the squad based on the current ##Decibels#4039#:\u000bGentle Warning: Decibels ≤40, increases &Param4& by &Param5&\u000bSafety Alert: 40< Decibels ≤100, additionally increases &Param6& by &Param7&.", "Skill.16040000.1": "Beach Warning", "Skill.16040000.13": "Blows multiple bubbles and fiercely hits them consecutively, dealing AoE Aqua Ultimate DMG and inflicting ##Aqua Mark: Torrent#2008#, while increasing the squad's &Param3&.", "Skill.16040000.2": "Blows multiple bubbles and fiercely hits them consecutively, dealing &Param1&x7 and &Param2& of ATK as AoE Aqua Ultimate DMG, inflicting ##Aqua Mark: Torrent#2008#, while increasing the squad's &Param3& by &Param4& for &Param5&s, stacking up to &Param6& times.", diff --git a/data/language/en_us/uitext.json b/data/language/en_us/uitext.json index 6abbfa22f..843a73d9c 100644 --- a/data/language/en_us/uitext.json +++ b/data/language/en_us/uitext.json @@ -1839,7 +1839,7 @@ "UIText.Item_Reengagement_DoubleDrop.1": "Extra Loots", "UIText.JP_CV.1": "Japanese Voiceover:.", "UIText.JointDrill_AVG_Title.1": "Story Info", - "UIText.JointDrill_Act_Challenge_End.1": "*****", + "UIText.JointDrill_Act_Challenge_End.1": "Challenge Ended", "UIText.JointDrill_Act_Detail.1": "Event Details", "UIText.JointDrill_Act_End_Tip.1": "The event has expired", "UIText.JointDrill_Act_Goto.1": "Go Now", diff --git a/data/language/ja_jp/dictionarydiagram.json b/data/language/ja_jp/dictionarydiagram.json index 9a72b7a59..0703ac79a 100644 --- a/data/language/ja_jp/dictionarydiagram.json +++ b/data/language/ja_jp/dictionarydiagram.json @@ -298,7 +298,7 @@ "DictionaryDiagram.40050104.1": "契約", "DictionaryDiagram.40050104.2": "ゲームプレイ中にいずれかの契約を選択して署名する必要があります。\u000b契約の内容を達成できればバフを獲得できますが、3回達成に失敗するとその時点でゲーム終了となります。", "DictionaryDiagram.40050105.1": "超越の鏡", - "DictionaryDiagram.40050105.2": "超越の鏡では、各難易度への挑戦が終了するたび、獲得したチップはすべてリセットされます。\u000b新たな難易度に進む時は、助手を雇用して初期コインを獲得し、開始資金を用意する必要があります。", + "DictionaryDiagram.40050105.2": "超越の鏡では、各難易度への挑戦が終了するたびに、獲得済みのチップがすべてリセットされます。\u000b新たな難易度に進む時は、雇用したサポーターから初期資金を用意してもらう必要があります。", "DictionaryDiagram.40060101.1": "フライングシャロ-遊び方", "DictionaryDiagram.40060101.2": "フライングシャロでは、コーラ砲台を操作してシャロを飛ばし、カゴに入れていきます。\r\nコーラ砲台を長押ししたまま、飛ばしたい方向と逆向きにドラッグすると、発射の速度と角度を調整できます。\r\n発射される軌道を確認して、ちょうどいいと思ったところで指を離し、シャロを発射しましょう。", "DictionaryDiagram.40060102.1": "フライングシャロ-買い物カゴ", diff --git a/data/language/ja_jp/jointdrillaffix.json b/data/language/ja_jp/jointdrillaffix.json index e638b3d63..62d2b3600 100644 --- a/data/language/ja_jp/jointdrillaffix.json +++ b/data/language/ja_jp/jointdrillaffix.json @@ -34,19 +34,19 @@ "JointDrillAffix.10017.1": "踏砕・波状攻撃", "JointDrillAffix.10017.2": "迫撃砲のコマは放物線状の砲弾で攻撃するようになる。ナイトのコマは自身の周囲にあるすべてのナイトの移動先マスを取得し、敵に最も近いマスを選択してジャンプ攻撃を行う。", "JointDrillAffix.10031.1": "高貴・めぐる舞台", - "JointDrillAffix.10031.2": "第1段階ではコペリウスが戦闘に参加し、オリンピアは定期的にフィールドの端へ近づいてコペリウスを援護し、範囲攻撃スキルを発動する。\n第2段階ではコペリウスが退場し、オリンピアとの一騎打ちとなる。", - "JointDrillAffix.10032.1": "高貴・秘能の導き", - "JointDrillAffix.10032.2": "「術師傀儡」はエネルギー光線を生成し、首領にエネルギーを注入する。一定時間のチャージに成功すると、首領は「エネルギーバリア」を獲得する。\n主力巡遊者がエネルギー光線を遮ると、首領へのエネルギー注入を妨害でき、その間、強化効果を獲得する。\n味方が「術師傀儡」を撃破すると、一定時間、強化効果を獲得する。", - "JointDrillAffix.10033.1": "高貴・漂う秘能核", - "JointDrillAffix.10033.2": "オリンピアはフィールドを移動するエネルギーコアを吸収しようとする。吸収後、即座にエネルギーコアを爆発させ、範囲ダメージを与える。一定数のエネルギーコアの吸収に成功すると、首領は「エネルギーバリア」を獲得する。\n主力巡遊者がエネルギーコアに触れると、これを吸収し、一定時間、強化効果を獲得する。", + "JointDrillAffix.10031.2": "第1段階ではコペリウスとの戦闘を行い、オリンピアは定期的にフィールドの端からコペリウスを援護し、範囲攻撃スキルを発動する。\n第2段階ではコペリウスが退場し、オリンピアとの直接対決となる。", + "JointDrillAffix.10032.1": "高貴・秘術の導き", + "JointDrillAffix.10032.2": "「術士傀儡」は光線を生成し、首領にエネルギーチャージを行おうとする。一定時間のチャージに成功すると、首領はエネルギーバリアを獲得する。エネルギーバリア：首領の被ダメージが軽減される。\n主力巡遊者が光線を遮ると、エネルギーバリアの数を徐々に解除できる。さらにエネルギーチャージを遮っている間、チーム全体はダメージ増加効果を獲得する。\n味方が「術士傀儡」を撃破すると、チーム全体は、一定時間ダメージ増加効果を獲得する。", + "JointDrillAffix.10033.1": "高貴・浮遊エネルギー", + "JointDrillAffix.10033.2": "オリンピアはフィールド上を移動する浮遊エネルギーを吸収しようとする。吸収すると、浮遊エネルギーを即座に爆発させ、範囲ダメージを与える。一定数の浮遊エネルギーを吸収すると、首領はエネルギーバリアを獲得する。エネルギーバリア：首領の被ダメージが軽減される。\n主力巡遊者が浮遊エネルギーに触れると、これを吸収し、首領のエネルギーバリアを1解除でき、さらにチーム全体は、一定時間ダメージ増加効果を獲得する。", "JointDrillAffix.10034.1": "高貴・護りの傀儡", - "JointDrillAffix.10034.2": "「近衛傀儡」は首領の指令に従って敵へ攻撃を行う。「近衛傀儡」は攻撃対象にできない。", - "JointDrillAffix.10035.1": "高貴・秘能の崩壊", - "JointDrillAffix.10035.2": "オリンピアはフィールドの周囲にダメージエリアを生成し、複数回のエネルギー崩壊を発動して主力巡遊者を特定の方向へ吹き飛ばす。", + "JointDrillAffix.10034.2": "「近衛傀儡」は首領の指令に従い、敵に攻撃を行う。「近衛傀儡」は攻撃対象にできない。", + "JointDrillAffix.10035.1": "高貴・秘術の崩壊", + "JointDrillAffix.10035.2": "オリンピアはフィールドにダメージエリアを生成した上で、複数回のエネルギー崩壊を発動して主力巡遊者を特定の方向へ吹き飛ばす。", "JointDrillAffix.10036.1": "高貴・傀儡剣舞", - "JointDrillAffix.10036.2": "「近衛傀儡」の戦闘能力が強化され、旋風斬を発動して持続ダメージを与える。", - "JointDrillAffix.10037.1": "高貴・秘能の昂り", + "JointDrillAffix.10036.2": "「近衛傀儡」の戦闘能力が強化され、旋風斬を使用し持続的にダメージを与える。", + "JointDrillAffix.10037.1": "高貴・秘術の昂り", "JointDrillAffix.10037.2": "オリンピアはフィールド内にあるエネルギーを継続的に吸収して自身をチャージし、エネルギーを増加させ続ける。", - "JointDrillAffix.10038.1": "高貴・秘能結界", - "JointDrillAffix.10038.2": "オリンピアは一定量のエネルギーを獲得すると、自身またはコペリウスに「エネルギーシールド」を1付与する。" + "JointDrillAffix.10038.1": "高貴・秘術結界", + "JointDrillAffix.10038.2": "オリンピアが一定のエネルギーを獲得すると、自身またはコペリウスにエネルギーバリアを1付与する。\nエネルギーバリア：首領の被ダメージが軽減される。" } \ No newline at end of file diff --git a/data/language/ja_jp/potential.json b/data/language/ja_jp/potential.json index 1ff828997..908125560 100644 --- a/data/language/ja_jp/potential.json +++ b/data/language/ja_jp/potential.json @@ -1362,7 +1362,7 @@ "Potential.513721.1": "支援スキルの&Param1&が上昇する。支援スキルで発生する爆発回数が増加する。", "Potential.513721.2": "支援スキルの叩きつけ爆発による&Param1&が&Param2&上昇する。支援スキルでジャンプして叩きつけるたびに、発生する爆発回数が前回より1回増加する。支援スキル終了時、この効果は解除される。", "Potential.513722.1": "支援スキルの&Param3&が増加する。支援スキルのダメージ範囲が拡大され、&Param1&が増加する。", - "Potential.513722.2": "支援スキルの叩きつけによる爆発の&Param3&が&Param4&増加する。\u000bチーム内にサポート巡遊者が1名のみ存在する場合、支援スキルで叩きつけを行うたびに、今回の叩きつけによる爆発のダメージ範囲が拡大される。叩きつけによる爆発が発生するたびに、以降の叩きつけによる爆発が与える&Param1&が&Param2&増加する。この効果は9回まで重複できる。", + "Potential.513722.2": "支援スキルの叩きつけによる爆発の&Param3&が&Param4&増加する。\u000bチーム内にサポーター巡遊者が1名のみ存在する場合、支援スキルで叩きつけを行うたびに、今回の叩きつけによる爆発のダメージ範囲が拡大される。叩きつけによる爆発が発生するたびに、以降の叩きつけによる爆発が与える&Param1&が&Param2&増加する。この効果は9回まで重複できる。", "Potential.513723.1": "##フラワードローン#4050#の&Param5&が上昇する。##フラワードローン#4050#を生成するたびに、フィールド上に存在する##フラワードローン#4050#の持続時間が延長される。支援スキルにより##フラワードローン#4050#が与える&Param1&が増加する。", "Potential.513723.2": "##フラワードローン#4050#の&Param5&が&Param6&上昇する。##フラワードローン#4050#を生成するたびに、フィールド上に存在する##フラワードローン#4050#の持続時間が延長される。支援スキルでジャンプして叩きつけるたびに、&Param3&秒間、##フラワードローン#4050#が与える&Param1&が&Param2&増加する。この効果は&Param4&回まで重複できる。", "Potential.513724.1": "##フラワードローン#4050#は追加で範囲内に風属性の通常攻撃ダメージを与える。フィールド上の##フラワードローン#4050#1体につき、すべての##フラワードローン#4050#の&Param2&が上昇する。", diff --git a/data/language/ja_jp/uitext.json b/data/language/ja_jp/uitext.json index cea92c14b..53c05f1a2 100644 --- a/data/language/ja_jp/uitext.json +++ b/data/language/ja_jp/uitext.json @@ -1839,7 +1839,7 @@ "UIText.Item_Reengagement_DoubleDrop.1": "ボーナス", "UIText.JP_CV.1": "CV：", "UIText.JointDrill_AVG_Title.1": "ストーリー情報", - "UIText.JointDrill_Act_Challenge_End.1": "*****", + "UIText.JointDrill_Act_Challenge_End.1": "挑戦が終了しました", "UIText.JointDrill_Act_Detail.1": "イベント詳細", "UIText.JointDrill_Act_End_Tip.1": "イベントが終了しました", "UIText.JointDrill_Act_Goto.1": "進む", @@ -2340,8 +2340,8 @@ "UIText.PenguinCard_BuffDescSuffix_Count.1": "\u000b（残り{num_0}回）", "UIText.PenguinCard_BuffDescSuffix_Round.1": "\u000b（残り{num_0}ラウンド）", "UIText.PenguinCard_BuffDescSuffix_Turn.1": "\u000b（残り{num_0}ターン）", - "UIText.PenguinCard_CardLevel.1": "Lv{num_0}", - "UIText.PenguinCard_CardLevelMax.1": "Lv{num_0}\nMAX!", + "UIText.PenguinCard_CardLevel.1": "Lv.{num_0}", + "UIText.PenguinCard_CardLevelMax.1": "Lv.{num_0}\nMAX!", "UIText.PenguinCard_CheckRound_RoundFail.1": "各ラウンドにつき、カードを1回まで配りなおしできます", "UIText.PenguinCard_CheckRound_TurnFail.1": "このラウンドの配りなおし回数は上限に達しています", "UIText.PenguinCard_EndTurnTip.1": "ターン終了をタップしてください", @@ -2419,7 +2419,7 @@ "UIText.PenguinCard_Start_Title.1": "目標", "UIText.PenguinCard_Start_Turn.1": "{num_0}ターン以内に達成する", "UIText.PenguinCard_Tip_NoneQuest.1": "現在契約は締結されていません", - "UIText.PenguinCard_Tip_NotSelectedAide.1": "まだ雇用していないサポーターがいます。\n雇用をスキップしますか？", + "UIText.PenguinCard_Tip_NotSelectedAide.1": "まだ雇用していないサポーターがいます。\nスキップしますか？", "UIText.PenguinCard_Tip_NotSelectedPenguinCard.1": "シャロットカードが未選択です。\nスキップしますか？", "UIText.PenguinCard_Tip_RetryLimit.1": "再挑戦回数を使い切りました", "UIText.PenguinCard_Title_HandRank.1": "役一覧", diff --git a/data/language/ko_kr/characterarchivebaseinfo.json b/data/language/ko_kr/characterarchivebaseinfo.json index 2ced79deb..8454ef09b 100644 --- a/data/language/ko_kr/characterarchivebaseinfo.json +++ b/data/language/ko_kr/characterarchivebaseinfo.json @@ -387,7 +387,7 @@ "CharacterArchiveBaseInfo.13707.1": "무기", "CharacterArchiveBaseInfo.13707.2": "만물창고", "CharacterArchiveBaseInfo.13708.1": "급여", - "CharacterArchiveBaseInfo.13708.2": "흥미롱운 의뢰는 급여를 받지 않음", + "CharacterArchiveBaseInfo.13708.2": "흥미로운 의뢰는 급여를 받지 않음", "CharacterArchiveBaseInfo.14001.1": "이름", "CharacterArchiveBaseInfo.14001.2": "스파클", "CharacterArchiveBaseInfo.14002.1": "생일", diff --git a/data/language/ko_kr/jointdrillaffix.json b/data/language/ko_kr/jointdrillaffix.json index d34bbb017..d00e232fc 100644 --- a/data/language/ko_kr/jointdrillaffix.json +++ b/data/language/ko_kr/jointdrillaffix.json @@ -34,13 +34,13 @@ "JointDrillAffix.10017.1": "공세 전환·호광", "JointDrillAffix.10017.2": "말·캐논이 포물선 포탄으로 목표를 공격한다. 말·나이트가 자신 주변 모든 날일자 대각선의 타일을 획득하며, 목표에 가장 가까운 타일을 선택하여 도약하며 내리밟기 공격을 진행한다.", "JointDrillAffix.10031.1": "만물의 순환", - "JointDrillAffix.10031.2": "1페이즈에서는 코펠리우스가 필드에서 전투하며, 올림피아가 주기적으로 필드 끝에 다가가 코펠리우스를 지원하여 범위 공격 스킬을 시전한다.\n2페이즈에서는 코펠리우스가 퇴장하여 올림피아를 단독으로 상대하게 됩니다.", + "JointDrillAffix.10031.2": "1페이즈에서는 코펠리우스가 필드에서 전투하며, 올림피아가 주기적으로 필드 끝에 다가가 코펠리우스를 지원하여 범위 공격 스킬을 시전한다.\n2페이즈에서는 코펠리우스가 퇴장하여 올림피아를 단독으로 상대하게 된다.", "JointDrillAffix.10032.1": "비술 에너지 차단", - "JointDrillAffix.10032.2": "「술사 꼭두각시」가 비술 에너지 빔을 생성하여 보스 적에게 비술 에너지를 주입한다. 일정 시간 동안 비술 에너지를 성공적으로 주입하면 보스 적이 비술 에너지 보호막을 획득한다.\n메인 캐릭터가 비술 에너지 빔을 막아내면 보스 적의 비술 에너지 획득을 방해할 수 있으며, 해당 기간 동안 버프를 획득한다.\n전체 아군이 「술사 꼭두각시」를 제거하면 일정 기간 동안 버프 효과를 획득한다.", + "JointDrillAffix.10032.2": "「술사 꼭두각시」가 비술 에너지 빔을 생성하여 보스 목표에게 비술 에너지를 주입한다. 일정 시간 동안 비술 에너지를 성공적으로 주입하면 보스 목표가 「비술 에너지 보호막」을 획득한다. 「비술 에너지 보호막」은 보스 목표가 받는 피해를 감소시킨다.\n메인 캐릭터가 비술 에너지 빔을 막아내면 보스 목표의 비술 에너지 획득을 방해할 수 있으며, 보스 목표의 「비술 에너지 보호막」을 점차 제거할 수 있다. 비술 에너지 빔을 막는 기간 동안 팀 전체가 입히는 피해가 증가한다.\n전체 아군이 「술사 꼭두각시」를 제거하면 일정 기간 동안 팀 전체가 입히는 피해가 증가한다.", "JointDrillAffix.10033.1": "부유 에너지 핵", - "JointDrillAffix.10033.2": "올림피아는 필드에서 움직이는 부유 에너지 핵을 흡수하려고 하며, 흡수 후 즉시 부유 에너지 핵을 폭발시켜 범위 피해를 입힌다. 일정 수량의 부유 에너지 핵을 흡수하면 보스 적이 「비술 에너지 보호막」을 획득한다.\n메인 캐릭터가 부유 에너지 핵에 닿으면 흡수하고 일정 기간 동안 버프 효과를 획득한다.", + "JointDrillAffix.10033.2": "올림피아는 필드에서 움직이는 부유 에너지 핵을 흡수하려고 하며, 흡수 후 즉시 부유 에너지 핵을 폭발시켜 범위 피해를 입힌다. 일정 수량의 부유 에너지 핵을 흡수하면 보스 목표가 「비술 에너지 보호막」을 획득한다. 「비술 에너지 보호막」은 보스 복표가 받는 피해를 감소시킨다.\n메인 캐릭터가 부유 에너지 핵에 닿으면 흡수하고, 보스 목표의 「비술 에너지 보호막」을 1스택 제거하며 일정 기간 동안 팀 전체가 입히는 피해가 증가한다.", "JointDrillAffix.10034.1": "근위병 꼭두각시", - "JointDrillAffix.10034.2": "「근위병 꼭두각시」는 보스 적의 지령에 따라 목표를 공격하며, 피격될 수 없다.", + "JointDrillAffix.10034.2": "「근위병 꼭두각시」는 보스 목표의 지령에 따라 목표를 공격하며, 피격될 수 없다.", "JointDrillAffix.10035.1": "비술 에너지 붕괴", "JointDrillAffix.10035.2": "올림피아가 필드 사방에 피해 구역을 생성하며, 여러 차례 비술 에너지 붕괴를 시전하여 메인 캐릭터를 특정 방향으로 넉백시킨다.", "JointDrillAffix.10036.1": "꼭두각시의 검무", @@ -48,5 +48,5 @@ "JointDrillAffix.10037.1": "비술 에너지 확장", "JointDrillAffix.10037.2": "올림피아가 필드의 부유 비술 에너지를 지속적으로 흡수하여, 자신의 비술 에너지를 지속적으로 확장시킨다.", "JointDrillAffix.10038.1": "비술 에너지 보호막", - "JointDrillAffix.10038.2": "올림피아가 일정량의 비술 에너지를 획득한 후 자신 혹은 코펠리우스에게 비술 에너지 보호막 1스택을 제공한다." + "JointDrillAffix.10038.2": "올림피아가 일정량의 비술 에너지를 획득한 후 자신 혹은 코펠리우스에게 「비술 에너지 보호막」 1스택을 제공한다. 「비술 에너지 보호막」은 보스 복표가 받는 피해를 감소시킨다." } \ No newline at end of file diff --git a/data/language/ko_kr/jointdrillcontrol.json b/data/language/ko_kr/jointdrillcontrol.json index dbf9c0bb7..673e7997b 100644 --- a/data/language/ko_kr/jointdrillcontrol.json +++ b/data/language/ko_kr/jointdrillcontrol.json @@ -11,6 +11,6 @@ "JointDrillControl.510005.3": "종언의 노래 이벤트 기간 중 매일 3번의 도전 기회가 주어지며, 이미 오픈된 난이도 중 선택해 도전합니다. 또 해당 전투 결과에 따라 코인과 랭킹 포인트를 획득할 수 있습니다.\r\n\u000b도전은 일정 기간 동안 지속되며, 이 기간 내에 여러 작전팀을 파견해 여러 라운드 전투를 진행할 수 있지만, 각 작전팀 내 여행가는 중복하여 출전할 수 없습니다.\r\n\u000b전투 승리 시 도전 난이도와 전투 시간에 따라 포인트를 획득합니다. 시간이 소진되거나 전투 횟수가 소진되어도 정산하여 일정 포인트를 획득할 수 있습니다.\r\n\u000b각 이벤트마다 포인트를 누적해 임무 보상을 받을 수 있습니다.", "JointDrillControl.510006.2": "전차는 대지를 짓밟고, 중생의 파멸을 찬양하는 개선가를 부른다. \u000b그녀는 수없이 많은 전쟁을 재현했지만, 오직 광기만이 영원히 변치 않음을 증명한다.", "JointDrillControl.510006.3": "종언의 노래 이벤트 기간 중 매일 3번의 도전 기회가 주어지며, 이미 오픈된 난이도 중 선택해 도전합니다. 또 해당 전투 결과에 따라 코인과 랭킹 포인트를 획득할 수 있습니다.\r\n\u000b도전은 일정 기간 동안 지속되며, 이 기간 내에 여러 작전팀을 파견해 여러 라운드 전투를 진행할 수 있지만, 각 작전팀 내 여행가는 중복하여 출전할 수 없습니다.\r\n\u000b전투 승리 시 도전 난이도와 전투 시간에 따라 포인트를 획득합니다. 시간이 소진되거나 전투 횟수가 소진되어도 정산하여 일정 포인트를 획득할 수 있습니다.\r\n\u000b각 이벤트마다 포인트를 누적해 임무 보상을 받을 수 있습니다.", - "JointDrillControl.510007.2": "영혼과 몸, 모두 그녀에게 복종하라……\u000b위대한 올림피아에게 복종하라.", + "JointDrillControl.510007.2": "영혼과 육신을 바쳐라……\u000b위대한 올림피아에게 복종하라.", "JointDrillControl.510007.3": "종언의 노래 이벤트 기간 중 매일 3번의 도전 기회가 주어지며, 이미 오픈된 난이도 중 선택해 도전합니다. 또 해당 전투 결과에 따라 코인과 랭킹 포인트를 획득할 수 있습니다.\r\n\u000b도전은 일정 기간 동안 지속되며, 이 기간 내에 여러 작전팀을 파견해 여러 라운드 전투를 진행할 수 있지만, 각 작전팀 내 여행가는 중복하여 출전할 수 없습니다.\r\n\u000b전투 승리 시 도전 난이도와 전투 시간에 따라 포인트를 획득합니다. 시간이 소진되거나 전투 횟수가 소진되어도 정산하여 일정 포인트를 획득할 수 있습니다.\r\n\u000b각 이벤트마다 포인트를 누적해 임무 보상을 받을 수 있습니다." } \ No newline at end of file diff --git a/data/language/ko_kr/uitext.json b/data/language/ko_kr/uitext.json index 834ec6a8d..5c786f77e 100644 --- a/data/language/ko_kr/uitext.json +++ b/data/language/ko_kr/uitext.json @@ -1839,7 +1839,7 @@ "UIText.Item_Reengagement_DoubleDrop.1": "추가 보상", "UIText.JP_CV.1": "일본어 더빙:", "UIText.JointDrill_AVG_Title.1": "스토리 정보", - "UIText.JointDrill_Act_Challenge_End.1": "*****", + "UIText.JointDrill_Act_Challenge_End.1": "도전 종료", "UIText.JointDrill_Act_Detail.1": "이벤트 정보", "UIText.JointDrill_Act_End_Tip.1": "이벤트 만료", "UIText.JointDrill_Act_Goto.1": "즉시 이동", diff --git a/data/language/zh_cn/jointdrillaffix.json b/data/language/zh_cn/jointdrillaffix.json index b7f21401f..a4015fe93 100644 --- a/data/language/zh_cn/jointdrillaffix.json +++ b/data/language/zh_cn/jointdrillaffix.json @@ -36,11 +36,11 @@ "JointDrillAffix.10031.1": "造物轮替", "JointDrillAffix.10031.2": "一阶段时科佩里乌斯在场战斗，奥林匹娅会周期性靠近场地边缘支援科佩里乌斯并发动范围攻击技能。\n二阶段时，科佩里乌斯退场，玩家将单独面对奥林匹娅", "JointDrillAffix.10032.1": "秘能截流", - "JointDrillAffix.10032.2": "「术士傀儡」生成秘能光束向首领敌人注入秘能，累计成功充能一定时长首领敌人将获得秘能壁垒\n主控角色阻挡秘能光束可以妨碍首领敌人获得秘能，并在此期间获得增益效果\n己方清除「术士傀儡」，会获得一段时间的增益效果", + "JointDrillAffix.10032.2": "「术士傀儡」生成秘能光束向首领目标注入秘能，累计成功充能一定时长首领目标将获得「秘能壁垒」，「秘能壁垒」会降低首领目标受到的伤害\n主控角色阻挡秘能光束可以妨碍首领目标获得秘能并逐渐移除首领目标的「秘能壁垒」层数，阻挡秘能光束期间提升全队造成的伤害\n己方清除「术士傀儡」，一段时间内提升全队造成的伤害", "JointDrillAffix.10033.1": "游离能核", - "JointDrillAffix.10033.2": "奥林匹娅会尝试吸收场上移动的游离能核，吸收后会立即引爆游离能核并造成范围伤害，成功吸收一定数量的游离能核，首领敌人将获得「秘能壁垒」\n主控角色触碰游离能核会将其吸收，并获得一段时间的增益效果", + "JointDrillAffix.10033.2": "奥林匹娅会尝试吸收场上移动的游离能核，吸收后会立即引爆游离能核并造成范围伤害，成功吸收一定数量的游离能核，首领目标将获得「秘能壁垒」，「秘能壁垒」会降低首领目标受到的伤害\n主控角色触碰游离能核会将其吸收，移除首领目标一层「秘能壁垒」并在一段时间内提升全队造成的伤害", "JointDrillAffix.10034.1": "禁卫傀儡", - "JointDrillAffix.10034.2": "「禁卫傀儡」将遵从首领敌人的指令对目标发起进攻，「禁卫傀儡」无法被攻击", + "JointDrillAffix.10034.2": "「禁卫傀儡」将遵从首领目标的指令对目标发起进攻，「禁卫傀儡」无法被攻击", "JointDrillAffix.10035.1": "秘能崩解", "JointDrillAffix.10035.2": "奥林匹娅在场地四周生成伤害性区域，并施放多次秘能崩解将主控角色按特定方向击退", "JointDrillAffix.10036.1": "傀儡刃舞", @@ -48,5 +48,5 @@ "JointDrillAffix.10037.1": "秘能滋长", "JointDrillAffix.10037.2": "奥林匹娅持续吸收场内游离的秘能给自身进行充能，使自身的秘能持续增长", "JointDrillAffix.10038.1": "秘能壁垒", - "JointDrillAffix.10038.2": "奥林匹娅在获得一定量的秘能后会为自身或科佩里乌斯提供一层秘能壁垒" + "JointDrillAffix.10038.2": "奥林匹娅在获得一定量的秘能后会为自身或科佩里乌斯提供一层「秘能壁垒」，「秘能壁垒」会降低首领目标受到的伤害" } \ No newline at end of file diff --git a/lua/game/ui/avg/_cn/config/stsp_13_02.lua b/lua/game/ui/avg/_cn/config/stsp_13_02.lua index 1525f49cc..0e1eb392f 100644 --- a/lua/game/ui/avg/_cn/config/stsp_13_02.lua +++ b/lua/game/ui/avg/_cn/config/stsp_13_02.lua @@ -2857,7 +2857,7 @@ return { param = { 9, "avg1_137", - "是很重啦，一开始确实挺辛苦的，但不知不就就习惯了，毕竟我平时都是带着这只箱子接委托的嘛。", + "是很重啦，一开始确实挺辛苦的，但不知不觉就习惯了，毕竟我平时都是带着这只箱子接委托的嘛。", 0, "", false, @@ -6600,7 +6600,7 @@ return { param = { 0, "可疑的旅人", - "臭丫头，废了这么大功夫才抓到！", + "臭丫头，费了这么大功夫才抓到！", 0, "", false, diff --git a/lua/game/ui/avg/_en/config/stev_12_02.lua b/lua/game/ui/avg/_en/config/stev_12_02.lua index 5d9b8713e..b8be3467f 100644 --- a/lua/game/ui/avg/_en/config/stev_12_02.lua +++ b/lua/game/ui/avg/_en/config/stev_12_02.lua @@ -6757,7 +6757,7 @@ return { "", false, "", - "Why?!", + "Eh?!", "" } }, @@ -7799,7 +7799,7 @@ return { "", false, "", - "I am!", + "I did!", "" } }, diff --git a/lua/game/ui/avg/_en/config/stev_12_03.lua b/lua/game/ui/avg/_en/config/stev_12_03.lua index 0e87e39d7..520bdb40c 100644 --- a/lua/game/ui/avg/_en/config/stev_12_03.lua +++ b/lua/game/ui/avg/_en/config/stev_12_03.lua @@ -4007,7 +4007,7 @@ return { "", false, "", - "Good. I've got a commission perfect for a beginner. Standard monster subjugation. Want to take it?", + "Good. I've got a commission perfect for a beginner. Want to take it?", "" } }, @@ -9608,7 +9608,7 @@ return { "", false, "", - "Thanks to you, now we have even more explanations to do.", + "Thanks to you, now we have even more explaining to do.", "" } }, diff --git a/lua/game/ui/avg/_en/config/stsp_17_02.lua b/lua/game/ui/avg/_en/config/stsp_17_02.lua index f36722f55..db80ccbf0 100644 --- a/lua/game/ui/avg/_en/config/stsp_17_02.lua +++ b/lua/game/ui/avg/_en/config/stsp_17_02.lua @@ -3708,7 +3708,7 @@ return { "", false, "", - "Heheh, hot like me. I drive Iris crazy all the time.==W== Good thing she's so forgiving and always lets me off the hook.", + "Heheh, not like me. I drive Iris crazy all the time.==W== Good thing she's so forgiving and always lets me off the hook.", "" } }, diff --git a/lua/game/ui/avg/_en/config/stsp_17_03.lua b/lua/game/ui/avg/_en/config/stsp_17_03.lua index ecf401051..db852ef52 100644 --- a/lua/game/ui/avg/_en/config/stsp_17_03.lua +++ b/lua/game/ui/avg/_en/config/stsp_17_03.lua @@ -2696,7 +2696,7 @@ return { nil, nil, 0.9, - "avg3_138", + "avg2_984", "a", "002", "none", @@ -2715,7 +2715,7 @@ return { { cmd = "CtrlChar", param = { - "avg3_138", + "avg2_984", "a", "006", "avg_emoji_attention", @@ -2784,7 +2784,7 @@ return { nil, nil, nil, - "avg3_138", + "avg2_984", "a", "002", "none", diff --git a/lua/game/ui/avg/_en/preset/avguitext.lua b/lua/game/ui/avg/_en/preset/avguitext.lua index 3764f93e6..72a3da5ed 100644 --- a/lua/game/ui/avg/_en/preset/avguitext.lua +++ b/lua/game/ui/avg/_en/preset/avguitext.lua @@ -6,8 +6,10 @@ return { AVG_ImportantChoice_Choosed = "Selected", AVG_ImportantChoice_Disable = "Selected", AVG_ImportantChoice_Match = "This branch corresponds to...", - AVG_ImportantChoice_UnknownDesc = "Did you miss something?", - AVG_ImportantChoice_UnknownTitle = "Unknown Lead", + AVG_ImportantChoice_NewChoiceTips1 = "A new choice has appeared.", + AVG_ImportantChoice_NewChoiceTips2 = "The Final Path", + AVG_ImportantChoice_UnknownDesc = "If we had more information...", + AVG_ImportantChoice_UnknownTitle = "The Unknown Path", AVG_Log_Choice_Title = "%s has selected", AVG_Log_Thought_Title = "%s thinks...", AVG_Log_Title = "Records", diff --git a/lua/game/ui/avg/_jp/config/cg_126_03.lua b/lua/game/ui/avg/_jp/config/cg_126_03.lua index 0ffd7ac8b..5d546fa42 100644 --- a/lua/game/ui/avg/_jp/config/cg_126_03.lua +++ b/lua/game/ui/avg/_jp/config/cg_126_03.lua @@ -2839,7 +2839,7 @@ return { "", false, "", - "それからというもの……あっという間に時間は過ぎていった。==RT==想像を越えた、ありのままのフローラに翻弄されながらも、==RT==少しずつではあるが、着実に自立へと近づいていた。", + "それからというもの……あっという間に時間は過ぎていった。==RT==想像を超えた、ありのままのフローラに翻弄されながらも、==RT==少しずつではあるが、着実に自立へと近づいていた。", "" } }, @@ -3430,7 +3430,7 @@ return { "", false, "", - "（夜どおし今日のショーの準備をしていたのだろう。==RT==部屋が散らかっているのは多めに見るべきだな）", + "（夜どおし今日のショーの準備をしていたのだろう。==RT==部屋が散らかっているのは大目に見るべきだな）", "" } }, diff --git a/lua/game/ui/avg/_jp/config/stm03_04.lua b/lua/game/ui/avg/_jp/config/stm03_04.lua index 308d9782e..4f0f1dc42 100644 --- a/lua/game/ui/avg/_jp/config/stm03_04.lua +++ b/lua/game/ui/avg/_jp/config/stm03_04.lua @@ -4299,7 +4299,7 @@ return { "", false, "", - "だた、ナーちゃんが言ったように、3体の魔物はすごく強くて、==RT==寄せ集めのチームじゃなにもできなかったわ。", + "ただ、ナーちゃんが言ったように、3体の魔物はすごく強くて、==RT==寄せ集めのチームじゃなにもできなかったわ。", "" } }, diff --git a/lua/game/ui/avg/_jp/preset/avgcharacter.lua b/lua/game/ui/avg/_jp/preset/avgcharacter.lua index a63b14c6a..933fd527b 100644 --- a/lua/game/ui/avg/_jp/preset/avgcharacter.lua +++ b/lua/game/ui/avg/_jp/preset/avgcharacter.lua @@ -3116,6 +3116,20 @@ return { reuse = "avg2_940", ver = "2.2.0" }, + { + id = "avg3_1325", + name = "***", + name_bg_color = "#0ABEC5", + reuse = "avg3_219", + ver = "1.16.0" + }, + { + id = "avg3_1326", + name = "***", + name_bg_color = "#0ABEC5", + reuse = "avg3_219", + ver = "1.16.0" + }, { id = "avg4_100", name = "菈露发光", diff --git a/lua/game/ui/avg/_jp/preset/avgcontacts.lua b/lua/game/ui/avg/_jp/preset/avgcontacts.lua index 92507e677..c465ee3e1 100644 --- a/lua/game/ui/avg/_jp/preset/avgcontacts.lua +++ b/lua/game/ui/avg/_jp/preset/avgcontacts.lua @@ -183,6 +183,14 @@ return { landmark = "フィーリエ-メイスト通り10号", signature = "休養中、復職時期は未定" }, + { + id = 139, + icon = "Icon/Head/head_13901_S", + name = "***", + landmark = "ミラーシュ ヒナギクの家", + signature = "従業員は募集していません", + ver = "1.16.0" + }, { id = 140, icon = "Icon/Head/head_14001_S", diff --git a/lua/game/ui/avg/_kr/config/stm03_01.lua b/lua/game/ui/avg/_kr/config/stm03_01.lua index 9363e0cdc..06c2f8e69 100644 --- a/lua/game/ui/avg/_kr/config/stm03_01.lua +++ b/lua/game/ui/avg/_kr/config/stm03_01.lua @@ -9359,7 +9359,7 @@ return { "", false, "", - "하지만 내가 하고 싶은 건 별사냥이야. 마물 토벌에는 별로 흥미가 없어서.", + "물론 난 마물 퇴치 보다는, ‘별사냥’을 훨씬 더 하고 싶지만!", "" } }, @@ -9430,7 +9430,7 @@ return { "", false, "", - "응! 별의 탑 안에 숨겨진 최종 마왕급 성해를 쓰러뜨리고, 그 성해가 지키던 소원의 별을 찾으면…… 어떤 소원이든 이룰 수 있댔어.", + "응! 나도 사람들한테서 들은 거지만, 별의 탑 안에 있는 최종 보스급 성해를 쓰러뜨리고, 그 성해가 지키는 ‘소원의 별’이란 걸 찾으면, 어떤 소원이든 이뤄진다 하더라고♪", "" } }, diff --git a/lua/game/ui/friendex/friendaddstrangerctrl.lua b/lua/game/ui/friendex/friendaddstrangerctrl.lua index 77000cf6a..983753a5a 100644 --- a/lua/game/ui/friendex/friendaddstrangerctrl.lua +++ b/lua/game/ui/friendex/friendaddstrangerctrl.lua @@ -128,9 +128,6 @@ function FriendAddStrangerCtrl:OnBtnClick_Confirm() EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("FRIEND_00")) return end - if self.bClickAgain == true then - PlayerData.Friend:SetAddStrangerWarning(false) - end local callback = function() EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("FRIEND_01")) self:OnBtnClick_Close() @@ -149,5 +146,6 @@ end function FriendAddStrangerCtrl:OnBtnClick_Again() self.bClickAgain = not self.bClickAgain self._mapNode.againSelect:SetActive(self.bClickAgain) + PlayerData.Friend:SetAddStrangerWarning(not self.bClickAgain) end return FriendAddStrangerCtrl diff --git a/lua/gamecore/data/dataclass/activity/cookieactdata.lua b/lua/gamecore/data/dataclass/activity/cookieactdata.lua index 889c88b45..e49b655a0 100644 --- a/lua/gamecore/data/dataclass/activity/cookieactdata.lua +++ b/lua/gamecore/data/dataclass/activity/cookieactdata.lua @@ -29,6 +29,8 @@ function CookieActData:Init() self.tbModeExcellent = {} self.tbModeCookie = {} self:AddListeners() + self.tbLevelDataList = {} + self.tbQuestDataList = {} end function CookieActData:AddListeners() EventManager.Add("Cookie_Game_Complete", self, self.OnEvent_GameComplete) @@ -87,7 +89,7 @@ function CookieActData:GetLevelData() end function CookieActData:GetLevelDataById(nId) local levelData - for _, v in pairs(self.tbLevelDataList) do + for _, v in pairs(self.tbLevelDataList or {}) do if v.nId == nId then levelData = v break diff --git a/versions.txt b/versions.txt index b7b630975..a595eca88 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ -EN: 1.15.0.134 -CN: 1.15.0.133 -JP: 1.15.0.137 -KR: 1.15.0.139 +EN: 1.15.1.137 +CN: 1.15.1.136 +JP: 1.15.1.140 +KR: 1.15.1.142