diff --git a/lua/app/config/chapter_dungeon_armor.lua b/lua/app/config/chapter_dungeon_armor.lua index bfce7411..1854a126 100644 --- a/lua/app/config/chapter_dungeon_armor.lua +++ b/lua/app/config/chapter_dungeon_armor.lua @@ -26,7 +26,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 4 }, ["star_task_reward"]={ { @@ -131,7 +131,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 4 }, ["star_task_reward"]={ { @@ -236,7 +236,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 4 }, ["star_task_reward"]={ { @@ -341,7 +341,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 4 }, ["star_task_reward"]={ { @@ -446,7 +446,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 4 }, ["star_task_reward"]={ { @@ -611,7 +611,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 4 }, ["star_task_reward"]={ { @@ -776,7 +776,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 5 }, ["star_task_reward"]={ { @@ -901,7 +901,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 5 }, ["star_task_reward"]={ { @@ -1026,7 +1026,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 5 }, ["star_task_reward"]={ { @@ -1151,7 +1151,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 5 }, ["star_task_reward"]={ { @@ -1276,7 +1276,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 5 }, ["star_task_reward"]={ { @@ -1489,7 +1489,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 5 }, ["star_task_reward"]={ { @@ -1702,7 +1702,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 6 }, ["star_task_reward"]={ { @@ -1847,7 +1847,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 6 }, ["star_task_reward"]={ { @@ -1992,7 +1992,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 6 }, ["star_task_reward"]={ { @@ -2137,7 +2137,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 6 }, ["star_task_reward"]={ { @@ -2282,7 +2282,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 2, - 1 + 6 }, ["star_task_reward"]={ { @@ -2543,7 +2543,7 @@ local chapter_dungeon_armor = { }, ["star_task"]={ 3, - 1 + 6 }, ["star_task_reward"]={ { diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 8cf92498..ec6a29d8 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1196,6 +1196,12 @@ local skill = { } } }, + ["condition_rel"]={ + { + 1, + 1 + } + }, ["combo_position"]=1, ["effect_type"]=2, ["trigger"]=6, diff --git a/lua/app/config/strings/cn/task_dungeon_armor.lua b/lua/app/config/strings/cn/task_dungeon_armor.lua index dc26280f..45ab6f49 100644 --- a/lua/app/config/strings/cn/task_dungeon_armor.lua +++ b/lua/app/config/strings/cn/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="通关时总回合数不大于30" + }, + [4]={ + ["desc"]="通关时总血量高于30%" + }, + [5]={ + ["desc"]="通关时总血量高于35%" + }, + [6]={ + ["desc"]="通关时总血量高于40%" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/task_dungeon_armor.lua b/lua/app/config/strings/de/task_dungeon_armor.lua index 3c80b63d..41b44b73 100644 --- a/lua/app/config/strings/de/task_dungeon_armor.lua +++ b/lua/app/config/strings/de/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/task_dungeon_armor.lua b/lua/app/config/strings/en/task_dungeon_armor.lua index 0acfcebc..e71fe33c 100644 --- a/lua/app/config/strings/en/task_dungeon_armor.lua +++ b/lua/app/config/strings/en/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="Spend less than 30 turns to clear the stage" + }, + [4]={ + ["desc"]="Total HP is above 30% when clearing the stage" + }, + [5]={ + ["desc"]="Total HP is above 35% when clearing the stage" + }, + [6]={ + ["desc"]="Total HP is above 40% when clearing the stage" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/task_dungeon_armor.lua b/lua/app/config/strings/es/task_dungeon_armor.lua index d8609f0d..a1acb3e5 100644 --- a/lua/app/config/strings/es/task_dungeon_armor.lua +++ b/lua/app/config/strings/es/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="Completar la fase en 30 rondas" + }, + [4]={ + ["desc"]="HP total superior a 30% al completar la fase" + }, + [5]={ + ["desc"]="HP total superior a 35% al completar la fase" + }, + [6]={ + ["desc"]="HP total superior a 40% al completar la fase" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/task_dungeon_armor.lua b/lua/app/config/strings/fr/task_dungeon_armor.lua index 3c80b63d..41b44b73 100644 --- a/lua/app/config/strings/fr/task_dungeon_armor.lua +++ b/lua/app/config/strings/fr/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index 870844f6..fa326f10 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -422,7 +422,7 @@ local localization_global = ["MOP_UP_DESC_3"] = "Mencukupi", ["DUNGEON_ARMOR_DESC_17"] = "Sisa level hari ini: {0}", ["NAVER_SETTING_DESC"] = "Naver", - ["EQUIP_DESC_26"] = "4 buah+{0}:", + ["EQUIP_DESC_26"] = "4 buah Armor +{0}:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/id/task_dungeon_armor.lua b/lua/app/config/strings/id/task_dungeon_armor.lua index 2c16e57c..b40aa071 100644 --- a/lua/app/config/strings/id/task_dungeon_armor.lua +++ b/lua/app/config/strings/id/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="Habiskan kurang dari 30 putaran untuk lolos stage." + }, + [4]={ + ["desc"]="Total HP lebih dari 30% saat lolos stage." + }, + [5]={ + ["desc"]="Total HP lebih dari 35% saat lolos stage." + }, + [6]={ + ["desc"]="Total HP lebih dari 40% saat lolos stage." } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/task_dungeon_armor.lua b/lua/app/config/strings/ja/task_dungeon_armor.lua index f6718816..e82706f1 100644 --- a/lua/app/config/strings/ja/task_dungeon_armor.lua +++ b/lua/app/config/strings/ja/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="クリア時のターン数が30以下" + }, + [4]={ + ["desc"]="クリア時のHPが30%以上" + }, + [5]={ + ["desc"]="クリア時のHPが35%以上" + }, + [6]={ + ["desc"]="クリア時のHPが40%以上" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/task_dungeon_armor.lua b/lua/app/config/strings/ko/task_dungeon_armor.lua index 2d5fb2a3..3f3f5e40 100644 --- a/lua/app/config/strings/ko/task_dungeon_armor.lua +++ b/lua/app/config/strings/ko/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="총 턴 수 30회 이하로 클리어하기" + }, + [4]={ + ["desc"]="총 HP가 30% 이상인 상태로 클리어하기" + }, + [5]={ + ["desc"]="총 HP가 35% 이상인 상태로 클리어하기" + }, + [6]={ + ["desc"]="총 HP가 40% 이상인 상태로 클리어하기" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/task_dungeon_armor.lua b/lua/app/config/strings/pt/task_dungeon_armor.lua index f4698283..0ad7afa7 100644 --- a/lua/app/config/strings/pt/task_dungeon_armor.lua +++ b/lua/app/config/strings/pt/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="Conclua a fase em 30 turnos." + }, + [4]={ + ["desc"]="Mantenha a Vida acima de 30% ao concluir a fase." + }, + [5]={ + ["desc"]="Mantenha a Vida acima de 35% ao concluir a fase." + }, + [6]={ + ["desc"]="Mantenha a Vida acima de 40% ao concluir a fase." } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/task_dungeon_armor.lua b/lua/app/config/strings/ru/task_dungeon_armor.lua index 3c80b63d..41b44b73 100644 --- a/lua/app/config/strings/ru/task_dungeon_armor.lua +++ b/lua/app/config/strings/ru/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/task_dungeon_armor.lua b/lua/app/config/strings/th/task_dungeon_armor.lua index 215709b7..c13ef859 100644 --- a/lua/app/config/strings/th/task_dungeon_armor.lua +++ b/lua/app/config/strings/th/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="เมื่อผ่านด่าน จำนวนรอบไม่เกิน30" + }, + [4]={ + ["desc"]="เมื่อผ่านด่าน HP ทั้งหมดสูงกว่า30%" + }, + [5]={ + ["desc"]="เมื่อผ่านด่าน HP ทั้งหมดสูงกว่า35%" + }, + [6]={ + ["desc"]="เมื่อผ่านด่าน HP ทั้งหมดสูงกว่า40%" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index eb230b0a..acae3fc6 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -386,7 +386,7 @@ local localization_global = ["ATTR_HP"] = "HP", ["ATTR_CRIT"] = "TL Chí Mạng", ["ATTR_CRIT_TIME"] = "Sát thương Chí Mạng", - ["ATTR_NORMAL_HURT"] = "Tăng sát thương đánh thường", + ["ATTR_NORMAL_HURT"] = "Tăng ST Thường", ["ATTR_SKILL_HURT"] = "ST Kỹ Năng", ["ATTR_NORMAL_HURTP"] = "Tăng sát thương đánh thường %", ["ATTR_SKILL_HURTP"] = "Tăng sát thương kỹ năng %", diff --git a/lua/app/config/strings/vi/task_dungeon_armor.lua b/lua/app/config/strings/vi/task_dungeon_armor.lua index cd42cd3b..d76e2333 100644 --- a/lua/app/config/strings/vi/task_dungeon_armor.lua +++ b/lua/app/config/strings/vi/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="Khi vượt ải, số hiệp không lớn hơn 30" + }, + [4]={ + ["desc"]="Khi vượt ải tổng HP cao hơn 30%" + }, + [5]={ + ["desc"]="Khi vượt ải tổng HP cao hơn 35%" + }, + [6]={ + ["desc"]="Khi vượt ải tổng HP cao hơn 40%" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/task_dungeon_armor.lua b/lua/app/config/strings/zh/task_dungeon_armor.lua index 1d2715de..ce65ac69 100644 --- a/lua/app/config/strings/zh/task_dungeon_armor.lua +++ b/lua/app/config/strings/zh/task_dungeon_armor.lua @@ -7,9 +7,18 @@ local task_dungeon_armor = { }, [3]={ ["desc"]="通關時總回合數不大於30" + }, + [4]={ + ["desc"]="通關時總血量高於30%" + }, + [5]={ + ["desc"]="通關時總血量高於35%" + }, + [6]={ + ["desc"]="通關時總血量高於40%" } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/task_dungeon_armor.lua b/lua/app/config/task_dungeon_armor.lua index 54d0436b..f50391ec 100644 --- a/lua/app/config/task_dungeon_armor.lua +++ b/lua/app/config/task_dungeon_armor.lua @@ -10,9 +10,21 @@ local task_dungeon_armor = { [3]={ ["type"]=3, ["param"]=30 + }, + [4]={ + ["type"]=1, + ["param"]=30 + }, + [5]={ + ["type"]=1, + ["param"]=35 + }, + [6]={ + ["type"]=1, + ["param"]=40 } } local config = { -data=task_dungeon_armor,count=3 +data=task_dungeon_armor,count=6 } return config \ No newline at end of file