diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua index 2e850f78..f717a09d 100644 --- a/lua/app/config/bounty_level.lua +++ b/lua/app/config/bounty_level.lua @@ -7,8 +7,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -27,8 +27,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -67,8 +67,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -87,8 +87,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -127,8 +127,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -147,8 +147,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -185,18 +185,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -208,8 +208,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -228,8 +228,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -268,8 +268,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -288,8 +288,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -328,8 +328,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -348,8 +348,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -386,18 +386,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -409,8 +409,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -429,8 +429,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -469,8 +469,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -489,8 +489,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -529,8 +529,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -549,8 +549,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -587,18 +587,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -610,8 +610,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -630,8 +630,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -670,8 +670,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -690,8 +690,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -730,8 +730,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -750,8 +750,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -788,18 +788,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -811,8 +811,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -831,8 +831,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -871,8 +871,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -891,8 +891,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -931,8 +931,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -951,8 +951,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -989,18 +989,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1012,8 +1012,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1032,8 +1032,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1072,8 +1072,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1092,8 +1092,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1132,8 +1132,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1152,8 +1152,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1190,18 +1190,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1213,8 +1213,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1233,8 +1233,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1273,8 +1273,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1293,8 +1293,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1333,8 +1333,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1353,8 +1353,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1391,18 +1391,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1414,8 +1414,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1434,8 +1434,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1474,8 +1474,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1494,8 +1494,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1534,8 +1534,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1554,8 +1554,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1592,18 +1592,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1613,8 +1613,8 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1633,10 +1633,10 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, [202]={ @@ -1805,16 +1805,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2006,16 +2006,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2207,16 +2207,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2408,16 +2408,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=18, + ["id_for_nothing"]="VwA=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2609,16 +2609,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2810,16 +2810,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=18, + ["id_for_nothing"]="VwA=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -3011,16 +3011,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -3212,16 +3212,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -3233,8 +3233,8 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index b97c6a32..908c6726 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -14,9 +14,9 @@ local chapter = { }, ["involved_skill"]={ { - 3200101, - 2200101, - 4200101 + 3200100, + 2200100, + 4200100 } }, ["not_involved_skill"]={ diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 82f2a069..74adf7f7 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -4,10 +4,10 @@ local func_open = { ["pop_ups"]=1 }, ["bounty_open"]={ - ["stage"]=2 + ["stage"]=3 }, ["task"]={ - ["stage"]=2 + ["stage"]=3 }, ["act_level_gift"]={ ["level"]=5 diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index f275e7ae..aaa5658b 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -113,7 +113,7 @@ local hero = { ["model_id"]="p0014", ["icon"]="5", ["item_id"]=13001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [13002]={ ["position"]=1, @@ -171,7 +171,7 @@ local hero = { ["model_id"]="p0009", ["icon"]="5", ["item_id"]=13002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [14001]={ ["position"]=1, @@ -229,7 +229,7 @@ local hero = { ["model_id"]="p0011", ["icon"]="5", ["item_id"]=14001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [22001]={ ["position"]=2, @@ -345,7 +345,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="5", ["item_id"]=23001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [23002]={ ["position"]=2, @@ -403,7 +403,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="5", ["item_id"]=23002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [24001]={ ["position"]=2, @@ -461,7 +461,7 @@ local hero = { ["model_id"]="p0007", ["icon"]="7", ["item_id"]=24001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [32001]={ ["position"]=3, @@ -577,7 +577,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="6", ["item_id"]=33001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [33002]={ ["position"]=3, @@ -635,7 +635,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="6", ["item_id"]=33002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [34001]={ ["position"]=3, @@ -693,7 +693,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="6", ["item_id"]=34001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [42001]={ ["position"]=4, @@ -809,7 +809,7 @@ local hero = { ["model_id"]="p0003", ["icon"]="3", ["item_id"]=43001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [43002]={ ["position"]=4, @@ -867,7 +867,7 @@ local hero = { ["model_id"]="p0003", ["icon"]="3", ["item_id"]=43002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [44001]={ ["position"]=4, @@ -925,7 +925,7 @@ local hero = { ["model_id"]="p0008", ["icon"]="8", ["item_id"]=44001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [52001]={ ["position"]=5, @@ -1041,7 +1041,7 @@ local hero = { ["model_id"]="p0004", ["icon"]="4", ["item_id"]=53001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [53002]={ ["position"]=5, @@ -1099,7 +1099,7 @@ local hero = { ["model_id"]="p0004", ["icon"]="4", ["item_id"]=53002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [54001]={ ["position"]=5, @@ -1157,7 +1157,7 @@ local hero = { ["model_id"]="p0004", ["icon"]="4", ["item_id"]=54001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 } } local config = { diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 03f96338..b8f2df96 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -2830,7 +2830,6 @@ local skill_rogue = { }, [5200107]={ ["unlock"]=5200105, - ["cover_unlock"]=5200105, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=4, diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua index 3bf4c0de..e3a1412a 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -3,40 +3,64 @@ local hero = { ["name"]="舞娘" }, [13001]={ - ["name"]="独臂哥" + ["name"]="克劳德" }, [13002]={ ["name"]="火旺" }, [14001]={ - ["name"]="铁锤赵" + ["name"]="亚历山大" }, [22001]={ - ["name"]="黑刀妹" + ["name"]="刀妹" }, [23001]={ ["name"]="野蛮人" }, + [23002]={ + ["name"]="二丫" + }, [24001]={ - ["name"]="魔童剑士" + ["name"]="巨剑魔童" }, [32001]={ - ["name"]="洋葱骑士" + ["name"]="洋葱头" }, [33001]={ ["name"]="小鹿" }, + [33002]={ + ["name"]="森林狼" + }, + [34001]={ + ["name"]="木兰" + }, [42001]={ - ["name"]="法师" + ["name"]="蓝法" + }, + [43001]={ + ["name"]="冰女" + }, + [43002]={ + ["name"]="鸦姐" }, [44001]={ - ["name"]="冰刃" + ["name"]="寒冰妖姬" }, [52001]={ - ["name"]="忍者" + ["name"]="忍者伦" + }, + [53001]={ + ["name"]="魔女琪琪" + }, + [53002]={ + ["name"]="灵魂猎手" + }, + [54001]={ + ["name"]="蝴蝶" } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 50097ec6..5e2d05f1 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -1,63 +1,63 @@ local skill = { [1200120]={ - ["desc"]="红R舞女-舞步消散将左右2格元素进行消除,并造成一次伤害" + ["desc"]="舞步消散：沿横向消除5格，并造成一次技能伤害。" }, [1300120]={ - ["desc"]="红SR-克劳德-技能攻击500%多段（3段）" + ["desc"]="巨剑旋风：额外造成多次技能伤害。" }, [1300220]={ - ["desc"]="红SR-武僧-技能400%攻击+50%几率灼烧+上下消除2格" + ["desc"]="炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。" }, [1400120]={ - ["desc"]="红SSR-铁锤小孩-技能攻击600%+上下4个元素变为当前连接色" + ["desc"]="钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。" }, [2200120]={ - ["desc"]="黄R黑妹拔刀斩使用一次拔刀斩终结技，造成大量伤害400%伤害" + ["desc"]="拔刀斩：额外造成一次技能伤害。" }, [2300120]={ - ["desc"]="黄SR野蛮人技能多段伤害4段500%" + ["desc"]="骨旋风：额外造成多次技能伤害。" }, [2300220]={ - ["desc"]="黄SR二丫技能攻击500%(配334%）+链接增伤50%" + ["desc"]="幻影剑袭：使用后本次技能伤害提升，并额外造成多次大量技能伤害。" }, [2400120]={ - ["desc"]="巨剑罗伯特巨剑连斩巨剑造成大量伤害。" + ["desc"]="巨剑轰击：额外造成一次巨量技能伤害。" }, [3200120]={ - ["desc"]="绿R洋葱技能使用一次长枪突刺终结技，造成大量伤害" + ["desc"]="长枪突刺：额外造成一次技能伤害。" }, [3300120]={ - ["desc"]="绿SR小鹿快速治愈恢复以艾芙琳攻击力*150%的生命值" + ["desc"]="急速治疗：使用后本次恢复生命。" }, [3300220]={ - ["desc"]="绿SR森林狼技能攻击500%(配334%）+链接增伤50%" + ["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。" }, [3400120]={ - ["desc"]="绿SSR花木兰技能攻击700%配437.5%+链接增伤60%" + ["desc"]="流星追月：使用后本次伤害提升，并一次巨量技能伤害。" }, [4200120]={ - ["desc"]="蓝R莉莉丝元素链接随机额外消除3个元素,并造成伤害" + ["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。" }, [4300120]={ - ["desc"]="蓝SR冰女技能攻击400%+冰霜1回合" + ["desc"]="冰女：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300220]={ - ["desc"]="蓝SR鸦姐技能攻击400%+100%腐败1回合" + ["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4400120]={ - ["desc"]="蓝SSR冰刃霜冻剑舞随机消除4个元素，释放一次附带冰霜1回合效果的剑舞攻击。" + ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" }, [5200120]={ - ["desc"]="紫R艾伦魔法罩生成一个魔法罩持续1回合，可承受最大生命值10%伤害" + ["desc"]="护盾术：为团队附加一个护盾，1回合。" }, [5300120]={ - ["desc"]="紫SR女巫技能攻击500%" + ["desc"]="魔女琪琪：额外造成一次大量技能伤害。" }, [5300220]={ - ["desc"]="紫SR德古拉技能攻击500%" + ["desc"]="灵魂猎手：额外造成一次大量技能伤害。" }, [5400120]={ - ["desc"]="紫SSR蝴蝶技能攻击600%" + ["desc"]="蝴蝶：额外造成一次大量技能伤害。" } } local config = { diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 0142fa1f..3ad8b63b 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -132,484 +132,484 @@ local skill_rogue = { ["desc"]="将场上随机5个非紫色元素变为紫色" }, [1200100]={ - ["desc"]="解锁舞步消散：将左右2格元素进行消除" + ["desc"]="解锁舞步消散：沿横向消除5格，并造成一次技能伤害。" }, [1200101]={ - ["desc"]="舞步消散上下可多消1格" + ["desc"]="舞步消散纵向可额外消除2格。" }, [1200102]={ - ["desc"]="舞步消散使用时本次普攻伤害提升10%" + ["desc"]="舞步消散使用时本次普攻伤害提升10%。" }, [1200103]={ - ["desc"]="舞步消散对冰霜敌人的伤害增加" + ["desc"]="舞步消散对冰霜敌人的伤害增加50%。" }, [1200104]={ - ["desc"]="舞步消散上下左右可多消1格" + ["desc"]="舞步消散横向和纵向可额外消除2格。" }, [1200105]={ - ["desc"]="舞步消散链接超过5个元素附加亢奋效果，持续2回合" + ["desc"]="舞步消散链接超过5个元素附加亢奋效果，2回合。" }, [1200106]={ - ["desc"]="舞步消散的这个英雄攻击力提升" + ["desc"]="舞娘攻击提升15%。" }, [1200107]={ - ["desc"]="链接元素要求减为3个，并且附加2层亢奋效果" + ["desc"]="舞步消散附加亢奋效果的要求降低到链接超过3个元素。" }, [1300100]={ - ["desc"]="解锁破坏旋风：造成大量伤害" + ["desc"]="解锁巨剑旋风：额外造成多次技能伤害。" }, [1300101]={ - ["desc"]="破坏旋风附加灼烧效果，持续2回合" + ["desc"]="巨剑旋风可附加灼烧效果，2回合。" }, [1300102]={ - ["desc"]="破坏旋风对流血敌人的伤害增加" + ["desc"]="巨剑旋风对流血敌人的伤害增加50%。" }, [1300103]={ - ["desc"]="破坏旋风的伤害提升（300%)多段换技能" + ["desc"]="巨剑旋风技能伤害提升。" }, [1300104]={ - ["desc"]="破坏旋风的灼烧效果提升" + ["desc"]="巨剑旋风附加的灼烧伤效果，伤害提升。" }, [1300105]={ - ["desc"]="破坏旋风链接超过4个元素时，伤害提升30%，持续2回合。" + ["desc"]="巨剑旋风链接超过4个元素，伤害提升30%，2回合。" }, [1300106]={ - ["desc"]="破坏旋风链接超过4个元素时伤害提升效果持续回合数+1" + ["desc"]="巨剑旋风附加的伤害提升效果，回合数+1。" }, [1300107]={ - ["desc"]="释放破坏旋风的回合击杀敌人则施加2回合亢奋效果" + ["desc"]="巨剑旋风击杀敌人则附加亢奋效果，2回合。" }, [1300200]={ - ["desc"]="解锁炎拳：400%攻击+50%几率灼烧+上下消除2格" + ["desc"]="解锁炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。" }, [1300201]={ - ["desc"]="炎拳左右多消除2格" + ["desc"]="炎拳沿横向可额外消除4格。" }, [1300202]={ - ["desc"]="炎拳对禁锢敌人的伤害增加（增加技能）" + ["desc"]="炎拳对禁锢敌人的伤害增加50%。" }, [1300203]={ - ["desc"]="灼烧几率提高到100%（换技能ID）" + ["desc"]="炎拳的灼烧概率提高到100%。" }, [1300204]={ - ["desc"]="炎拳上下多消除1格" + ["desc"]="炎拳纵向可额外消除2格。" }, [1300205]={ - ["desc"]="炎拳施加的灼烧效果伤害提升50%" + ["desc"]="炎拳附加的灼烧效果，伤害提升。" }, [1300206]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="火旺攻击提升15%。" }, [1300207]={ - ["desc"]="炎拳攻击可释放2次" + ["desc"]="炎拳攻击将释放2次。" }, [1400100]={ - ["desc"]="解锁铁锤双击：攻击600%+上下左右4个元素变色" + ["desc"]="解锁钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。" }, [1400101]={ - ["desc"]="攻击附加灼烧2回合（增加技能）" + ["desc"]="钢铁重击可附加灼烧效果，2回合。" }, [1400102]={ - ["desc"]="如果目标有眩晕则施加一个2回合的眩晕效果（增加技能）" + ["desc"]="钢铁重击对眩晕敌人再施附加眩晕效果，2回合。" }, [1400103]={ - ["desc"]="对流血敌人的伤害额外造成300%伤害（增加技能）" + ["desc"]="钢铁重击对流血敌人额外造成1次伤害。" }, [1400104]={ - ["desc"]="有50%概率眩晕敌人2回合（增加技能）" + ["desc"]="钢铁重击50%概率附加眩晕，2回合。" }, [1400105]={ - ["desc"]="灼烧伤害提升+灼烧回合数+1（替换技能）" + ["desc"]="钢铁重击附加的灼烧效果，伤害提升，回合数+1。" }, [1400106]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="亚历山大攻击提升15%。" }, [1400107]={ - ["desc"]="连接每超过4个则额外发射1个火球造成伤害(增加技能)" + ["desc"]="钢铁重击每连接超过4个元素则额外发射1个火球造成伤害。" }, [2200100]={ - ["desc"]="解锁拔刀斩：卡拉使用一次拔刀斩终结技，造成大量伤害" + ["desc"]="解锁拔刀斩：额外造成一次技能伤害。" }, [2200101]={ - ["desc"]="拔刀斩伤害提升" + ["desc"]="拔刀斩技能伤害提升。" }, [2200102]={ - ["desc"]="拔刀斩释放时上下左右各消除1格" + ["desc"]="拔刀斩沿＋方向可额外消除4格。" }, [2200103]={ - ["desc"]="拔刀斩对灼烧敌人的伤害增加" + ["desc"]="拔刀斩对灼烧敌人的伤害增加50%。" }, [2200104]={ - ["desc"]="拔刀斩的这个英雄攻击力提升" + ["desc"]="刀妹攻击提升15%。" }, [2200105]={ - ["desc"]="拔刀斩终结技可放2次" + ["desc"]="拔刀斩攻击将释放2次。" }, [2200106]={ - ["desc"]="拔刀斩可消除4个斜方向的元素" + ["desc"]="拔刀斩沿X方向可额外消除4格。" }, [2200107]={ - ["desc"]="拔刀斩链接超过5个元素后，拔刀斩伤害提高（技能伤害提高）" + ["desc"]="拔刀斩链接超过5个元素，则技能伤害提高。" }, [2300100]={ - ["desc"]="解锁旋风骨：野蛮人使用的终结技，造成大量伤害" + ["desc"]="解锁骨旋风：额外造成多次技能伤害。" }, [2300101]={ - ["desc"]="旋风骨造成伤害时对对手附加2回合流血效果" + ["desc"]="旋风骨可附加流血效果，2回合。" }, [2300102]={ - ["desc"]="技能倍率提升300%（换技能ID）" + ["desc"]="旋风骨技能伤害提升。" }, [2300103]={ - ["desc"]="攻击昏睡敌人有50%概率附加眩晕效果1回合" + ["desc"]="旋风骨对昏睡敌人有50%概率附加眩晕效果，1回合。" }, [2300104]={ - ["desc"]="流血回合数增加1（替换上面技能）" + ["desc"]="旋风骨附加的流血效果，回合数+1。" }, [2300105]={ - ["desc"]="每有一名流血中的敌人死亡提升黄sir的攻击力10%，本局生效" + ["desc"]="每有1名敌人因流血死亡，则野蛮人伤害提升10%。" }, [2300106]={ - ["desc"]="眩晕回合数+1（替换上面技能）" + ["desc"]="旋风骨附加的眩晕效果，回合数+1。" }, [2300107]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="野蛮人攻击提升15%。" }, [2300200]={ - ["desc"]="解锁刺剑突破：造成一次伤害，连接增伤" + ["desc"]="解锁幻影剑袭：使用后本次技能伤害提升，并额外造成多次大量技能伤害。" }, [2300201]={ - ["desc"]="刺剑突破上下左右可消除1格" + ["desc"]="幻影剑袭沿＋方向可额外消除4格。" }, [2300202]={ - ["desc"]="本英雄的攻击力提高" + ["desc"]="二丫攻击提升15%。" }, [2300203]={ - ["desc"]="刺剑突破使用时本次普攻伤害提升15%" + ["desc"]="幻影剑袭使用时本次普攻伤害提升10%。" }, [2300204]={ - ["desc"]="刺剑突破可消除4个斜方向的元素" + ["desc"]="幻影剑袭沿X方向可额外消除4格。" }, [2300205]={ - ["desc"]="刺剑突破链接超4个元素，本回合暴击提升20%。（增加技能）" + ["desc"]="幻影剑袭链接超过4个元素，本回合暴击提升20%。" }, [2300206]={ - ["desc"]="刺剑突破链接超4个元素，本回合暴击提升30%。（增加技能）" + ["desc"]="幻影剑袭链接超过4个元素，本回合暴击提升30%。" }, [2300207]={ - ["desc"]="刺剑突破链接后本回合对50%以下敌人暴击伤害提升50%（增加技能）" + ["desc"]="幻影剑袭使用时本回合对生命值50%以下的敌人暴击伤害提升50%。" }, [2400100]={ - ["desc"]="解锁巨剑连斩：造成巨大伤害" + ["desc"]="解锁巨剑轰击：额外造成一次巨量技能伤害。" }, [2400101]={ - ["desc"]="巨剑连被连接消除其4个斜方向消除1格" + ["desc"]="巨剑轰击沿X方向可额外消除4格。" }, [2400102]={ - ["desc"]="攻击冻结敌人几率破碎冰块(冻结改为眩晕2回合)，造成巨额伤害" + ["desc"]="巨剑轰击对冻结敌人伤害大服增加，并有50%概率附加眩晕效果，1回合。" }, [2400103]={ - ["desc"]="冻结的敌人眩晕几率提高" + ["desc"]="巨剑轰击附加眩晕效果的概率提高到70%。" }, [2400104]={ - ["desc"]="本英雄的攻击力提高" + ["desc"]="巨剑魔童攻击提升15%。" }, [2400105]={ - ["desc"]="巨剑连斩技能伤害增加，且几率附加禁锢（换技能ID）" + ["desc"]="巨剑轰击技能伤害大服增加，并有50%概率附加禁锢效果，1回合。" }, [2400106]={ - ["desc"]="禁锢几率提升（继续换技能ID）" + ["desc"]="巨剑轰击附加禁锢效果的概率提高到70%。" }, [2400107]={ - ["desc"]="巨剑连斩造成双倍伤害" + ["desc"]="巨剑轰击将造成双倍伤害。" }, [3200100]={ - ["desc"]="解锁长枪突刺：造成一次大量伤害。" + ["desc"]="解锁长枪突刺：额外造成一次技能伤害。" }, [3200101]={ ["desc"]="长枪突刺可恢复一定量生命。" }, [3200102]={ - ["desc"]="长枪突刺对中毒的目标伤害增加" + ["desc"]="长枪突刺对中毒敌人的伤害增加50%。" }, [3200103]={ ["desc"]="长枪突刺伤害提升。" }, [3200104]={ - ["desc"]="长枪突刺可消除4个斜方向的元素" + ["desc"]="长枪突刺沿X方向可额外消除4格。" }, [3200105]={ - ["desc"]="长枪突刺有30%几率眩晕一回合" + ["desc"]="长枪突刺有30%概率附加眩晕效果，1回合。" }, [3200106]={ ["desc"]="长枪突刺眩晕几率提高20%" }, [3200107]={ - ["desc"]="长枪突刺结束后附加50%格挡，持续2回合" + ["desc"]="长枪突刺后为团队增加20%格挡，2回合" }, [3300100]={ - ["desc"]="解锁快速治愈：立即恢复80%攻击力的生命值" + ["desc"]="解锁急速治疗：使用后本次恢复生命。" }, [3300101]={ - ["desc"]="提升快速治愈的回血量" + ["desc"]="急速治疗回血效果提升。" }, [3300102]={ - ["desc"]="快速治愈使用时本次普攻伤害提升15%" + ["desc"]="急速治疗使用时本次普攻伤害提升15%。" }, [3300103]={ - ["desc"]="快速治愈上下左右可消除1格" + ["desc"]="急速治疗沿＋方向可额外消除4格。" }, [3300104]={ - ["desc"]="释放时同时释放技能伤害提升，持续2回合(增加技能)" + ["desc"]="急速治疗额外为团队提供技能伤害提升效果，2回合。" }, [3300105]={ - ["desc"]="连接快速治愈的每一击都将恢复以艾芙琳攻击力*5%的生命值" + ["desc"]="急速治疗使用时本次普攻每一击都将恢复生命。" }, [3300106]={ - ["desc"]="技能伤害提升持续回合数+1（增加技能）" + ["desc"]="急速治疗附加的技能伤害提升效果，回合数+1。" }, [3300107]={ - ["desc"]="链接超过5个元素回血量提升" + ["desc"]="急速治疗链接超过5个元素，回血效果提升。" }, [3300200]={ - ["desc"]="解锁致命爪击：攻击500%(配334%）+链接增伤50%" + ["desc"]="解锁森林狼技能：使用后本次伤害提升，并造成多次技能伤害。" }, [3300201]={ - ["desc"]="攻击50%几率附加易伤（增加技能）" + ["desc"]="森林狼技能有50%概率附加易伤效果，2回合。" }, [3300202]={ - ["desc"]="致命爪击使用时本次普攻伤害提升15%" + ["desc"]="森林狼技能使用时本次普攻伤害提升15%。" }, [3300203]={ - ["desc"]="致命爪击技能伤害提升300%" + ["desc"]="森林狼技能伤害提升。" }, [3300204]={ - ["desc"]="致命爪击攻击中毒敌人有50%概率额外增加1层中毒2回合（更换技能ID）" + ["desc"]="森林狼技能对中毒敌人有50%概率附加中毒效果，2回合。" }, [3300205]={ - ["desc"]="致命爪击增加的中毒伤害翻倍" + ["desc"]="森林狼技能附加的中毒效果，伤害提升。" }, [3300206]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="森林狼技能攻击提升15%。" }, [3300207]={ - ["desc"]="致命爪击攻击中毒敌人有100%概率额外增加1层中毒2回合（更换技能ID）" + ["desc"]="森林狼技能对中毒敌人有100%概率附加中毒效果，2回合。" }, [3400100]={ - ["desc"]="解锁花木兰技能：攻击700%配437.5%+链接增伤60%" + ["desc"]="解锁流星追月：使用后本次伤害提升，并一次巨量技能伤害。" }, [3400101]={ - ["desc"]="攻击百分比增加易伤（增加技能）" + ["desc"]="流星追月可附加易伤效果，2回合。" }, [3400102]={ - ["desc"]="上下左右消除1格" + ["desc"]="流星追月沿＋方向可额外消除4格。" }, [3400103]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="木兰攻击提升15%。" }, [3400104]={ - ["desc"]="易伤效果提升10%（增加技能）" + ["desc"]="流星追月附加的易伤效果，效果提升。" }, [3400105]={ - ["desc"]="攻击附加流血效果2回合（增加技能）" + ["desc"]="流星追月可附加流血效果，2回合。" }, [3400106]={ - ["desc"]="流血效果伤害提升（增加技能）" + ["desc"]="流星追月附加的流血效果，伤害提升。" }, [3400107]={ - ["desc"]="链接超过4个元素，大招额外释放一次" + ["desc"]="流星追月链接超过4个元素，流星追月攻击将释放2次。" }, [4200100]={ - ["desc"]="解锁元素链接：随机额外消除3个元素" + ["desc"]="解锁元素链接：随机消除3个元素，并造成一次技能伤害。" }, [4200101]={ - ["desc"]="元素链接随机消除元素增加2个" + ["desc"]="元素链接随机消除元素+2。" }, [4200102]={ - ["desc"]="元素链接使用时本次普攻伤害提升10%" + ["desc"]="元素链接使用时本次普攻伤害提升10%。" }, [4200103]={ - ["desc"]="元素链接有50%冰霜2回合" + ["desc"]="元素链接有50%概率附加冰霜效果，2回合。" }, [4200104]={ - ["desc"]="元素链接随机消除元素增加2个" + ["desc"]="元素链接随机消除元素+2。" }, [4200105]={ - ["desc"]="攻击冰霜敌人有20%概率冻结1回合" + ["desc"]="元素链接对冰霜敌人有20%概率附加冻结效果，1回合。" }, [4200106]={ - ["desc"]="本英雄的攻击力提高" + ["desc"]="蓝法攻击提升15%。" }, [4200107]={ - ["desc"]="攻击冰霜英雄有40%概率冻结1回合" + ["desc"]="元素链接附加冻结效果概率提升到40%。" }, [4300100]={ - ["desc"]="解锁冰女技能：攻击400%+冰霜1回合" + ["desc"]="解锁冰女技能：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300101]={ - ["desc"]="上下左右消除1格" + ["desc"]="冰女技能沿＋方向可额外消除4格。" }, [4300102]={ - ["desc"]="对灼烧伤害增加50%（加技能）" + ["desc"]="冰女技能对灼烧敌人的伤害增加50%。" }, [4300103]={ - ["desc"]="冰霜持续回合数+1" + ["desc"]="冰女技能附加的冰霜效果，回合数+1。" }, [4300104]={ - ["desc"]="技能倍率提升300%" + ["desc"]="冰女技能伤害提升。" }, [4300105]={ - ["desc"]="攻击冰霜敌人有50%几率冻结1回合（加技能）" + ["desc"]="冰女技能对冰霜敌人有50%概率附加冻结效果，1回合。" }, [4300106]={ - ["desc"]="冰女技能命中后获得冰盾2回合（加技能）" + ["desc"]="冰女技能后为团队附加冰盾效果，2回合。" }, [4300107]={ - ["desc"]="冰女技能命中后获得反伤400%冰盾2回合（加技能）" + ["desc"]="冰女技能附加的冰盾，可反伤400%。" }, [4300300]={ - ["desc"]="解锁鸦姐技能：攻击400%+腐败1回合" + ["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4300301]={ - ["desc"]="腐败回合数+1" + ["desc"]="鸦姐技能附加的腐败效果，回合数+1." }, [4300302]={ - ["desc"]="攻击易伤敌人附加冰霜1回合（加技能）" + ["desc"]="鸦姐技能对易伤敌人附加冰霜效果，1回合。" }, [4300303]={ - ["desc"]="技能使用时本次普攻伤害提升15%" + ["desc"]="鸦姐技能使用时本次普攻伤害提升15%。" }, [4300304]={ - ["desc"]="技能附加的冰霜效果回合数+1（加技能）" + ["desc"]="鸦姐技能附加的冰霜效果，回合数+1。" }, [4300305]={ - ["desc"]="攻击附加100%削弱buff2回合（加技能）" + ["desc"]="鸦姐技能附加削弱效果，2回合。" }, [4300306]={ - ["desc"]="上下左右消除1格" + ["desc"]="鸦姐技能沿＋方向可额外消除4格。" }, [4300307]={ - ["desc"]="附加削弱buff为4回合（加技能）" + ["desc"]="鸦姐技能附加的削弱效果，回合数+2。" }, [4400100]={ - ["desc"]="解锁霜冻剑舞：额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）" + ["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" }, [4400101]={ - ["desc"]="冰霜持续回合数+1" + ["desc"]="冰霜剑舞附加的冰霜效果，回合数+1" }, [4400102]={ - ["desc"]="对灼烧伤害增加50%" + ["desc"]="冰霜剑舞对灼烧敌人伤害增加50%。" }, [4400103]={ - ["desc"]="霜冻剑舞随机消除元素增加3个" + ["desc"]="冰霜剑舞随机消除元素+3" }, [4400104]={ - ["desc"]="冰霜效果提升（普攻-2）" + ["desc"]="冰霜剑舞附加的冰霜效果，效果提升。" }, [4400105]={ - ["desc"]="霜冻剑舞50%几率附加冻结2回合" + ["desc"]="霜冻剑舞有50%概率附加冻结效果，2回合。" }, [4400106]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="寒冰妖姬攻击提升15%。" }, [4400107]={ - ["desc"]="霜冻剑舞70%几率附加冻结2回合" + ["desc"]="霜冻剑舞附加冻结效果概率提升到70%。" }, [5200100]={ - ["desc"]="解锁魔法罩：艾伦生成一个魔法罩持续1回合，可承受最大生命值10%伤害" + ["desc"]="解锁护盾术：为团队附加一个护盾，1回合。" }, [5200101]={ - ["desc"]="增加魔法罩承受伤害增加到16%" + ["desc"]="护盾术附加的护盾，承受伤害增加。" }, [5200102]={ - ["desc"]="魔法罩使用时本次普攻伤害提升10%" + ["desc"]="护盾术使用时本次普攻伤害提升10%。" }, [5200103]={ - ["desc"]="生成的魔法罩如果没有破可以额外持续1回合" + ["desc"]="护盾术附加的护盾，回合数+1。" }, [5200104]={ - ["desc"]="魔法罩上下左右可消除1格" + ["desc"]="护盾术沿＋方向可额外消除4格。" }, [5200105]={ - ["desc"]="魔法罩存在时可反伤对方造成200%伤害(替换技能)" + ["desc"]="护盾术附加的护盾，可反伤200%。" }, [5200106]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="忍者伦攻击提升15%。" }, [5200107]={ - ["desc"]="魔法罩存在时可反伤对方造成400%伤害(继续替换技能)" + ["desc"]="护盾术附加的护盾，反伤效果翻倍。" }, [5300100]={ - ["desc"]="解锁女巫技能：攻击500%" + ["desc"]="解锁魔女琪琪技能：额外造成一次大量技能伤害。" }, [5300101]={ - ["desc"]="技能命中附加中毒2回合（加技能）" + ["desc"]="魔女琪琪技能可附加中毒效果，2回合。" }, [5300102]={ - ["desc"]="技能使用时本次普攻伤害提升15%" + ["desc"]="魔女琪琪技能使用时本次普攻伤害提升15%。" }, [5300103]={ - ["desc"]="攻击附加昏睡2回合（加技能）" + ["desc"]="魔女琪琪技能可附加昏睡效果，2回合。" }, [5300104]={ - ["desc"]="中毒伤害提升（加技能）" + ["desc"]="魔女琪琪技能附加的中毒效果，伤害提升。" }, [5300105]={ - ["desc"]="技能使用后随机增加一种技能的能量2点（加技能）" + ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" }, [5300106]={ - ["desc"]="技能使用后增加能量的数量提升2点（加技能）" + ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" }, [5300107]={ - ["desc"]="技能命中后有15%几率附加不死buff1回合（加技能）" + ["desc"]="魔女琪琪技能有15%概率为团队附加不死效果，1回合。" }, [5300200]={ - ["desc"]="解锁德古拉技能：攻击500%" + ["desc"]="解锁灵魂猎手技能：额外造成一次大量技能伤害。" }, [5300201]={ - ["desc"]="上下左右消除1格" + ["desc"]="灵魂猎手技能沿＋方向可额外消除4格。" }, [5300202]={ - ["desc"]="攻击冰霜敌人50%几率将其冻结1回合（加技能）" + ["desc"]="灵魂猎手技能对冰霜敌人有50%概率附加冻结效果，1回合。" }, [5300203]={ - ["desc"]="技能倍率提升300%" + ["desc"]="灵魂猎手技能伤害提升。" }, [5300204]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="灵魂猎手攻击提升15%。" }, [5300205]={ - ["desc"]="50%几率附加反击buff，持续2回合（加技能）" + ["desc"]="灵魂猎手技能有50%概率为团队附加反击效果，2回合。" }, [5300206]={ - ["desc"]="冻结回合数+1，冻结概率加20%（加技能）" + ["desc"]="灵魂猎手技能附加冻结效果，概率提升到70%，回合数+1。" }, [5300207]={ - ["desc"]="100%附加反击buff（加技能）" + ["desc"]="灵魂猎手技能附加反击效果，概率提升到100%。" }, [5400100]={ - ["desc"]="解锁蝴蝶技能：攻击600%" + ["desc"]="解锁蝴蝶技能：额外造成一次大量技能伤害。" }, [5400101]={ - ["desc"]="技能倍率提升300%" + ["desc"]="蝴蝶技能伤害提升。" }, [5400102]={ - ["desc"]="技能释放后随机增加一种技能的能量2点（加技能）" + ["desc"]="蝴蝶技能使用后随机增加一种技能的能量2点。" }, [5400103]={ - ["desc"]="技能释放后把场上随机3个元素变为紫色（加技能）" + ["desc"]="蝴蝶技能使用后将场上随机3个元素变为紫色元素。" }, [5400104]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="蝴蝶攻击提升15%。" }, [5400105]={ - ["desc"]="紫色技能激活所需能量减2（换技能ID）" + ["desc"]="蝴蝶技能激活所需能量-2。" }, [5400106]={ - ["desc"]="每击杀1个敌人，技能伤害提升50%，本场战斗生效。（加技能）" + ["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升50%。" }, [5400107]={ - ["desc"]="击杀敌人后增加紫色能量2点（加技能）" + ["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。" } } local config = { diff --git a/lua/app/config/strings/de/hero.lua b/lua/app/config/strings/de/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/de/hero.lua +++ b/lua/app/config/strings/de/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/hero.lua b/lua/app/config/strings/en/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/en/hero.lua +++ b/lua/app/config/strings/en/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/hero.lua b/lua/app/config/strings/fr/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/fr/hero.lua +++ b/lua/app/config/strings/fr/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/hero.lua b/lua/app/config/strings/id/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/id/hero.lua +++ b/lua/app/config/strings/id/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/hero.lua b/lua/app/config/strings/ja/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/ja/hero.lua +++ b/lua/app/config/strings/ja/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/hero.lua b/lua/app/config/strings/ko/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/ko/hero.lua +++ b/lua/app/config/strings/ko/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/hero.lua b/lua/app/config/strings/pt/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/pt/hero.lua +++ b/lua/app/config/strings/pt/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/hero.lua b/lua/app/config/strings/ru/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/ru/hero.lua +++ b/lua/app/config/strings/ru/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/hero.lua b/lua/app/config/strings/th/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/th/hero.lua +++ b/lua/app/config/strings/th/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/hero.lua b/lua/app/config/strings/vi/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/vi/hero.lua +++ b/lua/app/config/strings/vi/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/hero.lua b/lua/app/config/strings/zh/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/zh/hero.lua +++ b/lua/app/config/strings/zh/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index fa5b2dc2..81f91ecb 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -181,6 +181,7 @@ GConst.ATLAS_PATH = { BOUNTY = "assets/arts/atlas/ui/bounty.asset", UI_SETTING = "assets/arts/atlas/ui/setting.asset", ICON_TASK = "assets/arts/atlas/icon/task.asset", + SHOP = "assets/arts/atlas/ui/shop.asset", } GConst.TOUCH_EVENT = { diff --git a/lua/app/module/tips/tips_manager.lua b/lua/app/module/tips/tips_manager.lua index 082b5649..312fb2de 100644 --- a/lua/app/module/tips/tips_manager.lua +++ b/lua/app/module/tips/tips_manager.lua @@ -25,9 +25,14 @@ end function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignType) if rewardType == GConst.REWARD_TYPE.ITEM then local info = ConfigManager:getConfig("item")[rewardId] - if info and info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_FRAGMENT then - self:showHeroFragmentTips(rewardId) - return + if info then + if info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_FRAGMENT then + self:showHeroFragmentTips(rewardId) + return + elseif info.type == GConst.ItemConst.ITEM_TYPE.BOX then + self:showBoxTips(rewardId) + return + end end end local desc = self:getRewardDesc(rewardId, rewardType) @@ -89,6 +94,13 @@ function TipsManager:showHeroFragmentTips(itemId) UIManager:showUI("app/ui/tips/hero_fragment_tips", params) end +function TipsManager:showBoxTips(itemId) + local params = { + itemId = itemId + } + UIManager:showUI("app/ui/tips/box_tips", params) +end + function TipsManager:getRewardDesc(rewardId, rewardType) if rewardType == GConst.REWARD_TYPE.ITEM then local item18NInfo = I18N:getConfig("item")[rewardId] diff --git a/lua/app/ui/bounty/bounty_main_ui.lua b/lua/app/ui/bounty/bounty_main_ui.lua index d614e9c4..9d4e911c 100644 --- a/lua/app/ui/bounty/bounty_main_ui.lua +++ b/lua/app/ui/bounty/bounty_main_ui.lua @@ -189,7 +189,15 @@ function BountyMainUI:initRepeatReward() local level = DataManager.BountyData:getLevel() ModuleManager.BountyManager:claimReward(level, false) else - GFunc.showToast("显示宝箱tips") + local levelInfo = DataManager.BountyData:getRepeatLevelInfo() + if levelInfo then + local reward = levelInfo.reward + if reward then + local rewardId = GFunc.getRewardId(reward) + local rewardType = GFunc.getRewardType(reward) + ModuleManager.TipsManager:showRewardTips(rewardId, rewardType, self.repeatBox) + end + end end end) end diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index 8dbd2bc4..0e334896 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -89,14 +89,10 @@ function RewardCell:_refreshItem(info, count) end end -function RewardCell:showNumTx(str) +function RewardCell:setNumTx(str) self.numTx:setText(str) end -function RewardCell:showNumTx(value) - self.numTx:setText(value) -end - function RewardCell:showMask(show, syncCheck) self.mask:setVisible(show == true) self:showCheck(syncCheck) diff --git a/lua/app/ui/idle/idle_drop_ui.lua b/lua/app/ui/idle/idle_drop_ui.lua index 1624dfaf..855c62d1 100644 --- a/lua/app/ui/idle/idle_drop_ui.lua +++ b/lua/app/ui/idle/idle_drop_ui.lua @@ -325,13 +325,13 @@ function IdleDropUI:getDefUnit(callback) if self.cacheUnit == nil then self.cacheUnit = {} end - local defUnit = self.cacheUnit[self.idleMonsterId] + local monsterCfg = ConfigManager:getConfig("monster") + local monsterInfo = monsterCfg[self.idleMonsterId] + local defUnit = self.cacheUnit[monsterInfo.model_id] if defUnit then defUnit:setActive(true) return callback(defUnit) end - local monsterCfg = ConfigManager:getConfig("monster") - local monsterInfo = monsterCfg[self.idleMonsterId] SpineManager:loadHeroAsync(monsterInfo.model_id, self.fightRoot, function(spineObject) spineObject:setDefaultMix(0) local defUnitComp = spineObject:addLuaComponent(IDLE_UNIT_COMPONENT) diff --git a/lua/app/ui/tips/box_tips.lua b/lua/app/ui/tips/box_tips.lua new file mode 100644 index 00000000..2f36e327 --- /dev/null +++ b/lua/app/ui/tips/box_tips.lua @@ -0,0 +1,83 @@ +local BoxTips = class("BoxTips", BaseUI) + +function BoxTips:ctor(params) + self.itemId = params.itemId +end + +function BoxTips:getPrefabPath() + return "assets/prefabs/ui/tips/box_tips.prefab" +end + +function BoxTips:isFullScreen() + return false +end + +function BoxTips:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.uiMap = uiMap + local itemTextInfo = I18N:getConfig("item")[self.itemId] + if itemTextInfo then + uiMap["box_tips.bg.title"]:setText(itemTextInfo.name) + else + uiMap["box_tips.bg.title"]:setText(GConst.EMPTY_STRING) + end + local itemInfo = ConfigManager:getConfig("item")[self.itemId] + if itemInfo then + local nameIndex = itemInfo.qlt - 1 + if nameIndex < 1 then + nameIndex = 1 + elseif nameIndex > 3 then + nameIndex = 3 + end + uiMap["box_tips.bg.box"]:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_" .. nameIndex) + end + uiMap["box_tips.close_btn"]:addClickListener(function() + self:closeUI() + end) + + self.rewardNodeList = {} + local rewardList = itemInfo.reward or GConst.EMPTY_TABLE + for i = 1, 4 do + local rewardNode = uiMap["box_tips.bg.item_" .. i] + self.rewardNodeList[i] = rewardNode + if rewardList[i] then + local num = uiMap["box_tips.bg.item_" .. i .. ".num"] + num:setText(GFunc.intToString(i)) + local help = uiMap["box_tips.bg.item_" .. i .. ".help"] + if rewardList[i].type == GConst.ItemConst.ITEM_TYPE.RANDOM_FRAGMENT then + help:setVisible(true) + else + help:setVisible(false) + end + rewardNode:setVisible(true) + rewardNode:addClickListener(function() + ModuleManager.TipsManager:showRewardTips(rewardList[i].id, rewardList[i].type, rewardNode) + end) + local rewardComp = uiMap["box_tips.bg.item_" .. i .. ".reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + rewardComp:refreshByConfig(rewardList[i]) + rewardComp:setTouchEnable(false) + rewardComp:setNumTx(GConst.EMPTY_STRING) + else + rewardNode:setVisible(false) + end + end + self:adpatRewardNode(#rewardList) +end + +function BoxTips:adpatRewardNode(count) + if count == 0 then + return + end + local width = self.rewardNodeList[1]:getRectWidth() + 10 + if count % 2 == 0 then + for i = 1, count do + self.rewardNodeList[i]:setAnchoredPositionX((i - count / 2 - 0.5) * width) + end + else + for i = 1, count do + self.rewardNodeList[i]:setAnchoredPositionX((i - (count - 1) / 2 - 1) * width) + end + end +end + +return BoxTips \ No newline at end of file diff --git a/lua/app/ui/tips/box_tips.lua.meta b/lua/app/ui/tips/box_tips.lua.meta new file mode 100644 index 00000000..90a05a8c --- /dev/null +++ b/lua/app/ui/tips/box_tips.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 59e3ce9541c217b4faf3f7e24ed10431 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/bounty/bounty_data.lua b/lua/app/userdata/bounty/bounty_data.lua index 52248da0..6f4ce654 100644 --- a/lua/app/userdata/bounty/bounty_data.lua +++ b/lua/app/userdata/bounty/bounty_data.lua @@ -142,6 +142,10 @@ function BountyData:getLvUpExp() return info.exp end +function BountyData:getRepeatLevelInfo() + return self.repeatLevelInfo +end + function BountyData:getIsOpen() if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.BOUNTY_OPEN, true) and self.endTime > Time:getServerTime() then return true