From dbbfbf4842f287ba1a13edf653b8b21ee2799ffd Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 21 Jul 2023 15:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=80=E8=83=BD=E7=9A=84?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E4=BD=8D=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/dungeon_armor_fund.lua | 60 ++++++---- lua/app/config/hero_level.lua | 8 +- lua/app/config/skill.lua | 104 +++++++++--------- lua/app/config/skill_rogue.lua | 14 ++- lua/app/config/strings/cn/buff.lua | 11 +- lua/app/config/strings/de/buff.lua | 9 +- lua/app/config/strings/en/buff.lua | 9 +- lua/app/config/strings/es/buff.lua | 9 +- lua/app/config/strings/fr/buff.lua | 9 +- lua/app/config/strings/id/buff.lua | 9 +- lua/app/config/strings/ja/buff.lua | 9 +- lua/app/config/strings/ko/buff.lua | 9 +- lua/app/config/strings/pt/buff.lua | 9 +- lua/app/config/strings/ru/buff.lua | 9 +- lua/app/config/strings/th/buff.lua | 9 +- lua/app/config/strings/vi/buff.lua | 9 +- lua/app/config/strings/zh/buff.lua | 9 +- .../skill/battle_rogue_skill_handle.lua | 11 ++ .../userdata/battle/battle_grid_entity.lua | 3 +- .../skill/battle_board_skill_entity.lua | 11 +- 20 files changed, 221 insertions(+), 109 deletions(-) diff --git a/lua/app/config/dungeon_armor_fund.lua b/lua/app/config/dungeon_armor_fund.lua index 1982361d..7b9e569c 100644 --- a/lua/app/config/dungeon_armor_fund.lua +++ b/lua/app/config/dungeon_armor_fund.lua @@ -1,5 +1,19 @@ local dungeon_armor_fund = { [1]={ + ["stage"]=0, + ["dungeon_stage"]=0, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [2]={ ["stage"]=1, ["dungeon_stage"]=1, ["reward"]={ @@ -30,7 +44,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [2]={ + [3]={ ["stage"]=1, ["dungeon_stage"]=4, ["reward"]={ @@ -61,7 +75,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [3]={ + [4]={ ["stage"]=1, ["dungeon_stage"]=6, ["reward"]={ @@ -92,7 +106,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [4]={ + [5]={ ["stage"]=1, ["dungeon_stage"]=10, ["reward"]={ @@ -123,7 +137,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [5]={ + [6]={ ["stage"]=1, ["dungeon_stage"]=12, ["reward"]={ @@ -154,7 +168,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [6]={ + [7]={ ["stage"]=1, ["dungeon_stage"]=16, ["reward"]={ @@ -185,7 +199,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [7]={ + [8]={ ["stage"]=1, ["dungeon_stage"]=18, ["reward"]={ @@ -216,7 +230,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [8]={ + [9]={ ["stage"]=1, ["dungeon_stage"]=22, ["reward"]={ @@ -247,7 +261,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [9]={ + [10]={ ["stage"]=1, ["dungeon_stage"]=24, ["reward"]={ @@ -278,7 +292,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [10]={ + [11]={ ["stage"]=1, ["dungeon_stage"]=28, ["reward"]={ @@ -309,7 +323,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [11]={ + [12]={ ["stage"]=1, ["dungeon_stage"]=30, ["reward"]={ @@ -340,7 +354,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100102 }, - [12]={ + [13]={ ["stage"]=2, ["dungeon_stage"]=31, ["reward"]={ @@ -371,7 +385,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [13]={ + [14]={ ["stage"]=2, ["dungeon_stage"]=34, ["reward"]={ @@ -402,7 +416,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [14]={ + [15]={ ["stage"]=2, ["dungeon_stage"]=36, ["reward"]={ @@ -433,7 +447,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [15]={ + [16]={ ["stage"]=2, ["dungeon_stage"]=38, ["reward"]={ @@ -464,7 +478,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [16]={ + [17]={ ["stage"]=2, ["dungeon_stage"]=40, ["reward"]={ @@ -495,7 +509,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [17]={ + [18]={ ["stage"]=2, ["dungeon_stage"]=42, ["reward"]={ @@ -526,7 +540,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [18]={ + [19]={ ["stage"]=2, ["dungeon_stage"]=44, ["reward"]={ @@ -557,7 +571,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [19]={ + [20]={ ["stage"]=2, ["dungeon_stage"]=46, ["reward"]={ @@ -588,7 +602,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [20]={ + [21]={ ["stage"]=2, ["dungeon_stage"]=48, ["reward"]={ @@ -619,7 +633,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [21]={ + [22]={ ["stage"]=2, ["dungeon_stage"]=50, ["reward"]={ @@ -650,7 +664,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [22]={ + [23]={ ["stage"]=2, ["dungeon_stage"]=52, ["reward"]={ @@ -681,7 +695,7 @@ local dungeon_armor_fund = { }, ["act_gift"]=100202 }, - [23]={ + [24]={ ["stage"]=2, ["dungeon_stage"]=54, ["reward"]={ @@ -714,6 +728,6 @@ local dungeon_armor_fund = { } } local config = { -data=dungeon_armor_fund,count=23 +data=dungeon_armor_fund,count=24 } return config \ No newline at end of file diff --git a/lua/app/config/hero_level.lua b/lua/app/config/hero_level.lua index 5275b2dd..4d9f57f1 100644 --- a/lua/app/config/hero_level.lua +++ b/lua/app/config/hero_level.lua @@ -4,14 +4,14 @@ local hero_level = { 3, 0 }, - ["unlock_skill"]=1 + ["unlock_skill"]=7 }, [2]={ ["cost_2"]={ 5, 50 }, - ["unlock_skill"]=1 + ["unlock_skill"]=7 }, [3]={ ["cost_2"]={ @@ -22,7 +22,7 @@ local hero_level = { 3, 0 }, - ["unlock_skill"]=2 + ["unlock_skill"]=7 }, [4]={ ["cost_2"]={ @@ -33,7 +33,7 @@ local hero_level = { 5, 300 }, - ["unlock_skill"]=2 + ["unlock_skill"]=7 }, [5]={ ["cost_2"]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index ca976a10..b2d3fab8 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -208,7 +208,7 @@ local skill = { ["fx_self_mirror"]=400071 }, [1200120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=2, @@ -448,7 +448,7 @@ local skill = { ["fx_self_mirror"]=400008 }, [1300120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=1, @@ -548,7 +548,7 @@ local skill = { ["obj"]=1 }, [1300123]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=1, @@ -762,7 +762,7 @@ local skill = { ["fx_self_mirror"]=400023 }, [1300220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=2, @@ -881,7 +881,7 @@ local skill = { ["obj"]=1 }, [1300222]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=2, @@ -1072,7 +1072,7 @@ local skill = { ["fx_self_mirror"]=400081 }, [1400120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=1, @@ -1342,7 +1342,7 @@ local skill = { ["fx_self_mirror"]=400103 }, [1400220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=1, @@ -1423,7 +1423,7 @@ local skill = { ["obj"]=1 }, [1400223]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=1, ["method"]=2, @@ -1617,10 +1617,14 @@ local skill = { ["fx_self_mirror"]=400057 }, [2200120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, ["method"]=1, + ["skill_type"]=4, + ["boardrange"]={ + + }, ["battle_icon"]="2", ["effect_type"]=1, ["trigger"]=1, @@ -1705,7 +1709,7 @@ local skill = { } }, [2200123]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, ["method"]=2, @@ -1854,7 +1858,7 @@ local skill = { ["fx_self_mirror"]=400013 }, [2300120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, ["method"]=1, @@ -1928,7 +1932,7 @@ local skill = { ["obj"]=2 }, [2300122]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, ["method"]=1, @@ -2182,10 +2186,10 @@ local skill = { ["fx_self_mirror"]=400003 }, [2300220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, - ["method"]=2, + ["method"]=1, ["skill_type"]=4, ["boardrange"]={ @@ -2410,10 +2414,10 @@ local skill = { ["fx_self_mirror"]=400076 }, [2400120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, - ["method"]=2, + ["method"]=1, ["skill_type"]=4, ["boardrange"]={ @@ -2548,10 +2552,10 @@ local skill = { ["obj"]=2 }, [2400123]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, - ["method"]=2, + ["method"]=1, ["skill_type"]=4, ["boardrange"]={ @@ -2592,10 +2596,10 @@ local skill = { ["fx_self_mirror"]=400077 }, [2400124]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, - ["method"]=2, + ["method"]=1, ["skill_type"]=4, ["boardrange"]={ @@ -2754,7 +2758,7 @@ local skill = { ["fx_self_mirror"]=400098 }, [2400220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=2, ["method"]=1, @@ -2979,7 +2983,7 @@ local skill = { ["fx_self_mirror"]=400052 }, [3200120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=1, @@ -3195,7 +3199,7 @@ local skill = { ["fx_target_mirror"]=400018 }, [3300120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=1, @@ -3256,7 +3260,7 @@ local skill = { ["trigger"]=6, ["effect"]={ { - ["type"]="skill_hurt_add", + ["type"]="skill_hurt_add_show", ["num"]=1500, ["ratio"]=10000, ["round"]=3 @@ -3270,7 +3274,7 @@ local skill = { ["trigger"]=6, ["effect"]={ { - ["type"]="skill_hurt_add", + ["type"]="skill_hurt_add_show", ["num"]=1500, ["ratio"]=10000, ["round"]=4 @@ -3279,7 +3283,7 @@ local skill = { ["obj"]=1 }, [3300125]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=2, @@ -3422,7 +3426,7 @@ local skill = { ["fx_self_mirror"]=400038 }, [3300220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=1, @@ -3496,7 +3500,7 @@ local skill = { ["obj"]=2 }, [3300222]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=1, @@ -3580,7 +3584,7 @@ local skill = { ["fx_self_mirror"]=400039 }, [3300223]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=1, @@ -3768,7 +3772,7 @@ local skill = { ["fx_self_mirror"]=400093 }, [3400120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=1, @@ -3885,7 +3889,7 @@ local skill = { ["obj"]=2 }, [3400125]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, ["method"]=2, @@ -4061,10 +4065,10 @@ local skill = { ["fx_self_mirror"]=400108 }, [3400220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=3, - ["method"]=2, + ["method"]=1, ["skill_type"]=4, ["boardrange"]={ @@ -4188,7 +4192,7 @@ local skill = { ["energy"]=8, ["link"]=1, ["position"]=3, - ["method"]=2, + ["method"]=1, ["skill_type"]=4, ["boardrange"]={ @@ -4350,7 +4354,7 @@ local skill = { ["fx_target_mirror"]=400062 }, [4200120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=4, ["method"]=1, @@ -4571,7 +4575,7 @@ local skill = { ["fx_self_mirror"]=400043 }, [4300120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=4, ["method"]=1, @@ -4721,7 +4725,7 @@ local skill = { } }, [4300125]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=4, ["method"]=2, @@ -4879,10 +4883,10 @@ local skill = { ["fx_self_mirror"]=400086 }, [4300220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=4, - ["method"]=2, + ["method"]=1, ["skill_type"]=4, ["boardrange"]={ @@ -5135,7 +5139,7 @@ local skill = { ["fx_self_mirror"]=400047 }, [4400120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=4, ["method"]=1, @@ -5346,7 +5350,7 @@ local skill = { ["fx_self_mirror"]=400110 }, [4400220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=4, ["method"]=1, @@ -5411,7 +5415,7 @@ local skill = { ["fx_self_mirror"]=400111 }, [4400221]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=4, ["method"]=2, @@ -5618,7 +5622,7 @@ local skill = { ["fx_self_mirror"]=400066 }, [5200120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=1, @@ -5658,7 +5662,7 @@ local skill = { ["fx_self_mirror"]=400067 }, [5200121]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=1, @@ -5698,7 +5702,7 @@ local skill = { ["fx_self_mirror"]=400067 }, [5200122]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=1, @@ -5856,7 +5860,7 @@ local skill = { ["fx_self_mirror"]=400028 }, [5300120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=1, @@ -6101,7 +6105,7 @@ local skill = { ["fx_self_mirror"]=400033 }, [5300220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=1, @@ -6245,7 +6249,7 @@ local skill = { ["obj"]=1 }, [5300225]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=2, @@ -6414,7 +6418,7 @@ local skill = { ["fx_self_mirror"]=400091 }, [5400120]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=1, @@ -6669,7 +6673,7 @@ local skill = { ["fx_self_mirror"]=400115 }, [5400220]={ - ["energy"]=10, + ["energy"]=2, ["link"]=1, ["position"]=5, ["method"]=1, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 0b92c33b..8a56dd5d 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1411,9 +1411,9 @@ local skill_rogue = { ["icon"]="42" }, [2200106]={ - ["unlock"]=2200102, + ["method"]=2, ["limit_times"]=1, - ["weight"]=3000, + ["weight"]=3000000, ["qlt"]=3, ["type"]=2, ["skill_position"]=2, @@ -1588,6 +1588,7 @@ local skill_rogue = { ["icon"]="177" }, [2300201]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -1648,6 +1649,7 @@ local skill_rogue = { ["icon"]="75" }, [2300204]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -1741,6 +1743,7 @@ local skill_rogue = { ["icon"]="187" }, [2400101]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2041,6 +2044,7 @@ local skill_rogue = { ["icon"]="47" }, [3200104]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2492,6 +2496,7 @@ local skill_rogue = { ["icon"]="193" }, [3400201]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2536,6 +2541,7 @@ local skill_rogue = { }, [3400203]={ ["unlock"]=3400201, + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2945,6 +2951,7 @@ local skill_rogue = { ["icon"]="126" }, [4300206]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -3175,7 +3182,7 @@ local skill_rogue = { ["icon"]="221" }, [4400206]={ - ["unlock"]=4400201, + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -3262,6 +3269,7 @@ local skill_rogue = { ["icon"]="61" }, [5200104]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index bf84f8d5..551e5085 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -177,6 +177,12 @@ local buff = { ["id"]=80, ["desc"]="冰霜护盾：可承受最大生命值{0}的伤害。", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["show_name"]="技能增伤", + ["desc"]="技能增伤：所有技能伤害增加", + ["name"]="skill_hurt_add_show" } } local keys = { @@ -212,12 +218,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/buff.lua b/lua/app/config/strings/de/buff.lua index 5878e4ab..9a1585bf 100644 --- a/lua/app/config/strings/de/buff.lua +++ b/lua/app/config/strings/de/buff.lua @@ -126,6 +126,10 @@ local buff = { [80]={ ["id"]=80, ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -161,12 +165,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index cb257776..30c4dbc0 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/lua/app/config/strings/en/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="Frost Shield: Absorbs damage up to {0} of Max HP.", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/buff.lua b/lua/app/config/strings/es/buff.lua index 16a64c91..6b481c72 100644 --- a/lua/app/config/strings/es/buff.lua +++ b/lua/app/config/strings/es/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="Escudo de Escarcha: soporta daño de {0} del HP máximo.", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/buff.lua b/lua/app/config/strings/fr/buff.lua index 5878e4ab..9a1585bf 100644 --- a/lua/app/config/strings/fr/buff.lua +++ b/lua/app/config/strings/fr/buff.lua @@ -126,6 +126,10 @@ local buff = { [80]={ ["id"]=80, ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -161,12 +165,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua index 20a374d7..407b185c 100644 --- a/lua/app/config/strings/id/buff.lua +++ b/lua/app/config/strings/id/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="Perisai Frost: Menerima hingga {0} DMG HP maksimum.", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua index 1f852a7e..118d3ded 100644 --- a/lua/app/config/strings/ja/buff.lua +++ b/lua/app/config/strings/ja/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="アイスシールド：最大HP{0}のダメージを無効化する。", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua index a21a2b0e..2afe836f 100644 --- a/lua/app/config/strings/ko/buff.lua +++ b/lua/app/config/strings/ko/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="서리 보호막: 최대 HP의 {0}에 달하는 대미지를 흡수할 수 있습니다.", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua index 746fa3c4..845ca242 100644 --- a/lua/app/config/strings/pt/buff.lua +++ b/lua/app/config/strings/pt/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="Escudo Gélido: aguenta dano equivalente a {0} da Vida Máxima.", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/buff.lua b/lua/app/config/strings/ru/buff.lua index 5878e4ab..9a1585bf 100644 --- a/lua/app/config/strings/ru/buff.lua +++ b/lua/app/config/strings/ru/buff.lua @@ -126,6 +126,10 @@ local buff = { [80]={ ["id"]=80, ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -161,12 +165,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua index 4c74fa53..37610bd0 100644 --- a/lua/app/config/strings/th/buff.lua +++ b/lua/app/config/strings/th/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด{0}", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua index 91acff81..79b1bd5c 100644 --- a/lua/app/config/strings/vi/buff.lua +++ b/lua/app/config/strings/vi/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng {0} HP tối đa.", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index 8bcc694a..b526ed9e 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -175,6 +175,10 @@ local buff = { ["id"]=80, ["desc"]="冰霜護盾：可承受最大生命值{0}的傷害。", ["name"]="shield_ice_02" + }, + [81]={ + ["id"]=81, + ["name"]="skill_hurt_add_show" } } local keys = { @@ -210,12 +214,13 @@ local keys = { ["shield_ice"]=buff[74], ["shield_ice_rebound_400"]=buff[75], ["invincible_shield"]=buff[79], - ["shield_ice_02"]=buff[80] + ["shield_ice_02"]=buff[80], + ["skill_hurt_add_show"]=buff[81] } } local config = { data=buff, keys=keys, -count=32 +count=33 } return config \ No newline at end of file diff --git a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua index 2cf42f36..9c92c291 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -442,6 +442,17 @@ function BattleRogueSkillHandle.takeEffect(skillId, battleData, battleController return end + ---- 统一处理 + if cfg.method then + local elementType = cfg.skill_position + if elementType then + local skillEntity = battleData:getSkillEntityByElement(elementType, side) + if skillEntity and skillEntity:getMethond() and skillEntity:getMethond() < cfg.method then + skillEntity:setMethond(cfg.method) + end + end + end + local func = BattleRogueSkillHandle._effectOn[cfg.type] if func then func(skillId, cfg, battleData, battleController, value, side) diff --git a/lua/app/userdata/battle/battle_grid_entity.lua b/lua/app/userdata/battle/battle_grid_entity.lua index 900d90f7..ee0cefb8 100644 --- a/lua/app/userdata/battle/battle_grid_entity.lua +++ b/lua/app/userdata/battle/battle_grid_entity.lua @@ -298,8 +298,7 @@ function BattleGridEntity:getNeedChangePos() if not skillEntity then return false end - local cfg = ModuleManager.BattleManager.SKILL_CFG[skillEntity:getSkillId()] - if cfg and cfg.method == BattleConst.SKILL_METHOD_TYPE.ON_FINAL then + if skillEntity:getMethond() == BattleConst.SKILL_METHOD_TYPE.ON_FINAL then return true end diff --git a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua index 8a2f29e5..ff7fc749 100644 --- a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua @@ -69,7 +69,16 @@ function BattleBoardSkillEntity:getMethond() if not self.config then return end - return self.config.method + + if not self.methondType then + self.methondType = self.config.method + end + + return self.methondType +end + +function BattleBoardSkillEntity:setMethond(method) + self.methondType = method end function BattleBoardSkillEntity:getSkillType()