diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 9fc5fd72..330c8783 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -189,6 +189,9 @@ local buff = { ["icon"]="shield", ["fx_continued"]={ 11 + }, + ["fx_disappear"]={ + 14 } }, [35]={ @@ -245,6 +248,9 @@ local buff = { ["icon"]="shield", ["fx_continued"]={ 11 + }, + ["fx_disappear"]={ + 14 } } } diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 92f49660..32f1ff40 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -54,6 +54,10 @@ local fx = { ["loop"]=1, ["bind"]="root" }, + [14]={ + ["res"]="sfx_common_dun_b02", + ["bind"]="root" + }, [100000]={ ["res"]="sfx_m10001_b01", ["bind"]="root" @@ -428,6 +432,6 @@ local fx = { } } local config = { -data=fx,count=106 +data=fx,count=107 } return config \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 9fd6b27b..25166d3c 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -193,7 +193,7 @@ local skill = { ["link"]=1, ["position"]=1, ["method"]=2, - ["skill_type"]=1, + ["skill_type"]=4, ["boardrange"]={ { ["type"]=3, @@ -354,7 +354,7 @@ local skill = { ["link"]=1, ["position"]=2, ["method"]=2, - ["skill_type"]=1, + ["skill_type"]=4, ["boardrange"]={ { ["type"]=1, @@ -499,93 +499,25 @@ local skill = { ["energy"]=10, ["link"]=1, ["position"]=2, - ["method"]=1, - ["skill_type"]=0, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + + }, ["icon"]=70, ["battle_icon"]="7", - ["effect_type"]=2, - ["trigger"]=3, - ["effect"]={ - { - ["type"]="dmg_addition_all_add", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=1 - } - }, - ["obj"]=1, - ["skill_position"]=2, - ["sound_hit"]=2300111 - }, - [2300121]={ - ["energy"]=10, - ["link"]=1, - ["position"]=2, - ["method"]=2, - ["skill_type"]=1, - ["boardrange"]={ - { - ["type"]=1, - ["range"]=1 - }, - { - ["type"]=2, - ["range"]=1 - }, - { - ["type"]=3, - ["range"]=1 - }, - { - ["type"]=4, - ["range"]=1 - } - }, - ["icon"]=20, - ["battle_icon"]="2", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="dmg_addition_all_add", - ["num"]=5000, + ["type"]="hurt_green", + ["num"]=50000, ["ratio"]=10000, - ["round"]=1 + ["round"]=0 } }, - ["obj"]=1, - ["skill_position"]=2, - ["sound_hit"]=2300111 - }, - [2300122]={ - ["energy"]=10, - ["link"]=1, - ["position"]=2, - ["method"]=2, - ["skill_type"]=1, - ["boardrange"]={ - { - ["type"]=5, - ["range"]=1 - }, - { - ["type"]=6, - ["range"]=1 - }, - { - ["type"]=7, - ["range"]=1 - }, - { - ["type"]=8, - ["range"]=1 - } - }, - ["icon"]=70, - ["battle_icon"]="7", - ["effect_type"]=2, - ["trigger"]=3, - ["effect"]={ + ["obj"]=2, + ["eliminate_effect"]={ { ["type"]="dmg_addition_all_add", ["num"]=5000, @@ -593,9 +525,11 @@ local skill = { ["round"]=1 } }, - ["obj"]=1, + ["eliminate_obj"]=1, ["skill_position"]=2, - ["sound_hit"]=2300111 + ["sound_hit"]=2300111, + ["name_act"]="attack04", + ["fx_target"]=300029 }, [3200110]={ ["position"]=3, @@ -628,7 +562,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -650,7 +583,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -672,7 +604,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -694,7 +625,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -722,7 +652,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, @@ -763,7 +692,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -783,7 +711,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -803,7 +730,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -823,7 +749,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -849,7 +774,6 @@ local skill = { ["round"]=1 } }, - ["obj"]=1, ["skill_position"]=2, ["sound_hit"]=3300120, ["name_act"]="skill01", @@ -887,7 +811,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -907,7 +830,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -927,7 +849,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -947,7 +868,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -1006,7 +926,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -1026,7 +945,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -1046,7 +964,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -1066,7 +983,6 @@ local skill = { ["round"]=0 } }, - ["obj"]=2, ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, @@ -2816,6 +2732,6 @@ local skill = { } } local config = { -data=skill,count=141 +data=skill,count=139 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 6e9a1adc..c3ad64b0 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -980,11 +980,26 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=2000, ["qlt"]=3, - ["type"]=1, - ["parameter"]={ - 2300121 + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + }, + { + ["type"]=3, + ["range"]=1 + }, + { + ["type"]=4, + ["range"]=1 + } }, - ["skill_position"]=2, ["icon"]="49" }, [200702]={ @@ -1007,12 +1022,27 @@ local skill_rogue = { [200703]={ ["limit_times"]=1, ["weight"]=1000, - ["qlt"]=4, - ["type"]=1, - ["parameter"]={ - 2300122 + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=5, + ["range"]=1 + }, + { + ["type"]=6, + ["range"]=1 + }, + { + ["type"]=7, + ["range"]=1 + }, + { + ["type"]=8, + ["range"]=1 + } }, - ["skill_position"]=2, ["icon"]="51" }, [200800]={ diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index b817859b..6ef844a3 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -1,9 +1,9 @@ local skill = { [3200120]={ - ["desc"]="长枪突刺：造成大量伤害" + ["desc"]="长枪突刺：造成1次大量伤害" }, [2200120]={ - ["desc"]="拔刀斩：造成大量伤害" + ["desc"]="拔刀斩：造成1次大量伤害" }, [4200120]={ ["desc"]="元素链接：随机额外消除3个元素" @@ -18,7 +18,7 @@ local skill = { ["desc"]="快速治愈：立即恢复艾芙琳80%攻击力的生命值" }, [2300120]={ - ["desc"]="巨剑连斩：每一次攻击的伤害将增加50%" + ["desc"]="巨剑连斩：攻击伤害增加50%，结束时使用巨剑造成大量伤害。" }, [4300120]={ ["desc"]="霜冻剑舞：造成1次大量伤害并给敌人1回合冰霜效果（普攻次数-1）" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index f7ae9083..675dc292 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -132,7 +132,7 @@ local skill_rogue = { ["desc"]="将场上随机5个非紫色元素变为紫色" }, [200100]={ - ["desc"]="长枪突刺：阿斯克可造成1次巨量伤害" + ["desc"]="长枪突刺：阿斯克可造成1次大量伤害" }, [200101]={ ["desc"]="长枪突刺可恢复生命" @@ -144,7 +144,7 @@ local skill_rogue = { ["desc"]="长枪突刺有30%概率眩晕对手1回合" }, [200200]={ - ["desc"]="拔刀斩：卡拉可造成1次巨量伤害" + ["desc"]="拔刀斩：卡拉可造成1次大量伤害" }, [200201]={ ["desc"]="拔刀斩伤害提升" diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index 6308e694..0239ade3 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/lua/app/config/strings/en/buff.lua @@ -1,47 +1,62 @@ local buff = { [7]={ + ["desc"]="DMG Taken from Red Elements will be reduced", ["name"]="dec_dmg_red_add" }, [8]={ + ["desc"]="DMG Taken from Golden Elements will be reduced", ["name"]="dec_dmg_yellow_add" }, [9]={ + ["desc"]="DMG Taken from Green Elements will be reduced", ["name"]="dec_dmg_green_add" }, [10]={ + ["desc"]="DMG Taken from Blue Elements will be reduced", ["name"]="dec_dmg_blue_add" }, [11]={ + ["desc"]="DMG Taken from Purple Elements will be reduced", ["name"]="dec_dmg_purple_add" }, [12]={ + ["desc"]="DMG Taken from All Sources will be reduced", ["name"]="dec_dmg_all_add" }, [13]={ + ["desc"]="DMG Taken from Red Elements will be increased", ["name"]="weakness_red_add" }, [14]={ + ["desc"]="DMG Taken from Golden Elements will be increased", ["name"]="weakness_yellow_add" }, [15]={ + ["desc"]="DMG Taken from Green Elements will be increased", ["name"]="weakness_green_add" }, [16]={ + ["desc"]="DMG Taken from Blue Elements will be increased", ["name"]="weakness_blue_add" }, [17]={ + ["desc"]="DMG Taken from Purple Elements will be increased", ["name"]="weakness_purple_add" }, [18]={ + ["desc"]="DMG Taken from All Sources will be increased", ["name"]="weakness_all_add" }, [33]={ + ["desc"]="Unable to attack while in stun status", ["name"]="stun" }, [34]={ + ["desc"]="The shield can absorb a certain amount of damage", ["name"]="shield" }, [36]={ + ["desc"]="Reduce normal attack hits", ["name"]="normal_attack_dec" } } diff --git a/lua/app/config/strings/en/chapter.lua b/lua/app/config/strings/en/chapter.lua index f94155c0..5c715bb5 100644 --- a/lua/app/config/strings/en/chapter.lua +++ b/lua/app/config/strings/en/chapter.lua @@ -1,33 +1,33 @@ local chapter = { [1]={ - + ["name"]="1. Abandoned town" }, [2]={ - + ["name"]="2. Town Trod" }, [3]={ - + ["name"]="3. Town Mine" }, [4]={ - + ["name"]="4. Serenity Forest" }, [5]={ - + ["name"]="5. Cobble Shore (West)" }, [6]={ - + ["name"]="6. Cobble Shore (East)" }, [7]={ - + ["name"]="7. Castle Suburb" }, [8]={ - + ["name"]="8. Castle Gate" }, [9]={ - + ["name"]="9. Castle Inside" }, [10]={ - + ["name"]="10. Inner Castle" } } local config = { diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index fd5421cf..7ef456b2 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -7,6 +7,41 @@ local localization_global = ["QLT_DESC_4"] = "Epic", ["QLT_DESC_5"] = "Legendary", ["QLT_DESC_6"] = "Mythic", + ["MESSAGE_BOX_TITLE"] = "Hint", + ["BTN_TEXT_CANCEL"] = "Cancel", + ["BTN_TEXT_OK"] = "Confirm", + ["BATTLE_DESC_1"] = "Quit battle?", + ["ITEM_NOT_ENOUGH"] = "Insufficient {0}", + ["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_2"] = "HP", + ["HERO_DESC_3"] = "Attack", + ["HERO_DESC_4"] = "Upgrade", + ["HERO_DESC_5"] = "Activate", + ["HERO_DESC_6"] = "unlocked", + ["HERO_DESC_7"] = "locked", + ["GET_REWARDS_DESC"] = "Rewards Obtained", + ["CLICK_CLOSE_DESC"] = "Tap to close", + ["REWARD_DESC"] = "Rewards", + ["CONTINUE_DESC"] = "Continue", + ["BATTLE_DESC_2"] = "Pause", + ["BATTLE_DESC_3"] = "Refresh", + ["BATTLE_DESC_4"] = "Reach", + ["BATTLE_DESC_5"] = "Victory", + ["BATTLE_DESC_6"] = "Failed", + ["BATTLE_DESC_7"] = "Total DMG Dealt: {0}", + ["REWARD_PREVIEW_DESC"] = "Reward Overview", + ["HERO_DESC_8"] = "Use", + ["HERO_DESC_9"] = "Info", + ["HERO_DESC_10"] = "Unlock when completing chapter {0}", + ["BATTLE_DESC_8"] = "Additional heroes available for deploying", + ["MAIN_BTN_2"] = "Hero", + ["MAIN_DESC_1"] = "Chapter {0}", ["TIME_STR_DHM"] = "{0} d {1} h {2} min", ["TIME_STR_M"] = "{0} min", ["TIME_STR_MS"] = "{0} min {1} sec", diff --git a/lua/app/config/strings/en/hero.lua b/lua/app/config/strings/en/hero.lua index 337c87f4..c47059f3 100644 --- a/lua/app/config/strings/en/hero.lua +++ b/lua/app/config/strings/en/hero.lua @@ -1,27 +1,27 @@ local hero = { [12001]={ - + ["name"]="Roxy" }, [22001]={ - + ["name"]="Carla" }, [23001]={ - + ["name"]="Great Sword Robert" }, [32001]={ - + ["name"]="Aske" }, [33001]={ - + ["name"]="Evelyn" }, [42001]={ - + ["name"]="Lilith" }, [43001]={ - + ["name"]="White-Hair Catherine" }, [52001]={ - + ["name"]="Allen" } } local config = { diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 7a541c86..707063e3 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -12,37 +12,48 @@ local item = { ["desc"]="It takes stamina to complete stages" }, [4]={ - + ["name"]="Outstanding Hero", + ["desc"]="Allows you to get an outstanding hero" }, [5]={ - + ["name"]="Rare Hero", + ["desc"]="Allows you to get a rare hero" }, [6]={ - + ["name"]="Epic Hero", + ["desc"]="Allows you to get an epic hero" }, [12001]={ - + ["name"]="Roxy Shard", + ["desc"]="Roxy Shard, collect it to unlock or upgrade Roxy" }, [22001]={ - + ["name"]="Carla Shard", + ["desc"]="Carla Shard, collect it to unlock or upgrade Carla" }, [23001]={ - + ["name"]="Great Sword Robert Shard", + ["desc"]="Great Sword Robert Shard, collect it to unlock or upgrade Great Sword Robert" }, [32001]={ - + ["name"]="Aske Shard", + ["desc"]="Aske Shard, collect it to unlock or upgrade Aske" }, [33001]={ - + ["name"]="Evelyn Shard", + ["desc"]="Evelyn Shard, collect it to unlock or upgrade Evelyn" }, [42001]={ - + ["name"]="Lilith Shard", + ["desc"]="Lilith Shard, collect it to unlock or upgrade Lilith" }, [43001]={ - + ["name"]="White-Hair Catherine Shard", + ["desc"]="White-Hair Catherine Shard, collect it to unlock or upgrade White-Hair Catherine" }, [52001]={ - + ["name"]="Allen Shard", + ["desc"]="Allen Shard, collect it to unlock or upgrade Allen" } } local config = { diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua index b73ffd67..9a577270 100644 --- a/lua/app/config/strings/en/tutorial.lua +++ b/lua/app/config/strings/en/tutorial.lua @@ -1,15 +1,15 @@ local tutorial = { ["tutorial_txt_1"]={ - + ["value"]="Select a skill and continue the battle" }, ["tutorial_txt_2"]={ - + ["value"]="Claim chest to unlock new heroes" }, ["tutorial_txt_3"]={ - + ["value"]="Claim chest to obtain hero shards" }, ["tutorial_txt_4"]={ - + ["value"]="Claim chest to unlock the 5th hero" } } local config = {