From c0b2c67fdd8b2b335dc5fb8b592cc8611cfc99d4 Mon Sep 17 00:00:00 2001 From: chenxi Date: Sun, 23 Apr 2023 19:20:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter.lua | 16 +- lua/app/config/chapter_board.lua | 950 +++++++++--------- lua/app/config/fx.lua | 6 +- lua/app/config/skill.lua | 152 ++- lua/app/config/tutorial.lua | 37 +- .../battle/component/battle_unit_comp.lua | 4 + .../module/battle/helper/battle_helper.lua | 21 + .../battle/skill/battle_skill_entity.lua | 4 + 8 files changed, 688 insertions(+), 502 deletions(-) diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 421513ab..f09b218b 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -158,10 +158,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=52001, + ["id_for_nothing"]="UwpcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, @@ -265,10 +265,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=52001, - ["id_for_nothing"]="UwpcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index d27d0d8b..c831b8ee 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -221,35 +221,7 @@ local chapter_board = { 0 }, { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -265,7 +237,7 @@ local chapter_board = { 1 }, { - 1, + 2, 0 }, { @@ -276,34 +248,6 @@ local chapter_board = { 1, 0 }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 1, 0 @@ -314,7 +258,7 @@ local chapter_board = { }, { 0, - 2 + 1 }, { 0, @@ -333,20 +277,76 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { - 0, - 1 + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 1, 0 }, { - 0, - 1 + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 }, { 1, @@ -425,16 +425,20 @@ local chapter_board = { 0 }, { - 0, - 1 + 2, + 0 }, { 0, 2 }, { - 0, - 1 + 2, + 0 + }, + { + 1, + 0 }, { 1, @@ -445,7 +449,7 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { @@ -461,12 +465,8 @@ local chapter_board = { 4 }, { - 0, - 1 - }, - { - 0, - 3 + 2, + 0 }, { 1, @@ -477,71 +477,7 @@ local chapter_board = { 0 }, { - 0, - 3 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, + 2, 0 }, { @@ -552,33 +488,17 @@ local chapter_board = { 0, 2 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 3 }, { - 0, - 3 + 2, + 0 }, { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 2 + 1, + 0 }, { 1, @@ -589,7 +509,7 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { @@ -597,12 +517,92 @@ local chapter_board = { 4 }, { - 0, - 1 + 2, + 0 }, { - 0, - 4 + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 1, @@ -621,109 +621,21 @@ local chapter_board = { 0 }, { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 + 2, + 0 }, { 0, 1 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, { 0, 1 }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, { 2, 0 @@ -732,60 +644,28 @@ local chapter_board = { 1, 0 }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, { 1, 0 }, { - 1, - 0 - }, - { - 1, + 2, 0 }, { 0, 2 }, - { - 0, - 4 - }, { 0, 1 }, { - 1, - 0 + 0, + 4 }, { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -800,6 +680,126 @@ local chapter_board = { 2, 0 }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, { 1, 0 @@ -824,122 +824,26 @@ local chapter_board = { 1, 0 }, - { - 0, - 4 - }, { 0, 3 }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, { 0, 2 }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -950,7 +854,7 @@ local chapter_board = { }, { 0, - 1 + 2 }, { 0, @@ -958,11 +862,107 @@ local chapter_board = { }, { 0, - 3 + 2 }, { 0, - 4 + 2 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 1, @@ -977,16 +977,16 @@ local chapter_board = { 0 }, { - 0, - 4 + 3, + 0 }, { - 0, - 3 + 3, + 0 }, { - 0, - 4 + 3, + 0 }, { 1, @@ -1009,8 +1009,8 @@ local chapter_board = { 0 }, { - 0, - 4 + 3, + 0 } } }, @@ -1026,15 +1026,15 @@ local chapter_board = { }, { 0, - 4 + 1 }, { 0, - 3 + 2 }, { 0, - 4 + 1 }, { 1, @@ -1052,10 +1052,6 @@ local chapter_board = { 1, 0 }, - { - 0, - 3 - }, { 0, 2 @@ -1064,65 +1060,49 @@ local chapter_board = { 0, 3 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 3 + 2 }, { - 0, - 3 + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 2, 0 }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, { 0, 1 }, - { - 0, - 4 - }, { 2, 0 }, { 0, - 4 + 1 }, { - 0, - 1 + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 }, { 3, @@ -1133,24 +1113,44 @@ local chapter_board = { 0 }, { - 0, - 1 + 2, + 0 }, { - 0, - 2 + 3, + 0 }, { - 0, - 2 + 3, + 0 }, { - 0, - 2 + 3, + 0 }, { - 0, - 1 + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 3, @@ -1161,24 +1161,24 @@ local chapter_board = { 0 }, { - 0, - 3 + 3, + 0 }, { - 0, - 3 + 3, + 0 }, { - 0, - 2 + 3, + 0 }, { - 0, - 3 + 3, + 0 }, { - 0, - 3 + 3, + 0 }, { 1, diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index b1d0f3bb..e95d15c2 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -406,9 +406,13 @@ local fx = { [300032]={ ["res"]="sfx_p0008_b06", ["bind"]="root" + }, + [300033]={ + ["res"]="sfx_p0001_b05", + ["bind"]="root" } } local config = { -data=fx,count=102 +data=fx,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 3fe57295..935e5355 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -95,6 +95,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=1200110, ["name_act"]="support01", ["fx_target"]=2 }, @@ -114,6 +115,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=1200111, ["name_act"]="attack01", ["fx_self"]=300017, ["fx_target"]=2 @@ -134,6 +136,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=1200112, ["name_act"]="attack02", ["fx_self"]=300018, ["fx_target"]=2 @@ -154,6 +157,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=1200113, ["name_act"]="attack03", ["fx_self"]=300019, ["fx_target"]=2 @@ -174,12 +178,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=1200114, ["name_act"]="attack04", ["fx_self"]=300020, ["fx_target"]=2 }, [1200120]={ ["energy"]=10, + ["link"]=1, ["position"]=1, ["method"]=2, ["skill_type"]=1, @@ -197,7 +203,8 @@ local skill = { ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, - ["skill_position"]=2 + ["skill_position"]=2, + ["sound_hit"]=1200120 }, [2200110]={ ["position"]=2, @@ -214,6 +221,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2200110, ["name_act"]="support01", ["fx_target"]=4 }, @@ -233,6 +241,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2200111, ["name_act"]="attack01", ["fx_self"]=300004, ["fx_target"]=4 @@ -253,6 +262,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2200112, ["name_act"]="attack02", ["fx_self"]=300005, ["fx_target"]=4 @@ -273,6 +283,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2200113, ["name_act"]="attack03", ["fx_self"]=300006, ["fx_target"]=4 @@ -293,12 +304,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2200114, ["name_act"]="attack04", ["fx_self"]=300007, ["fx_target"]=4 }, [2200120]={ ["energy"]=10, + ["link"]=1, ["position"]=2, ["method"]=1, ["skill_type"]=0, @@ -318,12 +331,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=4, + ["sound_hit"]=2200120, ["name_act"]="skill01", ["fx_self"]=300008, ["fx_target"]=4 }, [2200121]={ ["energy"]=10, + ["link"]=1, ["position"]=2, ["method"]=2, ["skill_type"]=1, @@ -361,6 +376,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=4, + ["sound_hit"]=2200120, ["name_act"]="skill01", ["fx_self"]=300008, ["fx_target"]=4 @@ -380,6 +396,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2300110, ["name_act"]="support01", ["fx_target"]=4 }, @@ -399,6 +416,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2300111, ["name_act"]="attack01", ["fx_self"]=300026, ["fx_target"]=4 @@ -419,6 +437,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2300112, ["name_act"]="attack02", ["fx_self"]=300027, ["fx_target"]=4 @@ -439,6 +458,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2300113, ["name_act"]="attack03", ["fx_self"]=300028, ["fx_target"]=4 @@ -459,12 +479,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=2300114, ["name_act"]="attack04", ["fx_self"]=300029, ["fx_target"]=4 }, [2300120]={ ["energy"]=10, + ["link"]=1, ["position"]=2, ["method"]=1, ["skill_type"]=0, @@ -474,17 +496,19 @@ local skill = { ["trigger"]=3, ["effect"]={ { - ["type"]="dmg_addition_yellow_add", + ["type"]="dmg_addition_all_add", ["num"]=5000, ["ratio"]=10000, ["round"]=1 } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]=2, + ["sound_hit"]=2300120 }, [2300121]={ ["energy"]=10, + ["link"]=1, ["position"]=2, ["method"]=2, ["skill_type"]=1, @@ -512,17 +536,19 @@ local skill = { ["trigger"]=1, ["effect"]={ { - ["type"]="dmg_addition_yellow_add", + ["type"]="dmg_addition_all_add", ["num"]=5000, ["ratio"]=10000, ["round"]=1 } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]=2, + ["sound_hit"]=2300120 }, [2300122]={ ["energy"]=10, + ["link"]=1, ["position"]=2, ["method"]=1, ["skill_type"]=2, @@ -553,14 +579,15 @@ local skill = { ["trigger"]=3, ["effect"]={ { - ["type"]="dmg_addition_yellow_add", + ["type"]="dmg_addition_all_add", ["num"]=5000, ["ratio"]=10000, ["round"]=1 } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]=2, + ["sound_hit"]=2300120 }, [3200110]={ ["position"]=3, @@ -577,6 +604,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3200110, ["name_act"]="support01", ["fx_target"]=6 }, @@ -596,6 +624,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3200111, ["name_act"]="attack01", ["fx_self"]=300000, ["fx_target"]=6 @@ -616,6 +645,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3200112, ["name_act"]="attack02", ["fx_self"]=300001, ["fx_target"]=5 @@ -636,6 +666,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3200113, ["name_act"]="attack03", ["fx_self"]=300002, ["fx_target"]=6 @@ -656,12 +687,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3200114, ["name_act"]="attack04", ["fx_self"]=300003, ["fx_target"]=6 }, [3200120]={ ["energy"]=10, + ["link"]=1, ["position"]=3, ["method"]=1, ["skill_type"]=0, @@ -681,8 +714,9 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3200120, ["name_act"]="skill01", - ["fx_self"]=300003, + ["fx_self"]=300033, ["fx_target"]=6 }, [3300110]={ @@ -700,6 +734,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3300110, ["name_act"]="support01", ["fx_target"]=5 }, @@ -719,6 +754,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3300111, ["name_act"]="attack01", ["fx_target"]=300021 }, @@ -738,6 +774,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3300112, ["name_act"]="attack02", ["fx_target"]=300022 }, @@ -757,6 +794,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3300113, ["name_act"]="attack03", ["fx_target"]=300023 }, @@ -776,11 +814,13 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=3300114, ["name_act"]="attack04", ["fx_target"]=300024 }, [3300120]={ ["energy"]=10, + ["link"]=1, ["position"]=3, ["method"]=1, ["skill_type"]=0, @@ -798,6 +838,7 @@ local skill = { }, ["obj"]=1, ["skill_position"]=2, + ["sound_hit"]=3300120, ["name_act"]="skill01", ["fx_self"]=300025 }, @@ -816,6 +857,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4200110, ["name_act"]="support01", ["fx_target"]=7 }, @@ -835,6 +877,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4200111, ["name_act"]="attack01", ["fx_target"]=300009 }, @@ -854,6 +897,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4200112, ["name_act"]="attack02", ["fx_target"]=300010 }, @@ -873,6 +917,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4200113, ["name_act"]="attack03", ["fx_target"]=300011 }, @@ -892,11 +937,13 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4200114, ["name_act"]="attack04", ["fx_target"]=300012 }, [4200120]={ ["energy"]=10, + ["link"]=1, ["position"]=4, ["method"]=1, ["skill_type"]=1, @@ -910,7 +957,8 @@ local skill = { ["battle_icon"]="3", ["effect_type"]=1, ["trigger"]=1, - ["skill_position"]=2 + ["skill_position"]=2, + ["sound_hit"]=4200120 }, [4300110]={ ["position"]=4, @@ -927,6 +975,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4300110, ["name_act"]="support01", ["fx_target"]=8 }, @@ -946,6 +995,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4300111, ["name_act"]="attack01", ["fx_self"]=300030, ["fx_target"]=8 @@ -966,6 +1016,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4300112, ["name_act"]="attack02", ["fx_self"]=300030, ["fx_target"]=8 @@ -986,6 +1037,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4300113, ["name_act"]="attack03", ["fx_self"]=300030, ["fx_target"]=8 @@ -1006,12 +1058,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=4300114, ["name_act"]="attack04", ["fx_self"]=300030, ["fx_target"]=8 }, [4300120]={ ["energy"]=10, + ["link"]=1, ["position"]=4, ["method"]=1, ["skill_type"]=0, @@ -1036,12 +1090,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=3, + ["sound_hit"]=4300120, ["name_act"]="skill01", ["fx_self"]=300031, ["fx_target"]=300032 }, [4300121]={ ["energy"]=10, + ["link"]=1, ["position"]=4, ["method"]=1, ["skill_type"]=1, @@ -1084,6 +1140,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=3, + ["sound_hit"]=4300121, ["name_act"]="skill01", ["fx_self"]=300031, ["fx_target"]=300032 @@ -1103,6 +1160,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=5200110, ["name_act"]="support01", ["fx_target"]=10 }, @@ -1122,6 +1180,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=5200111, ["name_act"]="attack01", ["fx_self"]=300013, ["fx_target"]=10 @@ -1142,6 +1201,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=5200112, ["name_act"]="attack02", ["fx_self"]=300013, ["fx_target"]=10 @@ -1162,6 +1222,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=5200113, ["name_act"]="attack03", ["fx_self"]=300014, ["fx_target"]=10 @@ -1182,12 +1243,14 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=5200114, ["name_act"]="attack04", ["fx_self"]=300015, ["fx_target"]=10 }, [5200120]={ ["energy"]=10, + ["link"]=1, ["position"]=5, ["method"]=1, ["skill_type"]=0, @@ -1205,12 +1268,14 @@ local skill = { }, ["obj"]=1, ["skill_position"]=2, + ["sound_hit"]=5200120, ["name_act"]="skill01", ["fx_self"]=300016, ["fx_target"]=10 }, [5200121]={ ["energy"]=10, + ["link"]=1, ["position"]=5, ["method"]=1, ["skill_type"]=0, @@ -1228,6 +1293,7 @@ local skill = { }, ["obj"]=1, ["skill_position"]=2, + ["sound_hit"]=5200120, ["name_act"]="skill01", ["fx_self"]=300016 }, @@ -1246,6 +1312,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=100000 }, @@ -1264,6 +1331,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=100001 }, @@ -1282,6 +1350,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10003, ["name_act"]="attack03", ["fx_self"]=100002 }, @@ -1300,6 +1369,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10004, ["name_act"]="attack01", ["fx_target"]=100003 }, @@ -1318,6 +1388,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10005, ["name_act"]="attack02", ["fx_target"]=100004 }, @@ -1336,6 +1407,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10006, ["name_act"]="attack03", ["fx_target"]=100005 }, @@ -1354,6 +1426,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=100006 }, @@ -1372,6 +1445,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=100007 }, @@ -1390,6 +1464,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10003, ["name_act"]="attack03", ["fx_self"]=100008 }, @@ -1408,6 +1483,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=100009 }, @@ -1426,6 +1502,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=100009 }, @@ -1444,6 +1521,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10003, ["name_act"]="attack03", ["fx_self"]=100010 }, @@ -1462,6 +1540,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=100011 }, @@ -1480,6 +1559,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=100012 }, @@ -1498,6 +1578,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=100013 }, @@ -1516,6 +1597,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=100014 }, @@ -1534,6 +1616,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10003, ["name_act"]="attack03", ["fx_self"]=100015 }, @@ -1552,6 +1635,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=100016 }, @@ -1570,6 +1654,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=100017 }, @@ -1588,6 +1673,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10003, ["name_act"]="attack03", ["fx_self"]=100018 }, @@ -1606,6 +1692,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=200000 }, @@ -1624,6 +1711,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=200001 }, @@ -1644,6 +1732,7 @@ local skill = { ["cd_start"]=1, ["shake_time"]=100, ["shake_type"]=3, + ["sound_hit"]=10022, ["name_act"]="skill01", ["fx_self"]=200002 }, @@ -1676,6 +1765,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10001, ["name_act"]="attack01", ["fx_self"]=200003 }, @@ -1694,6 +1784,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10002, ["name_act"]="attack02", ["fx_self"]=200004 }, @@ -1714,6 +1805,7 @@ local skill = { ["cd_start"]=1, ["shake_time"]=100, ["shake_type"]=3, + ["sound_hit"]=10022, ["name_act"]="skill01", ["fx_self"]=200005 }, @@ -1746,6 +1838,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200006, ["fx_target"]=200009 @@ -1765,6 +1858,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200007, ["fx_target"]=200009 @@ -1784,6 +1878,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200008, ["fx_target"]=200009 @@ -1845,6 +1940,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10004, ["name_act"]="attack01", ["fx_target"]=200010 }, @@ -1863,6 +1959,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10005, ["name_act"]="attack02", ["fx_target"]=200010 }, @@ -1881,6 +1978,7 @@ local skill = { ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10006, ["name_act"]="attack03", ["fx_target"]=200010 }, @@ -1899,6 +1997,7 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=1, + ["sound_hit"]=10022, ["name_act"]="skill01", ["fx_self"]=200011 }, @@ -1917,6 +2016,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200012 }, @@ -1935,6 +2035,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200013 }, @@ -1953,6 +2054,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200014 }, @@ -1984,6 +2086,7 @@ local skill = { ["skill_position"]=2, ["cd"]=3, ["cd_start"]=1, + ["sound_hit"]=10042, ["name_act"]="skill01", ["fx_self"]=200015 }, @@ -1999,6 +2102,7 @@ local skill = { ["skill_position"]=2, ["cd"]=3, ["cd_start"]=1, + ["sound_hit"]=10042, ["name_act"]="skill01", ["fx_self"]=200015 }, @@ -2031,6 +2135,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200016 }, @@ -2049,6 +2154,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200017 }, @@ -2067,6 +2173,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200018 }, @@ -2085,6 +2192,7 @@ local skill = { ["skill_position"]=2, ["cd"]=3, ["cd_start"]=1, + ["sound_hit"]=10048, ["name_act"]="skill01", ["fx_self"]=200019 }, @@ -2117,6 +2225,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200020 }, @@ -2135,6 +2244,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200021 }, @@ -2153,6 +2263,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200022 }, @@ -2168,6 +2279,7 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=1, + ["sound_hit"]=10053, ["name_act"]="skill01", ["fx_self"]=200023 }, @@ -2183,6 +2295,7 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=1, + ["sound_hit"]=10053, ["name_act"]="skill01", ["fx_self"]=200023 }, @@ -2215,6 +2328,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200024 }, @@ -2233,6 +2347,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200025 }, @@ -2251,6 +2366,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200026 }, @@ -2285,6 +2401,7 @@ local skill = { ["skill_position"]=2, ["cd"]=3, ["cd_start"]=1, + ["sound_hit"]=10048, ["name_act"]="skill01", ["fx_self"]=200027 }, @@ -2330,6 +2447,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200028 }, @@ -2348,6 +2466,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200029 }, @@ -2366,6 +2485,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200030 }, @@ -2381,6 +2501,7 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=1, + ["sound_hit"]=10066, ["name_act"]="skill01" }, [10067]={ @@ -2415,6 +2536,7 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=1, + ["sound_hit"]=10066, ["name_act"]="skill01" }, [10069]={ @@ -2432,6 +2554,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200031 }, @@ -2450,6 +2573,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200031 }, @@ -2468,6 +2592,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200032 }, @@ -2486,6 +2611,7 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=1, + ["sound_hit"]=10072, ["name_act"]="skill01" }, [10073]={ @@ -2517,6 +2643,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200033 }, @@ -2535,6 +2662,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200034 }, @@ -2553,6 +2681,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200035 }, @@ -2578,6 +2707,7 @@ local skill = { ["cd_start"]=1, ["shake_time"]=100, ["shake_type"]=4, + ["sound_hit"]=10042, ["name_act"]="skill01" }, [10078]={ @@ -2609,6 +2739,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10029, ["name_act"]="attack01", ["fx_self"]=200036 }, @@ -2627,6 +2758,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10030, ["name_act"]="attack02", ["fx_self"]=200037 }, @@ -2645,6 +2777,7 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]=10031, ["name_act"]="attack03", ["fx_self"]=200038 }, @@ -2665,6 +2798,7 @@ local skill = { ["cd_start"]=2, ["shake_time"]=100, ["shake_type"]=4, + ["sound_hit"]=10082, ["name_act"]="skill01", ["fx_self"]=200039 } diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 02ec0ffa..b88117a2 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -357,7 +357,26 @@ local tutorial = { [40040]={ ["next_id"]=40050, ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_5", + ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 50, + 50 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [40050]={ + ["next_id"]=40060, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_1", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -373,8 +392,8 @@ local tutorial = { 0 } }, - [40050]={ - ["next_id"]=40060, + [40060]={ + ["next_id"]=40070, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/bg/up_btn", ["arrow_direction"]=1, @@ -392,8 +411,8 @@ local tutorial = { 0 } }, - [40060]={ - ["next_id"]=40070, + [40070]={ + ["next_id"]=40080, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/bg/back_btn", ["arrow_direction"]=1, @@ -403,8 +422,8 @@ local tutorial = { }, ["show_mask"]=1 }, - [40070]={ - ["next_id"]=40080, + [40080]={ + ["next_id"]=40090, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_5", ["arrow_direction"]=1, @@ -422,7 +441,7 @@ local tutorial = { 0 } }, - [40080]={ + [40090]={ ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn", ["arrow_direction"]=1, @@ -433,6 +452,6 @@ local tutorial = { } } local config = { -data=tutorial,count=35 +data=tutorial,count=36 } return config \ No newline at end of file diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 24fed43e..57f818fa 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1023,6 +1023,10 @@ function BattleUnitComp:onSkillTakeEffect(skill) self.battleController:shakeScreen(shakeType, shakeTime/TIME_FACTOR) end end + local soundHit = skill:getSoundHit() + if soundHit then + BattleHelper:playSkillSound(soundHit, 0) + end end end diff --git a/lua/app/module/battle/helper/battle_helper.lua b/lua/app/module/battle/helper/battle_helper.lua index 51538c8b..ee3cd0ad 100644 --- a/lua/app/module/battle/helper/battle_helper.lua +++ b/lua/app/module/battle/helper/battle_helper.lua @@ -5,6 +5,7 @@ local BattleScheduler = require "app/module/battle/helper/battle_scheduler" local BattleHelper = {} local BATTLE_FX_PATH = "assets/prefabs/effects/battle/%s.prefab" +local BATTLE_SKILL_SOUND_PATH = "assets/arts/sounds/sfx/battle/%s.wav" function BattleHelper:init() self.isClear = false @@ -18,6 +19,7 @@ function BattleHelper:init() self.effectMap = {} self.seed = tonumber(tostring(os.time()):reverse():sub(1,6)) self.baseOrder = 0 + self.skillSoundPath = {} end function BattleHelper:setBaseOrder(baseOrder) @@ -228,6 +230,24 @@ function BattleHelper:recycleBuffEffect(buffEffect) table.insert(self.buffEffectPool, buffEffect) end +function BattleHelper:playSkillSound(name, delay) + if self.skillSoundPath == nil then + return + end + local soundFullPath = self.skillSoundPath[name] + if soundFullPath == nil then + soundFullPath = string.format(BATTLE_SKILL_SOUND_PATH, name) + self.skillSoundPath[name] = soundFullPath + end + if delay and delay > 0 then + self:performDurationDelay(delay, function() + AudioManager:playEffect(soundFullPath) + end) + else + AudioManager:playEffect(soundFullPath) + end +end + function BattleHelper:performDurationDelay(delay, func) return BattleScheduler:performWithDelayGlobal(func, delay) end @@ -251,6 +271,7 @@ function BattleHelper:clear() self.battleFxPaths = nil self.effectPools = nil self.effectMap = nil + self.skillSoundPath = nil end return BattleHelper \ No newline at end of file diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index 84eb8e1e..71bdf75e 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -178,6 +178,10 @@ function BattleSkillEntity:getShakeTime() return self.skillInfo.shake_time end +function BattleSkillEntity:getSoundHit() + return self.skillInfo.sound_hit +end + function BattleSkillEntity:getRecordData(name) if self.recordData == nil then self.recordData = {}