From 73cf5ee6c2d456d8ade0822628fcb32771df4d13 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Thu, 30 Oct 2025 16:38:48 +0800 Subject: [PATCH] fix bug --- lua/app/config/arena_gift.lua | 56 +++---- lua/app/config/arena_rank.lua | 96 ++--------- lua/app/config/chapter.lua | 44 +++++ lua/app/config/func_open.lua | 18 +-- lua/app/config/item.lua | 16 +- lua/app/config/skill.lua | 152 +++++++++++++++++- lua/app/config/strings/cn/tutorial.lua | 8 +- lua/app/config/strings/de/tutorial.lua | 8 +- lua/app/config/strings/en/tutorial.lua | 8 +- lua/app/config/strings/es/tutorial.lua | 8 +- lua/app/config/strings/fr/tutorial.lua | 8 +- lua/app/config/strings/id/tutorial.lua | 8 +- lua/app/config/strings/ja/tutorial.lua | 8 +- lua/app/config/strings/ko/tutorial.lua | 8 +- lua/app/config/strings/pt/tutorial.lua | 8 +- lua/app/config/strings/ru/tutorial.lua | 8 +- lua/app/config/strings/th/tutorial.lua | 8 +- lua/app/config/strings/vi/tutorial.lua | 8 +- lua/app/config/strings/zh/tutorial.lua | 8 +- lua/app/config/tutorial.lua | 52 +++++- lua/app/config/tutorial_start.lua | 6 +- lua/app/global/global_func.lua | 24 +-- .../module/battle/helper/battle_formula.lua | 5 + lua/app/userdata/hero/hero_data_other.lua | 11 +- lua/app/userdata/hero/hero_entity_other.lua | 23 +-- 25 files changed, 412 insertions(+), 195 deletions(-) diff --git a/lua/app/config/arena_gift.lua b/lua/app/config/arena_gift.lua index f0398722..165d69bc 100644 --- a/lua/app/config/arena_gift.lua +++ b/lua/app/config/arena_gift.lua @@ -7,8 +7,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -46,8 +46,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, @@ -98,8 +98,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, @@ -150,8 +150,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, @@ -202,8 +202,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, @@ -254,8 +254,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, @@ -306,8 +306,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" } } }, @@ -358,8 +358,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" } } }, @@ -436,8 +436,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" } } }, @@ -514,8 +514,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" } } }, @@ -592,8 +592,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=4, + ["num_for_nothing"]="Ug==" } } }, @@ -670,8 +670,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=4, + ["num_for_nothing"]="Ug==" } } }, @@ -748,8 +748,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=4, + ["num_for_nothing"]="Ug==" } } }, @@ -813,8 +813,8 @@ local arena_gift = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=4, + ["num_for_nothing"]="Ug==" } } }, diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index a4e16ff3..1dddb855 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -4717,13 +4717,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -4845,13 +4839,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -4973,13 +4961,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5101,13 +5083,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5229,13 +5205,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5357,13 +5327,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5485,13 +5449,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5613,13 +5571,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5741,13 +5693,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5869,13 +5815,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -5997,13 +5937,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -6125,13 +6059,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="end_dmg_dec_all_add", - ["num"]=8000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 31c620b7..e0f1b862 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -2733,6 +2733,14 @@ local chapter = { ["num"]=5, ["num_for_nothing"]="Uw==" }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -2740,6 +2748,14 @@ local chapter = { ["id_for_nothing"]="UgE=", ["num"]=1, ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=19, + ["id_for_nothing"]="VwE=", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["box_num"]={ @@ -2826,12 +2842,24 @@ local chapter = { ["num"]=4, ["probability"]=10000 }, + { + ["type"]=1, + ["id"]=19, + ["num"]=2, + ["probability"]=10000 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["probability"]=625 }, + { + ["type"]=1, + ["id"]=21, + ["num"]=1, + ["probability"]=2500 + }, { ["type"]=1, ["id"]=49, @@ -2848,6 +2876,22 @@ local chapter = { ["num"]=15, ["num_for_nothing"]="Vw0=" }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=19, + ["id_for_nothing"]="VwE=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=21, + ["id_for_nothing"]="VAk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 4ee25172..0b5dd510 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -9,15 +9,15 @@ local func_open = { }, ["mall"]={ ["stage"]=2, - ["pop_ups"]=1 + ["icon"]="module_unlock_mall" }, ["mall_daily"]={ ["stage"]=2, - ["icon"]="module_unlock_dailyshop" + ["pop_ups"]=1 }, ["daily_challenge"]={ ["stage"]=11, - ["icon"]="module_unlock_dailychallenge" + ["pop_ups"]=1 }, ["mail_open"]={ ["stage"]=2, @@ -37,7 +37,7 @@ local func_open = { }, ["talent_open"]={ ["stage"]=5, - ["icon"]="module_unlock_arena" + ["icon"]="module_unlock_talent" }, ["dungeon_open"]={ ["stage"]=8, @@ -45,7 +45,7 @@ local func_open = { }, ["summon_open"]={ ["stage"]=3, - ["pop_ups"]=1 + ["icon"]="module_unlock_summon" }, ["first_charge_1"]={ ["stage"]=1, @@ -75,10 +75,11 @@ local func_open = { }, ["dungeon_gold"]={ ["stage"]=8, - ["icon"]="module_5" + ["icon"]="module_unlock_dungeon" }, ["dungeon_res"]={ - ["stage"]=8 + ["stage"]=8, + ["pop_ups"]=1 }, ["signin_bounty"]={ ["stage"]=8, @@ -94,8 +95,7 @@ local func_open = { }, ["hero_equip"]={ ["stage"]=11, - ["pop_ups"]=1, - ["icon"]="module_9" + ["icon"]="module_unlock_equip" }, ["act_level_gift"]={ ["level"]=3, diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 861fed57..82e19ebd 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -25,7 +25,7 @@ local item = { }, [5]={ ["type"]=2, - ["qlt"]=3, + ["qlt"]=4, ["icon"]="5" }, [6]={ @@ -127,12 +127,12 @@ local item = { }, [19]={ ["type"]=2, - ["qlt"]=3, + ["qlt"]=4, ["icon"]="19" }, [20]={ ["type"]=2, - ["qlt"]=4, + ["qlt"]=5, ["icon"]="20" }, [21]={ @@ -954,7 +954,7 @@ local item = { }, [40]={ ["type"]=6, - ["qlt"]=4, + ["qlt"]=3, ["icon"]="40", ["box_drop"]={ { @@ -991,7 +991,7 @@ local item = { }, [41]={ ["type"]=6, - ["qlt"]=5, + ["qlt"]=4, ["icon"]="41", ["box_drop"]={ { @@ -1028,7 +1028,7 @@ local item = { }, [42]={ ["type"]=12, - ["qlt"]=5, + ["qlt"]=4, ["icon"]="42", ["box_select"]={ { @@ -1249,7 +1249,7 @@ local item = { }, [49]={ ["type"]=6, - ["qlt"]=3, + ["qlt"]=4, ["icon"]="49", ["box_drop"]={ { @@ -1268,7 +1268,7 @@ local item = { }, [50]={ ["type"]=6, - ["qlt"]=4, + ["qlt"]=5, ["icon"]="50", ["box_drop"]={ { diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index a237037e..c2762ea0 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -141,6 +141,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -167,6 +168,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -193,6 +195,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -219,6 +222,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -253,6 +257,7 @@ local skill = { }, ["shake_time"]=300, ["shake_type"]=5, + ["sound"]=1300102, ["name_act"]="skill01", ["name_hit"]={ "suffer01" @@ -422,6 +427,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -448,6 +454,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -474,6 +481,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -500,6 +508,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -534,6 +543,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=1400105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -1311,6 +1321,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1500201, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -1337,6 +1348,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1500202, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -1363,6 +1375,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1500203, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -1389,6 +1402,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1500204, ["name_act"]="attack04", ["name_hit"]={ "suffer01" @@ -1456,6 +1470,7 @@ local skill = { }, ["shake_time"]=150, ["shake_type"]=6, + ["sound"]=1500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1573,6 +1588,7 @@ local skill = { }, ["shake_time"]=150, ["shake_type"]=6, + ["sound"]=1500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1648,6 +1664,7 @@ local skill = { }, ["shake_time"]=150, ["shake_type"]=6, + ["sound"]=1500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1723,6 +1740,7 @@ local skill = { }, ["shake_time"]=150, ["shake_type"]=6, + ["sound"]=1500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -1949,6 +1967,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1600101, ["name_act"]="attack02", ["name_hit"]={ "suffer01" @@ -1975,6 +1994,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1600102, ["name_act"]="attack02", ["name_hit"]={ "suffer01" @@ -2001,6 +2021,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1600103, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -2027,6 +2048,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1600104, ["name_act"]="attack04", ["name_hit"]={ "suffer01" @@ -2098,6 +2120,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=1600105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -2206,6 +2229,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=1600105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -2475,6 +2499,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2300101, ["name_act"]="attack01", ["name_hit"]={ "suffer02" @@ -2501,6 +2526,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2300102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -2527,6 +2553,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2300103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -2553,6 +2580,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2300104, ["name_act"]="attack04", ["name_hit"]={ "suffer01" @@ -2587,6 +2615,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=6, + ["sound"]=2300105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -2740,6 +2769,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2400101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -2766,6 +2796,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2400102, ["name_act"]="attack02", ["name_hit"]={ "suffer01" @@ -2792,6 +2823,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2400103, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -2818,6 +2850,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2400104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -2852,6 +2885,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2400105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -3018,6 +3052,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -3044,6 +3079,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -3070,6 +3106,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -3096,6 +3133,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -3170,6 +3208,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -3253,6 +3292,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -3336,6 +3376,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -3419,6 +3460,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -3533,6 +3575,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500201, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -3559,6 +3602,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500202, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -3585,6 +3629,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500203, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -3611,6 +3656,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2500204, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -3678,6 +3724,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=6, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -3753,6 +3800,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=6, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -3828,6 +3876,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=6, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -3903,6 +3952,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=6, + ["sound"]=2500205, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4033,6 +4083,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2600101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -4059,6 +4110,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2600102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -4085,6 +4137,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2600103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -4111,6 +4164,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=2600104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -4159,6 +4213,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2600105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4215,6 +4270,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2600105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4280,6 +4336,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2600105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4345,6 +4402,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=2600105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4421,6 +4479,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -4447,6 +4506,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -4473,6 +4533,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -4499,6 +4560,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -4550,6 +4612,7 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, + ["sound"]=3300105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -4733,6 +4796,10 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3400101, + ["sound_hit"]={ + 3400111 + }, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -4759,6 +4826,10 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3400102, + ["sound_hit"]={ + 3400111 + }, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -4785,6 +4856,10 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3400103, + ["sound_hit"]={ + 3400111 + }, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -4811,6 +4886,10 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3400104, + ["sound_hit"]={ + 3400111 + }, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -4843,6 +4922,7 @@ local skill = { 2, 0 }, + ["sound"]=3400105, ["name_act"]="skill01", ["fx_self"]=300058, ["fx_self_mirror"]=400058 @@ -4936,6 +5016,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -4962,6 +5043,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -4988,6 +5070,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500103, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -5014,6 +5097,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -5081,6 +5165,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=3500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -5156,6 +5241,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=3500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -5231,6 +5317,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=3500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -5306,6 +5393,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=3500105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -5529,7 +5617,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=3500204, + ["sound"]=3500201, ["name_act"]="attack04", ["name_hit"]={ "suffer01" @@ -5905,6 +5993,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -5931,6 +6020,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4300102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -5957,6 +6047,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4300103, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -5983,6 +6074,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4300104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -6017,6 +6109,7 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, + ["sound"]=4300105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -6186,6 +6279,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4400101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -6212,6 +6306,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4400102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -6238,6 +6333,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4400103, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -6264,6 +6360,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4400104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -6298,6 +6395,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=4400105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -6495,6 +6593,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -6521,6 +6620,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500101, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -6547,6 +6647,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500101, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -6573,6 +6674,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500101, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -6616,6 +6718,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=4500105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -6938,6 +7041,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500201, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -6964,6 +7068,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500202, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -6990,6 +7095,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500203, ["name_act"]="attack03", ["name_hit"]={ "suffer02" @@ -7016,6 +7122,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=4500204, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -7059,6 +7166,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=4500205, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -7214,6 +7322,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -7240,6 +7349,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -7266,6 +7376,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -7292,6 +7403,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -7335,6 +7447,7 @@ local skill = { 2, 0 }, + ["sound"]=5300105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -7417,6 +7530,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5400101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -7443,6 +7557,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5400101, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -7469,6 +7584,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5400101, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -7495,6 +7611,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5400101, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -7529,6 +7646,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=6, + ["sound"]=5400105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -7699,6 +7817,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500201, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -7725,6 +7844,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500201, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -7751,6 +7871,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500201, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -7777,6 +7898,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3500201, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -7851,6 +7973,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=5500105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -7952,6 +8075,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=5500105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -8031,6 +8155,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=5500105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -8098,6 +8223,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5500201, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -8124,6 +8250,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5500202, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -8150,6 +8277,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5500203, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -8176,6 +8304,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5500204, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -8246,6 +8375,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=5500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -8324,6 +8454,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=5500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -8402,6 +8533,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=5500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -8480,6 +8612,7 @@ local skill = { }, ["shake_time"]=250, ["shake_type"]=5, + ["sound"]=5500205, ["name_act"]="skill01", ["name_hit"]={ "suffer02", @@ -12718,6 +12851,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -12742,6 +12876,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -12766,6 +12901,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -12790,6 +12926,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=3300104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -12840,6 +12977,7 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, + ["sound"]=3300105, ["name_act"]="skill01", ["name_hit"]={ "suffer01", @@ -12884,6 +13022,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -12908,6 +13047,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -12932,6 +13072,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -12956,6 +13097,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=5300104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -12963,7 +13105,7 @@ local skill = { ["fx_self"]=400027 }, [40011]={ - ["battle_icon"]="45002", + ["battle_icon"]="53001", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -12987,6 +13129,7 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, + ["sound"]=5300105, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -13012,6 +13155,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300101, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -13037,6 +13181,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300102, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -13062,6 +13207,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300103, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -13087,6 +13233,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=1300104, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -13119,6 +13266,7 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, + ["sound"]=1300105, ["name_act"]="skill01", ["name_hit"]={ "suffer01" diff --git a/lua/app/config/strings/cn/tutorial.lua b/lua/app/config/strings/cn/tutorial.lua index e8f9a7b8..3a6ca0fb 100644 --- a/lua/app/config/strings/cn/tutorial.lua +++ b/lua/app/config/strings/cn/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="请点击这里查看对战规则。" + }, + ["tutorial_txt_14"]={ + ["value"]="英雄召唤功能开启了，可以召唤额外英雄。" + }, + ["tutorial_txt_15"]={ + ["value"]="每天都有1次免费召唤。" } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/tutorial.lua b/lua/app/config/strings/de/tutorial.lua index e25fa088..e28ff582 100644 --- a/lua/app/config/strings/de/tutorial.lua +++ b/lua/app/config/strings/de/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua index 7f58f2a5..1c22a5e8 100644 --- a/lua/app/config/strings/en/tutorial.lua +++ b/lua/app/config/strings/en/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="Please click here to view the battle rules." + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/tutorial.lua b/lua/app/config/strings/es/tutorial.lua index 2caec347..79431b81 100644 --- a/lua/app/config/strings/es/tutorial.lua +++ b/lua/app/config/strings/es/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="Haz clic aquí para ver las reglas del juego." + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/tutorial.lua b/lua/app/config/strings/fr/tutorial.lua index e25fa088..e28ff582 100644 --- a/lua/app/config/strings/fr/tutorial.lua +++ b/lua/app/config/strings/fr/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/tutorial.lua b/lua/app/config/strings/id/tutorial.lua index 7aca395d..480de122 100644 --- a/lua/app/config/strings/id/tutorial.lua +++ b/lua/app/config/strings/id/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="Silakan ketuk di sini untuk melihat aturan battle." + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/tutorial.lua b/lua/app/config/strings/ja/tutorial.lua index 3e00d82e..961a37a8 100644 --- a/lua/app/config/strings/ja/tutorial.lua +++ b/lua/app/config/strings/ja/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="ここをタップして、対戦ルールを確認してください。" + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/tutorial.lua b/lua/app/config/strings/ko/tutorial.lua index b706ab01..c9d2d21f 100644 --- a/lua/app/config/strings/ko/tutorial.lua +++ b/lua/app/config/strings/ko/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="대결 규칙을 보려면 이곳을 클릭해 주세요." + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/tutorial.lua b/lua/app/config/strings/pt/tutorial.lua index ffbd3735..9ab454b5 100644 --- a/lua/app/config/strings/pt/tutorial.lua +++ b/lua/app/config/strings/pt/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="Confira as regras de batalha aqui." + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/tutorial.lua b/lua/app/config/strings/ru/tutorial.lua index e25fa088..e28ff582 100644 --- a/lua/app/config/strings/ru/tutorial.lua +++ b/lua/app/config/strings/ru/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/tutorial.lua b/lua/app/config/strings/th/tutorial.lua index 0ae43af8..613c0ae4 100644 --- a/lua/app/config/strings/th/tutorial.lua +++ b/lua/app/config/strings/th/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="กรุณาแตะที่นี่เพื่อดูกติกาของเกม" + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/tutorial.lua b/lua/app/config/strings/vi/tutorial.lua index 940516aa..9c5c1556 100644 --- a/lua/app/config/strings/vi/tutorial.lua +++ b/lua/app/config/strings/vi/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="Hãy ấn vào đây xem quy tắc." + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/tutorial.lua b/lua/app/config/strings/zh/tutorial.lua index ded2707b..cfa354bd 100644 --- a/lua/app/config/strings/zh/tutorial.lua +++ b/lua/app/config/strings/zh/tutorial.lua @@ -37,9 +37,15 @@ local tutorial = { }, ["tutorial_txt_13"]={ ["value"]="請點擊這裡查看對戰規則。" + }, + ["tutorial_txt_14"]={ + + }, + ["tutorial_txt_15"]={ + } } local config = { -data=tutorial,count=13 +data=tutorial,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 9f73453b..b3f35255 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -243,11 +243,6 @@ local tutorial = { ["arrow_offset"]={ 0, 0 - }, - ["circle_r"]=100, - ["circle_offset"]={ - 0, - 0 } }, [30010]={ @@ -273,6 +268,7 @@ local tutorial = { 0, 0 }, + ["show_mask"]=1, ["square_size"]={ 50, 50 @@ -295,6 +291,15 @@ local tutorial = { ["arrow_offset"]={ 0, 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 50, + 50 + }, + ["square_offset"]={ + 0, + 0 } }, [40010]={ @@ -486,9 +491,44 @@ local tutorial = { 0, 50 } + }, + [60000]={ + ["next_id"]=60010, + ["type"]=3, + ["txt"]="tutorial_txt_14", + ["txt_offset"]={ + 0, + 0 + }, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right_btn", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ + 0, + 0 + } + }, + [60010]={ + ["type"]=3, + ["txt"]="tutorial_txt_15", + ["txt_offset"]={ + 0, + 0 + }, + ["target_name"]="summon_main_ui(Clone)/node/btn_summon_free", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + } } } local config = { -data=tutorial,count=38 +data=tutorial,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial_start.lua b/lua/app/config/tutorial_start.lua index 5fb00230..50ad3da0 100644 --- a/lua/app/config/tutorial_start.lua +++ b/lua/app/config/tutorial_start.lua @@ -18,9 +18,13 @@ local tutorial_start = { [5]={ ["start_id"]=50000, ["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab" + }, + [6]={ + ["start_id"]=60000, + ["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab" } } local config = { -data=tutorial_start,count=5 +data=tutorial_start,count=6 } return config \ No newline at end of file diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 0d708a76..3a7526aa 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -1828,34 +1828,24 @@ function GFunc.formatPlayerFormationInfo(info) -- 处理全局属性 local attr = {} - attr[GConst.ATTR_ALL.ATTR_ATK_ALL] = allAttr[GConst.ATTR_ALL.ATTR_ATK_ALL] - attr[GConst.ATTR_ALL.ATTR_HP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_HP_ALL] - attr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = allAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] - attr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = allAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL] - attr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = allAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] - attr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] - attr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] - attr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = allAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL] + for _, v in pairs(GConst.ATTR_ALL) do + attr[v] = allAttr[v] + end DataManager.HeroDataOther:setTalentAttr(attr) end for index, info in ipairs(info.heroes) do + -- 只是配置检测 if DataManager.HeroData:isExistHeroById(info.id) then local heroEntity = DataManager.HeroDataOther:getEntity(info) formation[heroEntity:getMatchType()] = heroEntity end end - if not info.equips then - info.equips = {} - end - if not info.skins then - info.skins = {} - end - if not info.heroes_runes then - info.heroes_runes = {} - end + info.equips = info.equips or {} + info.skins = info.skins or {} + info.heroes_runes = info.heroes_runes or {} -- 有全局的属性 需要在最后重新计算 for _, entity in pairs(formation) do diff --git a/lua/app/module/battle/helper/battle_formula.lua b/lua/app/module/battle/helper/battle_formula.lua index 94473385..86cdf63e 100644 --- a/lua/app/module/battle/helper/battle_formula.lua +++ b/lua/app/module/battle/helper/battle_formula.lua @@ -83,6 +83,11 @@ BattleFormula.calculateFormula = { end local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR -- 基础值(攻击 * 技能倍率) + -- local a = unitComp.unitEntity:getDmgAddition() -- (攻击者元素伤害增加 + 所有伤害增加) + -- local b = unitComp.unitEntity:getDmgDec() -- (攻击者元素伤害降低 + 所有伤害降低) + -- local c = targetUnit.unitEntity:getWeakness(atkMatchType) -- (受击者受到元素伤害增加 + 受到所有伤害增加) + -- local d = targetUnit.unitEntity:getDecDmg(atkMatchType) -- (受击者受到元素伤害降低 + 受到所有伤害降低) + -- local e = skillPAdd + monsterDmgPAdd -- 技能增伤百分比 result = result * (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() -- (攻击者元素伤害增加 + 所有伤害增加) - unitComp.unitEntity:getDmgDec() -- (攻击者元素伤害降低 + 所有伤害降低) diff --git a/lua/app/userdata/hero/hero_data_other.lua b/lua/app/userdata/hero/hero_data_other.lua index a9db75b7..34221d1d 100644 --- a/lua/app/userdata/hero/hero_data_other.lua +++ b/lua/app/userdata/hero/hero_data_other.lua @@ -38,13 +38,12 @@ function HeroDataOther:setTalentAttr(attr) end function HeroDataOther:calcAttr() - self.allAtkpAttr = {} + self.allAtkpAttr = {{}, {}, {}, {}, {}} for heroId, attrs in pairs(self.allAtkpAttrByHero) do - -- self.baseAttrOriginal[ATTR_NAME.ATK_RED] = 0 - local matchType = self:getMatchType(heroId) - self.allAtkpAttr[matchType] = self.allAtkpAttr[matchType] or {} - for k,v in pairs(attrs) do - self.allAtkpAttr[matchType][k] = (self.allAtkpAttr[matchType][k] or 0) + v + for matchType, v in ipairs(self.allAtkpAttr) do + for k, vv in pairs(attrs) do + self.allAtkpAttr[matchType][k] = (self.allAtkpAttr[matchType][k] or 0) + vv + end end end diff --git a/lua/app/userdata/hero/hero_entity_other.lua b/lua/app/userdata/hero/hero_entity_other.lua index 4884c5b8..3f6a8119 100644 --- a/lua/app/userdata/hero/hero_entity_other.lua +++ b/lua/app/userdata/hero/hero_entity_other.lua @@ -85,28 +85,9 @@ function HeroEntity:_updateAllAttr() for k, v in pairs(equipAttr) do self.allAttr[k] = (self.allAttr[k] or 0) + v end --- GConst.ALL_ATTR = { --- ATTR_ATK_ALL = "atk_all", -- 全体英雄攻击（固定值） --- ATTR_HP_ALL = "attr_hp_all", -- 全体英雄生命（固定值） --- ATTR_DMGDEC_ALL = "attr_dmgdec_all", -- 全体减伤（固定值） --- ATTR_CRIT_ALL = "attr_crit_all", -- 全体暴击率 --- ATTR_CRIT_TIME_ALL = "attr_crit_time_all", -- 全体暴击伤害 --- ATTR_NORMAL_HURTP_ALL = "attr_normal_hurtp_all",-- 全体普攻增伤（百分比） --- ATTR_SKILL_HURTP_ALL = "attr_skill_hurtp_all", -- 全体技能增伤（百分比） --- ATTR_ATKP_ALL = "attr_atkp_all", -- 全体攻击（百分比） --- } -- 同属性通用加成 self.allAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_ATK_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_HP_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_DMGDEC_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_CRIT_TIME_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_NORMAL_HURTP_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_SKILL_HURTP_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_ATKP_ALL] = nil - -- self.allAttr[GConst.ATTR_ALL.ATTR_HPP_ALL] = nil for _, v in pairs(GConst.ATTR_ALL) do self.allAttr[v] = nil end @@ -151,7 +132,7 @@ function HeroEntity:_updateAllAttr() end function HeroEntity:getGlobalAttrByType(attrType) - return DataManager.HeroData:getAttrByMatchType(self:getMatchType(), attrType) or 0 + return DataManager.HeroDataOther:getAttrByMatchType(self:getMatchType(), attrType) or 0 end function HeroEntity:_getAllBaseAttr() @@ -189,7 +170,7 @@ function HeroEntity:_updateAllBaseAttr() attr[v] = self.allBaseAttr[v] end - DataManager.HeroData:setHeroAttr(self:getCfgId(), attr) + DataManager.HeroDataOther:setHeroAttr(self:getCfgId(), attr) end -- 更新英雄基础属性