diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index e02ef45f..bbfcaa6d 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -696,10 +696,10 @@ local buff = { ["decr"]=3, ["icon"]="invincible_shield", ["fx_continued"]={ - 38 + 26 }, ["fx_disappear"]={ - 39 + 27 } } } diff --git a/lua/app/config/chapter_dungeon_armor.lua b/lua/app/config/chapter_dungeon_armor.lua index 139f8d09..4090a6f2 100644 --- a/lua/app/config/chapter_dungeon_armor.lua +++ b/lua/app/config/chapter_dungeon_armor.lua @@ -13,7 +13,16 @@ local chapter_dungeon_armor = { 2 }, ["monster"]={ - 101, + 107, + 207, + 307, + 407, + 507, + 607, + 707, + 807, + 907, + 1007 }, ["star_task"]={ 1, @@ -129,7 +138,16 @@ local chapter_dungeon_armor = { 2 }, ["monster"]={ - 101 + 1107, + 1207, + 1307, + 1407, + 1507, + 1607, + 1707, + 1807, + 1907, + 2007 }, ["star_task"]={ 1, @@ -245,7 +263,16 @@ local chapter_dungeon_armor = { 2 }, ["monster"]={ - 101 + 2107, + 2207, + 2307, + 2407, + 2507, + 2607, + 2707, + 2807, + 2907, + 3007 }, ["star_task"]={ 1, @@ -361,7 +388,16 @@ local chapter_dungeon_armor = { 2 }, ["monster"]={ - 101 + 3107, + 3207, + 3307, + 3407, + 3507, + 3607, + 3707, + 3807, + 3907, + 4007 }, ["star_task"]={ 1, diff --git a/lua/app/config/chapter_dungeon_equip.lua b/lua/app/config/chapter_dungeon_equip.lua index d552311e..4716a082 100644 --- a/lua/app/config/chapter_dungeon_equip.lua +++ b/lua/app/config/chapter_dungeon_equip.lua @@ -1,7 +1,7 @@ local chapter_dungeon_equip = { [1]={ ["level"]=5, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -94,7 +94,7 @@ local chapter_dungeon_equip = { }, [2]={ ["level"]=10, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -187,7 +187,7 @@ local chapter_dungeon_equip = { }, [3]={ ["level"]=15, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -280,7 +280,7 @@ local chapter_dungeon_equip = { }, [4]={ ["level"]=20, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -373,7 +373,7 @@ local chapter_dungeon_equip = { }, [5]={ ["level"]=25, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -466,7 +466,7 @@ local chapter_dungeon_equip = { }, [6]={ ["level"]=30, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -559,7 +559,7 @@ local chapter_dungeon_equip = { }, [7]={ ["level"]=35, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -652,7 +652,7 @@ local chapter_dungeon_equip = { }, [8]={ ["level"]=40, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -745,7 +745,7 @@ local chapter_dungeon_equip = { }, [9]={ ["level"]=45, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -838,7 +838,7 @@ local chapter_dungeon_equip = { }, [10]={ ["level"]=50, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -931,7 +931,7 @@ local chapter_dungeon_equip = { }, [11]={ ["level"]=55, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1024,7 +1024,7 @@ local chapter_dungeon_equip = { }, [12]={ ["level"]=60, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1117,7 +1117,7 @@ local chapter_dungeon_equip = { }, [13]={ ["level"]=65, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1210,7 +1210,7 @@ local chapter_dungeon_equip = { }, [14]={ ["level"]=70, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1303,7 +1303,7 @@ local chapter_dungeon_equip = { }, [15]={ ["level"]=75, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1396,7 +1396,7 @@ local chapter_dungeon_equip = { }, [16]={ ["level"]=80, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1489,7 +1489,7 @@ local chapter_dungeon_equip = { }, [17]={ ["level"]=85, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1582,7 +1582,7 @@ local chapter_dungeon_equip = { }, [18]={ ["level"]=90, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1675,7 +1675,7 @@ local chapter_dungeon_equip = { }, [19]={ ["level"]=95, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ @@ -1768,7 +1768,7 @@ local chapter_dungeon_equip = { }, [20]={ ["level"]=100, - ["scene"]="bg_13", + ["scene"]="dungeon_equip", ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["board"]={ diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 4f2e9c4e..42cc49bc 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -410,6 +410,8 @@ local LocalizationGlobalConst = DUNGEON_ARMOR_DESC_9 = "DUNGEON_ARMOR_DESC_9", DUNGEON_ARMOR_DESC_10 = "DUNGEON_ARMOR_DESC_10", DUNGEON_ARMOR_DESC_11 = "DUNGEON_ARMOR_DESC_11", + EQUIP_DESC_24 = "EQUIP_DESC_24", + EQUIP_DESC_25 = "EQUIP_DESC_25", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 3577b17f..b23d516e 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -242,7 +242,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=12001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300022, ["bullet_time"]={ @@ -1145,7 +1145,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=14001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300049, ["bullet_time"]={ @@ -1366,7 +1366,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=14002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300104, ["bullet_time"]={ @@ -1457,7 +1457,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=14002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300104, ["bullet_time"]={ @@ -1640,7 +1640,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=22001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300009, ["bullet_time"]={ @@ -1739,7 +1739,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=22001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300009, ["bullet_time"]={ @@ -2437,7 +2437,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=24001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300032, ["bullet_time"]={ @@ -2581,7 +2581,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=24001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300032, ["bullet_time"]={ @@ -2625,7 +2625,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=24001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300032, ["bullet_time"]={ @@ -2781,7 +2781,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=24002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300099, ["bullet_time"]={ @@ -3006,7 +3006,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=32001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300004, ["bullet_time"]={ @@ -3818,7 +3818,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=34001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300092, ["bullet_time"]={ @@ -4111,7 +4111,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=34002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300109, ["bullet_time"]={ @@ -4235,7 +4235,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=34002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300109, ["bullet_time"]={ @@ -4380,7 +4380,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=42001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_target"]=300014, ["bullet_time"]={ @@ -5171,7 +5171,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=44001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_target"]=300034, ["bullet_time"]={ @@ -5400,7 +5400,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=44002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300111, ["bullet_time"]={ @@ -5475,7 +5475,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=44002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300111, ["bullet_time"]={ @@ -6455,7 +6455,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=54001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300089, ["bullet_time"]={ @@ -6529,7 +6529,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=54001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300089, ["bullet_time"]={ @@ -6730,7 +6730,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=54002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300116, ["bullet_time"]={ @@ -9772,8 +9772,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10050, + ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=200155 + ["fx_self"]=200155, + ["bullet_time"]={ + 1200, + 3000, + 400 + } }, [10086]={ ["effect_type"]=2, @@ -9824,8 +9831,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=44001200, + ["sound_delay"]=0.1, ["name_act"]="skill01", - ["fx_self"]=200151 + ["fx_self"]=200151, + ["bullet_time"]={ + 1000, + 3000, + 400 + } }, [10088]={ ["effect_type"]=1, @@ -9845,11 +9859,18 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, + ["sound"]=10042, + ["sound_delay"]=0.0, ["sound_hit"]={ 3300120 }, ["name_act"]="skill01", - ["fx_self"]=400019 + ["fx_self"]=400019, + ["bullet_time"]={ + 1466, + 3000, + 400 + } }, [10089]={ ["skill_type"]=3, @@ -9876,8 +9897,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.0, ["name_act"]="skill02", - ["fx_self"]=200165 + ["fx_self"]=200165, + ["bullet_time"]={ + 1400, + 3000, + 400 + } }, [10090]={ ["effect_type"]=2, @@ -9912,10 +9940,14 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, - ["sound_hit"]={ - 10033 - }, - ["name_act"]="skill01" + ["sound"]=10072, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["bullet_time"]={ + 633, + 3000, + 400 + } }, [10092]={ ["skill_type"]=3, @@ -9942,8 +9974,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200163 + ["fx_self"]=200163, + ["bullet_time"]={ + 2033, + 3000, + 400 + } }, [10093]={ ["effect_type"]=2, @@ -10003,8 +10042,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10042, + ["sound_delay"]=0.5, ["name_act"]="skill01", - ["fx_self"]=200158 + ["fx_self"]=200158, + ["bullet_time"]={ + 1066, + 3000, + 400 + } }, [10095]={ ["effect_type"]=1, @@ -10024,8 +10070,15 @@ local skill = { }, ["cd"]=3, ["cd_start"]=3, + ["sound"]=42001201, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200159 + ["fx_self"]=200159, + ["bullet_time"]={ + 1300, + 3000, + 400 + } }, [10096]={ ["skill_type"]=5, @@ -10071,8 +10124,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10050, + ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=200155 + ["fx_self"]=200155, + ["bullet_time"]={ + 1200, + 3000, + 400 + } }, [10097]={ ["effect_type"]=2, @@ -10123,8 +10183,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=44001200, + ["sound_delay"]=0.1, ["name_act"]="skill01", - ["fx_self"]=200151 + ["fx_self"]=200151, + ["bullet_time"]={ + 1000, + 3000, + 400 + } }, [10099]={ ["effect_type"]=1, @@ -10144,11 +10211,18 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, + ["sound"]=10042, + ["sound_delay"]=0.0, ["sound_hit"]={ 3300120 }, ["name_act"]="skill01", - ["fx_self"]=400019 + ["fx_self"]=400019, + ["bullet_time"]={ + 1466, + 3000, + 400 + } }, [10100]={ ["skill_type"]=3, @@ -10175,8 +10249,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.0, ["name_act"]="skill02", - ["fx_self"]=200165 + ["fx_self"]=200165, + ["bullet_time"]={ + 1400, + 3000, + 400 + } }, [10101]={ ["effect_type"]=2, @@ -10211,10 +10292,14 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, - ["sound_hit"]={ - 10033 - }, - ["name_act"]="skill01" + ["sound"]=10072, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["bullet_time"]={ + 633, + 3000, + 400 + } }, [10103]={ ["skill_type"]=3, @@ -10241,8 +10326,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200163 + ["fx_self"]=200163, + ["bullet_time"]={ + 2033, + 3000, + 400 + } }, [10104]={ ["effect_type"]=2, @@ -10302,8 +10394,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10042, + ["sound_delay"]=0.5, ["name_act"]="skill01", - ["fx_self"]=200158 + ["fx_self"]=200158, + ["bullet_time"]={ + 1066, + 3000, + 400 + } }, [10106]={ ["effect_type"]=1, @@ -10323,8 +10422,15 @@ local skill = { }, ["cd"]=3, ["cd_start"]=3, + ["sound"]=42001201, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200159 + ["fx_self"]=200159, + ["bullet_time"]={ + 1300, + 3000, + 400 + } }, [10107]={ ["skill_type"]=5, @@ -10370,8 +10476,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10050, + ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=200155 + ["fx_self"]=200155, + ["bullet_time"]={ + 1200, + 3000, + 400 + } }, [10108]={ ["effect_type"]=2, @@ -10422,8 +10535,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=44001200, + ["sound_delay"]=0.1, ["name_act"]="skill01", - ["fx_self"]=200151 + ["fx_self"]=200151, + ["bullet_time"]={ + 1000, + 3000, + 400 + } }, [10110]={ ["effect_type"]=1, @@ -10443,11 +10563,18 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, + ["sound"]=10042, + ["sound_delay"]=0.0, ["sound_hit"]={ 3300120 }, ["name_act"]="skill01", - ["fx_self"]=400019 + ["fx_self"]=400019, + ["bullet_time"]={ + 1466, + 3000, + 400 + } }, [10111]={ ["skill_type"]=3, @@ -10474,8 +10601,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.0, ["name_act"]="skill02", - ["fx_self"]=200165 + ["fx_self"]=200165, + ["bullet_time"]={ + 1400, + 3000, + 400 + } }, [10112]={ ["effect_type"]=2, @@ -10510,10 +10644,14 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, - ["sound_hit"]={ - 10033 - }, - ["name_act"]="skill01" + ["sound"]=10072, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["bullet_time"]={ + 633, + 3000, + 400 + } }, [10114]={ ["skill_type"]=3, @@ -10540,8 +10678,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200163 + ["fx_self"]=200163, + ["bullet_time"]={ + 2033, + 3000, + 400 + } }, [10115]={ ["effect_type"]=2, @@ -10601,8 +10746,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10042, + ["sound_delay"]=0.5, ["name_act"]="skill01", - ["fx_self"]=200158 + ["fx_self"]=200158, + ["bullet_time"]={ + 1066, + 3000, + 400 + } }, [10117]={ ["effect_type"]=1, @@ -10622,8 +10774,15 @@ local skill = { }, ["cd"]=3, ["cd_start"]=3, + ["sound"]=42001201, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200159 + ["fx_self"]=200159, + ["bullet_time"]={ + 1300, + 3000, + 400 + } }, [10118]={ ["skill_type"]=5, @@ -10669,8 +10828,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10050, + ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=200155 + ["fx_self"]=200155, + ["bullet_time"]={ + 1200, + 3000, + 400 + } }, [10119]={ ["effect_type"]=2, @@ -10721,8 +10887,15 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=44001200, + ["sound_delay"]=0.1, ["name_act"]="skill01", - ["fx_self"]=200151 + ["fx_self"]=200151, + ["bullet_time"]={ + 1000, + 3000, + 400 + } }, [10121]={ ["effect_type"]=1, @@ -10742,11 +10915,18 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, + ["sound"]=10042, + ["sound_delay"]=0.0, ["sound_hit"]={ 3300120 }, ["name_act"]="skill01", - ["fx_self"]=400019 + ["fx_self"]=400019, + ["bullet_time"]={ + 1466, + 3000, + 400 + } }, [10122]={ ["skill_type"]=3, @@ -10773,8 +10953,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.0, ["name_act"]="skill02", - ["fx_self"]=200165 + ["fx_self"]=200165, + ["bullet_time"]={ + 1400, + 3000, + 400 + } }, [10123]={ ["effect_type"]=2, @@ -10809,10 +10996,14 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, - ["sound_hit"]={ - 10033 - }, - ["name_act"]="skill01" + ["sound"]=10072, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["bullet_time"]={ + 633, + 3000, + 400 + } }, [10125]={ ["skill_type"]=3, @@ -10839,8 +11030,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10041, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200163 + ["fx_self"]=200163, + ["bullet_time"]={ + 2033, + 3000, + 400 + } }, [10126]={ ["effect_type"]=2, @@ -10900,8 +11098,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=10042, + ["sound_delay"]=0.5, ["name_act"]="skill01", - ["fx_self"]=200158 + ["fx_self"]=200158, + ["bullet_time"]={ + 1066, + 3000, + 400 + } }, [10128]={ ["effect_type"]=1, @@ -10921,8 +11126,15 @@ local skill = { }, ["cd"]=3, ["cd_start"]=3, + ["sound"]=42001201, + ["sound_delay"]=0.5, ["name_act"]="skill02", - ["fx_self"]=200159 + ["fx_self"]=200159, + ["bullet_time"]={ + 1300, + 3000, + 400 + } }, [10129]={ ["effect_type"]=1, @@ -10979,8 +11191,18 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, + ["sound_hit"]={ + 10039, + 10039, + 10039 + }, ["name_act"]="skill02", - ["fx_self"]=200156 + ["fx_self"]=200156, + ["bullet_time"]={ + 1100, + 3000, + 400 + } }, [20001]={ ["effect_type"]=1, @@ -18504,6 +18726,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10016 + }, ["name_act"]="attack01", ["fx_self"]=200152 }, @@ -18531,6 +18756,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10039 + }, ["name_act"]="attack02", ["fx_self"]=200153 }, @@ -18558,6 +18786,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10018 + }, ["name_act"]="attack03", ["fx_self"]=200154 }, @@ -18579,6 +18810,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000002 + }, ["name_act"]="attack01", ["fx_self"]=200148 }, @@ -18600,6 +18834,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000003 + }, ["name_act"]="attack02", ["fx_self"]=200149 }, @@ -18621,6 +18858,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000004 + }, ["name_act"]="attack03", ["fx_self"]=200150 }, @@ -18642,6 +18882,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10049 + }, ["name_act"]="attack01", ["fx_self"]=200164 }, @@ -18663,6 +18906,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10049 + }, ["name_act"]="attack02", ["fx_self"]=200164 }, @@ -18684,6 +18930,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10049 + }, ["name_act"]="attack03", ["fx_self"]=200164 }, @@ -18711,6 +18960,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack01", ["fx_self"]=200160 }, @@ -18738,6 +18990,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 2200112 + }, ["name_act"]="attack02", ["fx_self"]=200161 }, @@ -18765,6 +19020,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack03", ["fx_self"]=200162 }, @@ -18786,6 +19044,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10005 + }, ["name_act"]="attack01", ["fx_self"]=200157 }, @@ -18807,6 +19068,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10006 + }, ["name_act"]="attack02", ["fx_self"]=200157 }, @@ -18828,6 +19092,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10049 + }, ["name_act"]="attack03", ["fx_self"]=200157 }, @@ -18855,6 +19122,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10016 + }, ["name_act"]="attack01", ["fx_self"]=200152 }, @@ -18882,6 +19152,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10039 + }, ["name_act"]="attack02", ["fx_self"]=200153 }, @@ -18909,6 +19182,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10018 + }, ["name_act"]="attack03", ["fx_self"]=200154 }, @@ -18936,6 +19212,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack01", ["fx_self"]=200160 }, @@ -18963,6 +19242,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 2200112 + }, ["name_act"]="attack02", ["fx_self"]=200161 }, @@ -18990,6 +19272,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack03", ["fx_self"]=200162 }, @@ -19017,6 +19302,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10016 + }, ["name_act"]="attack01", ["fx_self"]=200152 }, @@ -19044,6 +19332,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10039 + }, ["name_act"]="attack02", ["fx_self"]=200153 }, @@ -19071,6 +19362,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10018 + }, ["name_act"]="attack03", ["fx_self"]=200154 }, @@ -19098,6 +19392,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack01", ["fx_self"]=200160 }, @@ -19125,6 +19422,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 2200112 + }, ["name_act"]="attack02", ["fx_self"]=200161 }, @@ -19152,6 +19452,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack03", ["fx_self"]=200162 }, @@ -19179,6 +19482,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10016 + }, ["name_act"]="attack01", ["fx_self"]=200152 }, @@ -19206,6 +19512,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10039 + }, ["name_act"]="attack02", ["fx_self"]=200153 }, @@ -19233,6 +19542,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 10018 + }, ["name_act"]="attack03", ["fx_self"]=200154 }, @@ -19260,6 +19572,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack01", ["fx_self"]=200160 }, @@ -19287,6 +19602,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 2200112 + }, ["name_act"]="attack02", ["fx_self"]=200161 }, @@ -19314,6 +19632,9 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, ["name_act"]="attack03", ["fx_self"]=200162 }, @@ -20304,7 +20625,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=12001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400072, ["bullet_time"]={ @@ -20812,7 +21133,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=14001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400082, ["bullet_time"]={ @@ -20973,7 +21294,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=14002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400104, ["bullet_time"]={ @@ -21104,7 +21425,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=22001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400058, ["bullet_time"]={ @@ -21568,7 +21889,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=24001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400077, ["bullet_time"]={ @@ -21725,7 +22046,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=24002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400099, ["bullet_time"]={ @@ -21878,7 +22199,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=32001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400053, ["bullet_time"]={ @@ -22339,7 +22660,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=34001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400094, ["bullet_time"]={ @@ -22488,7 +22809,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=34002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400109, ["fx_target"]=300034, @@ -22625,7 +22946,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=42001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_target"]=400063, ["bullet_time"]={ @@ -23083,7 +23404,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound"]=44001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_target"]=400048, ["bullet_time"]={ @@ -23263,7 +23584,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=44002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400111, ["bullet_time"]={ @@ -23900,7 +24221,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=54001200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400092, ["bullet_time"]={ @@ -24103,7 +24424,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound"]=54002200, - ["sound_delay"]=0, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=400116 }, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index d01322ab..61c4ca64 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -410,8 +410,8 @@ local localization_global = ["DUNGEON_ARMOR_DESC_9"] = "当前积攒星星{0}", ["DUNGEON_ARMOR_DESC_10"] = "积攒{0}颗星星可获得奖励", ["DUNGEON_ARMOR_DESC_11"] = "补星", - - + ["EQUIP_DESC_24"] = "超值武器强化包", + ["EQUIP_DESC_25"] = "超值防具强化包", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index e827811e..ed573c9b 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -109,123 +109,123 @@ local item = { }, [1001]={ ["name"]="暗淡陨铁", - ["desc"]="武器材料1阶" + ["desc"]="一块暗淡的陨铁,蕴含着神秘的能量。" }, [1002]={ ["name"]="百炼陨铁", - ["desc"]="武器材料2阶" + ["desc"]="经过百炼的陨铁,闪烁着金属光芒。" }, [1003]={ ["name"]="月华陨铁", - ["desc"]="武器材料3阶" + ["desc"]="在月光照射下,泛着银白色的华光。" }, [1004]={ ["name"]="天光陨铁", - ["desc"]="武器材料4阶" + ["desc"]="闪耀着明亮的天光,散发着神秘的气息。" }, [1005]={ ["name"]="金光陨铁", - ["desc"]="武器材料5阶" + ["desc"]="闪烁着金色光芒,散发着强大的能量。" }, [1006]={ ["name"]="至臻陨铁", - ["desc"]="武器材料6阶" + ["desc"]="极为珍贵的陨铁,蕴含着无与伦比的力量。" }, [1007]={ ["name"]="翠绿晶石", - ["desc"]="帽子材料1阶" + ["desc"]="一块翠绿色的晶石,散发出清新的气息。" }, [1008]={ ["name"]="暗红晶石", - ["desc"]="帽子材料2阶" + ["desc"]="呈暗红色的晶石,充满神秘的气息。" }, [1009]={ ["name"]="混元晶石", - ["desc"]="帽子材料3阶" + ["desc"]="蕴含着混沌能量的晶石,难以捉摸。" }, [1010]={ ["name"]="鸿鑫晶石", - ["desc"]="帽子材料4阶" + ["desc"]="充满吉祥气息的晶石,被视为幸运的象征。" }, [1011]={ ["name"]="海洋晶石", - ["desc"]="帽子材料5阶" + ["desc"]="宛如碧海般的晶石,散发出清凉的气息。" }, [1012]={ ["name"]="至金晶石", - ["desc"]="帽子材料6阶" + ["desc"]="价值连城的晶石,闪耀着金色的光芒。" }, [1013]={ ["name"]="蜥蜴鳞片", - ["desc"]="衣服材料1阶" + ["desc"]="坚硬而灵活的鳞片,仿佛寄托着蜥蜴的生命之力。" }, [1014]={ ["name"]="亚龙鳞片", - ["desc"]="衣服材料2阶" + ["desc"]="神秘龙息环绕的鳞片,似乎凝聚着龙的力量。" }, [1015]={ ["name"]="海龙鳞片", - ["desc"]="衣服材料3阶" + ["desc"]="散发着海洋力量的鳞片,宛如大海中波涛汹涌的奔腾。" }, [1016]={ ["name"]="火龙鳞片", - ["desc"]="衣服材料4阶" + ["desc"]="充满炽热能量的鳞片,仿佛蕴含着熊熊烈火的愤怒。" }, [1017]={ ["name"]="雷龙鳞片", - ["desc"]="衣服材料5阶" + ["desc"]="带有电光气息的鳞片,宛如雷电交织的神奇图腾。" }, [1018]={ ["name"]="神龙鳞片", - ["desc"]="衣服材料6阶" + ["desc"]="被视为神圣存在的鳞片,仿佛承载着神明的庇佑。" }, [1019]={ ["name"]="粗糙皮革", - ["desc"]="腰带材料1阶" + ["desc"]="简单的粗糙皮革,适合制作普通装备。" }, [1020]={ ["name"]="土蛇皮革", - ["desc"]="腰带材料2阶" + ["desc"]="坚韧且耐用的皮革,仿佛记载着土蛇沧桑岁月的坚韧。" }, [1021]={ ["name"]="巨熊皮革", - ["desc"]="腰带材料3阶" + ["desc"]="防御力极强的皮革,散发着浑厚的熊之威仪。" }, [1022]={ ["name"]="猛虎皮革", - ["desc"]="腰带材料4阶" + ["desc"]="敏捷威猛的皮革,宛如蕴含着猛虎狩猎本能的神奇皮质。" }, [1023]={ ["name"]="恶魔皮革", - ["desc"]="腰带材料5阶" + ["desc"]="散发着邪恶气息的皮革,仿佛带有恶魔的诅咒。" }, [1024]={ ["name"]="天蟒皮革", - ["desc"]="腰带材料6阶" + ["desc"]="带有神秘力量的皮革,仿佛能让人联想到神秘的蛇妖。" }, [1025]={ ["name"]="幽深贝壳", - ["desc"]="护手材料1阶" + ["desc"]="黑暗中发出微光的贝壳,似乎蕴含着神秘能量。" }, [1026]={ ["name"]="水韵贝壳", - ["desc"]="护手材料2阶" + ["desc"]="闪烁着水波纹的贝壳,带有清凉之感。" }, [1027]={ ["name"]="岩石贝壳", - ["desc"]="护手材料3阶" + ["desc"]="坚硬的岩石贝壳,具有防御性能。" }, [1028]={ ["name"]="混沌贝壳", - ["desc"]="护手材料4阶" + ["desc"]="充满混沌能量的贝壳,神秘而不可测。" }, [1029]={ ["name"]="暗狱贝壳", - ["desc"]="护手材料5阶" + ["desc"]="黑暗中若隐若现的贝壳,带有不安的气息。" }, [1030]={ ["name"]="至圣贝壳", - ["desc"]="护手材料6阶" + ["desc"]="被尊为圣物的贝壳,散发出神圣的光芒。" }, [12001]={ ["name"]="舞娘碎片", diff --git a/lua/app/ui/dungeon_armor/cell/chapter_cell.lua b/lua/app/ui/dungeon_armor/cell/chapter_cell.lua index 07c540ed..f52cb794 100644 --- a/lua/app/ui/dungeon_armor/cell/chapter_cell.lua +++ b/lua/app/ui/dungeon_armor/cell/chapter_cell.lua @@ -40,6 +40,7 @@ function ChapterCell:refresh(id) end local spineNode = uiMap["chapter_cell.touch_node.spine_node"] + local spineObj = uiMap["chapter_cell.touch_node.spine_node.ui_spine_obj"] local bgNode = uiMap["chapter_cell.touch_node.bg"] local armorData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR) @@ -74,6 +75,14 @@ function ChapterCell:refresh(id) starNode:setVisible(false) bgNode:setVisible(false) spineNode:setVisible(true) + spineObj:setVisible(false) + local monsterId = config.monster[#config.monster] + local monsterConfig = ConfigManager:getConfig("monster")[monsterId] + local spineName = monsterConfig.model_id + spineObj:loadAssetAsync(spineName, function() + spineObj:setVisible(true, monsterConfig.model_ui) + spineObj:playAnim("idle", true, false, true) + end, true) end touchNode:addClickListener(function() ModuleManager.DungeonArmorManager:showFightUI(id)