diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 559646c3..61586374 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -4620,7 +4620,7 @@ local chapter_board = { }, { 4, - 0 + 2 }, { 0, @@ -4636,7 +4636,7 @@ local chapter_board = { }, { 4, - 0 + 2 }, { 1, diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 4ddd26a0..712ecf5b 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -1967,11 +1967,10 @@ local monster_chapter = { 10030, 10031 }, - ["skill"]={ - 10032 - }, ["passive_skill"]={ - 10033 + 10032, + 10033, + 10083 }, ["monster_exp"]=22000 }, @@ -2232,11 +2231,10 @@ local monster_chapter = { 10030, 10031 }, - ["skill"]={ - 10032 - }, ["passive_skill"]={ - 10033 + 10032, + 10033, + 10083 }, ["monster_exp"]=22000 } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 1275f509..fa352851 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -92,6 +92,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -224,6 +225,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -408,6 +410,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -528,7 +531,7 @@ local skill = { ["eliminate_obj"]=1, ["skill_position"]=2, ["sound_hit"]=2300111, - ["name_act"]="attack04", + ["name_act"]="skill01", ["fx_target"]=300029 }, [3200110]={ @@ -543,6 +546,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -562,6 +566,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -583,6 +588,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -604,6 +610,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -625,6 +632,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -652,6 +660,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -673,6 +682,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -692,6 +702,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -711,6 +722,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -730,6 +742,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -749,6 +762,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -774,6 +788,7 @@ local skill = { ["round"]=1 } }, + ["obj"]=1, ["skill_position"]=2, ["sound_hit"]=3300120, ["name_act"]="skill01", @@ -791,6 +806,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -811,6 +827,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -830,6 +847,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -849,6 +867,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -868,6 +887,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -906,6 +926,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -926,6 +947,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -945,6 +967,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -964,6 +987,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -983,6 +1007,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -1014,6 +1039,7 @@ local skill = { ["round"]=1 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=3, @@ -1066,6 +1092,7 @@ local skill = { ["round"]=1 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=3, @@ -1088,6 +1115,7 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -1213,7 +1241,7 @@ local skill = { ["effect"]={ { ["type"]="shield_rebound_200", - ["num"]=1000, + ["num"]=20000, ["ratio"]=10000, ["round"]=1 } @@ -1819,15 +1847,9 @@ local skill = { ["num"]=40000, ["ratio"]=10000, ["round"]=0 - }, - { - ["type"]="hit_heal", - ["num"]=60000, - ["ratio"]=10000, - ["round"]=1 } }, - ["obj"]=2, + ["obj"]=1, ["skill_position"]=1, ["cd"]=2, ["cd_start"]=1 @@ -2729,9 +2751,25 @@ local skill = { ["sound_hit"]=10082, ["name_act"]="skill01", ["fx_self"]=200039 + }, + [10083]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="heal", + ["num"]=100, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["cd"]=2, + ["cd_start"]=1 } } local config = { -data=skill,count=139 +data=skill,count=140 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 45f59f42..b37d00a8 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -177,7 +177,7 @@ local skill_rogue = { ["desc"]="生成的魔法罩如果没有破可以额外持续1回合" }, [200403]={ - ["desc"]="魔法罩存在时可反伤对方造成400%伤害" + ["desc"]="魔法罩存在时可反伤对方造成200%伤害" }, [200500]={ ["desc"]="舞步消散：将左右2格元素进行消除" @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="巨剑连斩被连接消除其斜方向的4个元素" }, [200800]={ - ["desc"]="霜冻剑舞：白发凯瑟琳可额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）" + ["desc"]="霜冻剑舞：造成1次伤害并施加1回合冰霜效果" }, [200801]={ ["desc"]="霜冻剑舞被使用时可消除掉其上下左右4个元素" diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 692b9661..ac2ecff1 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -12,19 +12,19 @@ local localization_global = ["BTN_TEXT_OK"] = "Confirm", ["BATTLE_DESC_1"] = "Quit battle?", ["ITEM_NOT_ENOUGH"] = "Insufficient {0}", - ["START_DESC"] = "start", + ["START_DESC"] = "Start", ["ELEMENT_NAME_1"] = "Red Elements", ["ELEMENT_NAME_2"] = "Golden Elements", ["ELEMENT_NAME_3"] = "Green Elements", ["ELEMENT_NAME_4"] = "Blue Elements", ["ELEMENT_NAME_5"] = "Purple Elements", - ["HERO_DESC_1"] = "Level{0}", + ["HERO_DESC_1"] = "Lv.{0}", ["HERO_DESC_2"] = "HP", ["HERO_DESC_3"] = "Attack", ["HERO_DESC_4"] = "Upgrade", ["HERO_DESC_5"] = "Activate", - ["HERO_DESC_6"] = "unlocked", - ["HERO_DESC_7"] = "locked", + ["HERO_DESC_6"] = "Unlocked", + ["HERO_DESC_7"] = "Locked", ["GET_REWARDS_DESC"] = "Rewards Obtained", ["CLICK_CLOSE_DESC"] = "Tap to close", ["REWARD_DESC"] = "Rewards", @@ -38,7 +38,7 @@ local localization_global = ["REWARD_PREVIEW_DESC"] = "Reward Overview", ["HERO_DESC_8"] = "Use", ["HERO_DESC_9"] = "Info", - ["HERO_DESC_10"] = "Unlock when completing chapter {0}", + ["HERO_DESC_10"] = "Unlock after chapter {0}", ["BATTLE_DESC_8"] = "Additional heroes available for deploying", ["MAIN_BTN_2"] = "Hero", ["MAIN_DESC_1"] = "Chapter {0}", diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 76b8acd3..3f5e9932 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -177,7 +177,7 @@ local skill_rogue = { ["desc"]="Magic Shield lasts for 1 more round if it isn’t destroyed" }, [200403]={ - ["desc"]="Magic Shield reflects and deals 400% damage back to the enemy when activated" + ["desc"]="Magic Shield reflects and deals 200% damage back to the enemy when activated" }, [200500]={ ["desc"]="Disperse in Dance: Clears elements on 2 tiles on the left and right" @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Great Sword Combos clears 4 elements on the diagonal directions when connected" }, [200800]={ - ["desc"]="Frosty Blade Dance: White-Hair Catherine deals extra damage for 1 time and applies Frost status on the enemy for 1 round (normal attack hits -1)" + ["desc"]="Frosty Blade Dance: Deal the damage for 1 hit and applies Frost status for 1 round" }, [200801]={ ["desc"]="When performing Frosty Blade Dance, clears 4 elements on the top, bottom, left and right side"