diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index f41bbdf3..a8c55b6c 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1678,7 +1678,7 @@ local act_gift = { }, [140403]={ ["type"]=14, - ["recharge_id"]=11, + ["recharge_id"]=10, ["limit"]=1 }, [140404]={ @@ -1702,29 +1702,21 @@ local act_gift = { ["num"]=6000, ["num_for_nothing"]="UAhcAw==" }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1001, ["id_for_nothing"]="VwhcAg==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1002, ["id_for_nothing"]="VwhcAQ==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["time_type"]=1, @@ -1738,7 +1730,7 @@ local act_gift = { 20, 30 }, - ["recharge_id"]=5, + ["recharge_id"]=7, ["reward"]={ { ["type"]=1, @@ -1748,21 +1740,13 @@ local act_gift = { ["num"]=6000, ["num_for_nothing"]="UAhcAw==" }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1001, ["id_for_nothing"]="VwhcAg==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, @@ -1784,39 +1768,31 @@ local act_gift = { 40, 50 }, - ["recharge_id"]=5, + ["recharge_id"]=8, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6800, - ["num_for_nothing"]="UABcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1002, ["id_for_nothing"]="VwhcAQ==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["time_type"]=1, @@ -1830,31 +1806,23 @@ local act_gift = { 60, 70 }, - ["recharge_id"]=5, + ["recharge_id"]=8, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6800, - ["num_for_nothing"]="UABcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1002, ["id_for_nothing"]="VwhcAQ==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, @@ -1876,39 +1844,269 @@ local act_gift = { 80, 90 }, - ["recharge_id"]=5, + ["recharge_id"]=12, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=7200, - ["num_for_nothing"]="UQpcAw==" + ["num"]=16000, + ["num_for_nothing"]="Vw5cA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1004, ["id_for_nothing"]="VwhcBw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150602]={ + ["type"]=15, + ["parameter_pro"]={ + 100, + 110 + }, + ["recharge_id"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=16000, + ["num_for_nothing"]="Vw5cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150702]={ + ["type"]=15, + ["parameter_pro"]={ + 120, + 130 + }, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=24000, + ["num_for_nothing"]="VAxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150802]={ + ["type"]=15, + ["parameter_pro"]={ + 140, + 150 + }, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=24000, + ["num_for_nothing"]="VAxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [150902]={ + ["type"]=15, + ["parameter_pro"]={ + 160, + 170 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1006, + ["id_for_nothing"]="VwhcBQ==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [151002]={ + ["type"]=15, + ["parameter_pro"]={ + 180, + 190 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1005, + ["id_for_nothing"]="VwhcBg==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1006, + ["id_for_nothing"]="VwhcBQ==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["time_type"]=1, @@ -1922,39 +2120,31 @@ local act_gift = { 0, 10 }, - ["recharge_id"]=5, + ["recharge_id"]=7, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6000, - ["num_for_nothing"]="UAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=38, ["id_for_nothing"]="VQA=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=39, ["id_for_nothing"]="VQE=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["time_type"]=1, @@ -1968,39 +2158,31 @@ local act_gift = { 20, 30 }, - ["recharge_id"]=5, + ["recharge_id"]=10, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6000, - ["num_for_nothing"]="UAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=38, ["id_for_nothing"]="VQA=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=39, ["id_for_nothing"]="VQE=", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["time_type"]=1, @@ -2014,39 +2196,31 @@ local act_gift = { 40, 50 }, - ["recharge_id"]=5, + ["recharge_id"]=12, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6800, - ["num_for_nothing"]="UABcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=39, ["id_for_nothing"]="VQE=", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["time_type"]=1, @@ -2060,39 +2234,31 @@ local act_gift = { 60, 70 }, - ["recharge_id"]=5, + ["recharge_id"]=12, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6800, - ["num_for_nothing"]="UABcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=39, ["id_for_nothing"]="VQE=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["time_type"]=1, @@ -2106,39 +2272,269 @@ local act_gift = { 80, 90 }, - ["recharge_id"]=5, + ["recharge_id"]=14, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=7200, - ["num_for_nothing"]="UQpcAw==" + ["num"]=32000, + ["num_for_nothing"]="VQpcA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=41, ["id_for_nothing"]="Ugk=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160602]={ + ["type"]=16, + ["parameter_pro"]={ + 100, + 110 + }, + ["recharge_id"]=14, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=32000, + ["num_for_nothing"]="VQpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160702]={ + ["type"]=16, + ["parameter_pro"]={ + 120, + 130 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=48000, + ["num_for_nothing"]="UgBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160802]={ + ["type"]=16, + ["parameter_pro"]={ + 140, + 150 + }, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=48000, + ["num_for_nothing"]="UgBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [160902]={ + ["type"]=16, + ["parameter_pro"]={ + 160, + 170 + }, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80000, + ["num_for_nothing"]="XghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=43, + ["id_for_nothing"]="Ugs=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + } + }, + ["time_type"]=1, + ["limit_time"]=6, + ["cd"]=1, + ["value"]=800 + }, + [161002]={ + ["type"]=16, + ["parameter_pro"]={ + 180, + 190 + }, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80000, + ["num_for_nothing"]="XghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=43, + ["id_for_nothing"]="Ugs=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["time_type"]=1, @@ -2148,6 +2544,6 @@ local act_gift = { } } local config = { -data=act_gift,count=66 +data=act_gift,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/activity_herofund.lua b/lua/app/config/activity_herofund.lua index 1bd3e595..ce2b6681 100644 --- a/lua/app/config/activity_herofund.lua +++ b/lua/app/config/activity_herofund.lua @@ -1,6 +1,6 @@ local activity_herofund = { [1]={ - ["exp"]=30, + ["exp"]=0, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -14,8 +14,8 @@ local activity_herofund = { ["type_for_nothing"]="Vw==", ["id"]=44003, ["id_for_nothing"]="UgxcA2Y=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, ["reward_pro_max"]={ ["type"]=1, @@ -27,16 +27,8 @@ local activity_herofund = { } }, [2]={ - ["exp"]=60, + ["exp"]=30, ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, @@ -44,44 +36,52 @@ local activity_herofund = { ["num"]=1500, ["num_for_nothing"]="Vw1cAw==" }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } }, [3]={ - ["exp"]=90, + ["exp"]=60, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=8, - ["id_for_nothing"]="Xg==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, [4]={ - ["exp"]=120, + ["exp"]=90, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -108,22 +108,49 @@ local activity_herofund = { } }, [5]={ - ["exp"]=150, + ["exp"]=120, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [6]={ + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=2, + ["num_for_nothing"]="VA==" }, ["reward_pro_max"]={ ["type"]=1, @@ -134,17 +161,36 @@ local activity_herofund = { ["num_for_nothing"]="VQ==" } }, - [6]={ + [7]={ ["exp"]=180, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + [8]={ + ["exp"]=210, + ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, @@ -152,71 +198,25 @@ local activity_herofund = { ["num"]=1500, ["num_for_nothing"]="Vw1cAw==" }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" - } - }, - [7]={ - ["exp"]=210, - ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=8, - ["id_for_nothing"]="Xg==", - ["num"]=1, - ["num_for_nothing"]="Vw==" - }, - ["reward_pro"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" - }, - ["reward_pro_max"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=2, - ["num_for_nothing"]="VA==" - } - }, - [8]={ - ["exp"]=240, - ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - ["reward_pro"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" - }, - ["reward_pro_max"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } }, [9]={ - ["exp"]=270, + ["exp"]=240, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -243,7 +243,7 @@ local activity_herofund = { } }, [10]={ - ["exp"]=300, + ["exp"]=270, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -270,7 +270,7 @@ local activity_herofund = { } }, [11]={ - ["exp"]=330, + ["exp"]=300, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -297,124 +297,116 @@ local activity_herofund = { } }, [12]={ + ["exp"]=330, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [13]={ ["exp"]=360, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } }, - [13]={ + [14]={ ["exp"]=390, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=8, - ["id_for_nothing"]="Xg==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, - [14]={ + [15]={ ["exp"]=420, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=13, - ["id_for_nothing"]="Vws=", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=13, - ["id_for_nothing"]="Vws=", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", ["num"]=2, ["num_for_nothing"]="VA==" }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=13, - ["id_for_nothing"]="Vws=", - ["num"]=2, - ["num_for_nothing"]="VA==" - } - }, - [15]={ - ["exp"]=450, - ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" - }, - ["reward_pro"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", - ["num"]=1, - ["num_for_nothing"]="Vw==" - }, - ["reward_pro_max"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, [16]={ - ["exp"]=480, + ["exp"]=450, ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, @@ -422,51 +414,59 @@ local activity_herofund = { ["num"]=1500, ["num_for_nothing"]="Vw1cAw==" }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } }, [17]={ - ["exp"]=510, + ["exp"]=480, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=8, - ["id_for_nothing"]="Xg==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=9, - ["id_for_nothing"]="Xw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, [18]={ - ["exp"]=540, + ["exp"]=510, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, ["reward_pro"]={ ["type"]=1, @@ -486,34 +486,7 @@ local activity_herofund = { } }, [19]={ - ["exp"]=570, - ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" - }, - ["reward_pro"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" - }, - ["reward_pro_max"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" - } - }, - [20]={ - ["exp"]=600, + ["exp"]=540, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -539,8 +512,35 @@ local activity_herofund = { ["num_for_nothing"]="VQ==" } }, + [20]={ + ["exp"]=570, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, [21]={ - ["exp"]=630, + ["exp"]=600, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -567,16 +567,8 @@ local activity_herofund = { } }, [22]={ - ["exp"]=660, + ["exp"]=630, ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, @@ -584,17 +576,52 @@ local activity_herofund = { ["num"]=1500, ["num_for_nothing"]="Vw1cAw==" }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, ["reward_pro_max"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [23]={ + ["exp"]=660, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44003, + ["id_for_nothing"]="UgxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" } } } local config = { -data=activity_herofund,count=22 +data=activity_herofund,count=23 } return config \ No newline at end of file diff --git a/lua/app/config/arena_board.lua b/lua/app/config/arena_board.lua index 5c4b8208..862e8f51 100644 --- a/lua/app/config/arena_board.lua +++ b/lua/app/config/arena_board.lua @@ -20227,7 +20227,7 @@ local arena_board = { }, { 35, - 35 + 0 }, { 35, diff --git a/lua/app/config/chapter_dungeon_armor.lua b/lua/app/config/chapter_dungeon_armor.lua index 9203a047..694e623b 100644 --- a/lua/app/config/chapter_dungeon_armor.lua +++ b/lua/app/config/chapter_dungeon_armor.lua @@ -828,29 +828,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -953,29 +947,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1078,29 +1066,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1203,29 +1185,23 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=72 + ["weight"]=85 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=28 + ["weight"]=15 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=60 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1328,101 +1304,77 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=70 + ["weight"]=38 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=150 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -1541,101 +1493,77 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=180 + ["weight"]=213 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=70 + ["weight"]=38 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=150 + ["weight"]=250 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=150 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -1754,41 +1682,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -1891,41 +1807,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -2028,41 +1932,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -2165,41 +2057,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=31 + ["weight"]=65 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=51 + ["weight"]=25 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=18 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=50 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -2302,149 +2182,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=45 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=125 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -2563,149 +2395,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=78 + ["weight"]=163 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=128 + ["weight"]=63 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=45 + ["weight"]=25 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=45 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1007, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1013, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1019, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1025, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=125 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=125 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -2824,38 +2608,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -2955,38 +2733,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3086,38 +2858,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3217,38 +2983,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=62 + ["weight"]=35 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3348,128 +3108,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3585,128 +3321,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1007, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1013, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1019, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1025, ["num"]=1, - ["weight"]=25 + ["weight"]=113 }, { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=155 + ["weight"]=88 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -3822,41 +3534,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -3967,41 +3667,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -4112,41 +3800,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -4257,41 +3933,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=40 + ["weight"]=30 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=19 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=20 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=40 - }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -4402,149 +4066,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=48 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -4663,149 +4279,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=100 + ["weight"]=75 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=48 + ["weight"]=25 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=48 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1008, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1014, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1020, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1026, - ["num"]=1, - ["weight"]=50 - }, - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=100 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -4924,38 +4492,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5055,38 +4617,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5186,38 +4742,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5317,38 +4867,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=20 + ["weight"]=45 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=52 + ["weight"]=35 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=28 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5448,128 +4992,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5685,128 +5205,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1008, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1014, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1020, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1026, ["num"]=1, - ["weight"]=50 + ["weight"]=113 }, { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=130 + ["weight"]=88 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=70 + ["weight"]=50 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=70 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -5922,41 +5418,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6067,41 +5551,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6212,41 +5684,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6357,41 +5817,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=41 + ["weight"]=60 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=45 + ["weight"]=30 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -6502,149 +5950,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -6763,149 +6163,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=103 + ["weight"]=150 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=113 + ["weight"]=75 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1009, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1015, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1021, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1027, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -7024,38 +6376,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7155,38 +6501,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7286,38 +6626,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7417,38 +6751,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=20 + ["weight"]=47 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=57 + ["weight"]=35 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=23 + ["weight"]=18 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7548,128 +6876,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=58 + ["weight"]=45 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -7785,128 +7089,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1009, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1015, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1021, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1027, ["num"]=1, - ["weight"]=50 + ["weight"]=118 }, { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=143 + ["weight"]=88 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=58 + ["weight"]=45 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=58 + ["weight"]=45 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -8022,41 +7302,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8167,41 +7435,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8312,41 +7568,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8457,41 +7701,29 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=46 + ["weight"]=64 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=40 + ["weight"]=26 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=14 + ["weight"]=10 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=10 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=50 - }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=40 + ["weight"]=100 } }, ["bao_drop_num"]=2, @@ -8602,149 +7834,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -8863,149 +8047,101 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=115 + ["weight"]=160 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=100 + ["weight"]=65 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=35 + ["weight"]=25 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=35 + ["weight"]=25 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1010, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1016, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1022, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1028, - ["num"]=1, - ["weight"]=25 - }, - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=125 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=125 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=100 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=100 + ["weight"]=250 } }, ["bao_drop_num"]=2, @@ -9124,38 +8260,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9255,38 +8385,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9386,38 +8510,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9517,38 +8635,32 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=16 + ["weight"]=42 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=51 + ["weight"]=38 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=33 + ["weight"]=20 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=30 - }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=70 + ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9648,128 +8760,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=83 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -9885,128 +8973,104 @@ local chapter_dungeon_armor = { ["type"]=1, ["id"]=1010, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1016, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1022, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1028, ["num"]=1, - ["weight"]=40 + ["weight"]=105 }, { ["type"]=1, ["id"]=1011, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1017, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1023, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1029, ["num"]=1, - ["weight"]=128 + ["weight"]=95 }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=83 + ["weight"]=50 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=83 + ["weight"]=50 } }, ["rand_drop_num"]=10, ["bao_limit"]=3, ["bao_drop"]={ - { - ["type"]=1, - ["id"]=1011, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1017, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1023, - ["num"]=1, - ["weight"]=75 - }, - { - ["type"]=1, - ["id"]=1029, - ["num"]=1, - ["weight"]=75 - }, { ["type"]=1, ["id"]=1012, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1018, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1024, ["num"]=1, - ["weight"]=175 + ["weight"]=250 }, { ["type"]=1, ["id"]=1030, ["num"]=1, - ["weight"]=175 + ["weight"]=250 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, diff --git a/lua/app/config/chapter_dungeon_equip.lua b/lua/app/config/chapter_dungeon_equip.lua index dd5e946f..3d0d8511 100644 --- a/lua/app/config/chapter_dungeon_equip.lua +++ b/lua/app/config/chapter_dungeon_equip.lua @@ -58,7 +58,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -191,13 +191,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=80 + ["weight"]=90 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["rand_drop_num"]=10, @@ -205,12 +205,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1001, + ["id"]=1002, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -278,13 +278,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=60 + ["weight"]=85 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=40 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -365,13 +365,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=35 + ["weight"]=80 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=65 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -384,7 +384,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -452,19 +452,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=15 + ["weight"]=60 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=70 + ["weight"]=30 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=15 + ["weight"]=10 } }, ["rand_drop_num"]=10, @@ -472,12 +472,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1002, + ["id"]=1003, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -545,19 +545,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1001, ["num"]=1, - ["weight"]=5 + ["weight"]=45 }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=65 + ["weight"]=40 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -565,7 +565,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1002, + ["id"]=1003, ["num"]=1, ["weight"]=100 } @@ -634,17 +634,23 @@ local chapter_dungeon_equip = { } }, ["rand_drop"]={ + { + ["type"]=1, + ["id"]=1001, + ["num"]=1, + ["weight"]=30 + }, { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=40 + ["weight"]=50 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=60 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -657,7 +663,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -725,13 +731,13 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=20 + ["weight"]=60 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=70 + ["weight"]=30 }, { ["type"]=1, @@ -745,12 +751,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1003, + ["id"]=1004, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -818,19 +824,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1002, ["num"]=1, - ["weight"]=10 + ["weight"]=45 }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=65 + ["weight"]=40 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=25 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -838,7 +844,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1003, + ["id"]=1004, ["num"]=1, ["weight"]=100 } @@ -907,17 +913,23 @@ local chapter_dungeon_equip = { } }, ["rand_drop"]={ + { + ["type"]=1, + ["id"]=1002, + ["num"]=1, + ["weight"]=30 + }, { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=55 + ["weight"]=50 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=45 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -925,12 +937,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1003, + ["id"]=1004, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -998,19 +1010,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=30 + ["weight"]=67 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=60 + ["weight"]=25 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=10 + ["weight"]=8 } }, ["rand_drop_num"]=10, @@ -1018,12 +1030,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1005, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -1091,19 +1103,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1003, ["num"]=1, - ["weight"]=10 + ["weight"]=57 }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=80 + ["weight"]=30 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=20 + ["weight"]=13 } }, ["rand_drop_num"]=10, @@ -1111,7 +1123,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1005, ["num"]=1, ["weight"]=100 } @@ -1180,17 +1192,23 @@ local chapter_dungeon_equip = { } }, ["rand_drop"]={ + { + ["type"]=1, + ["id"]=1003, + ["num"]=1, + ["weight"]=46 + }, { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=60 + ["weight"]=36 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=40 + ["weight"]=18 } }, ["rand_drop_num"]=10, @@ -1198,12 +1216,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1005, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -1271,19 +1289,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=30 + ["weight"]=66 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=55 + ["weight"]=30 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=5 + ["weight"]=4 } }, ["rand_drop_num"]=10, @@ -1291,12 +1309,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1004, + ["id"]=1006, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -1372,19 +1390,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=20 + ["weight"]=53 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=70 + ["weight"]=38 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=10 + ["weight"]=9 } }, ["rand_drop_num"]=10, @@ -1392,12 +1410,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=1, ["item_show"]={ { ["type"]=1, @@ -1465,19 +1483,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=15 + ["weight"]=43 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=65 + ["weight"]=42 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=20 + ["weight"]=15 } }, ["rand_drop_num"]=10, @@ -1485,7 +1503,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } @@ -1558,19 +1576,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=10 + ["weight"]=40 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=60 + ["weight"]=40 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=30 + ["weight"]=20 } }, ["rand_drop_num"]=10, @@ -1578,7 +1596,7 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } @@ -1651,19 +1669,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=7 + ["weight"]=37 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=53 + ["weight"]=38 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=40 + ["weight"]=25 } }, ["rand_drop_num"]=10, @@ -1671,12 +1689,12 @@ local chapter_dungeon_equip = { ["bao_drop"]={ { ["type"]=1, - ["id"]=1005, + ["id"]=1006, ["num"]=1, ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, @@ -1744,19 +1762,19 @@ local chapter_dungeon_equip = { ["type"]=1, ["id"]=1004, ["num"]=1, - ["weight"]=5 + ["weight"]=34 }, { ["type"]=1, ["id"]=1005, ["num"]=1, - ["weight"]=45 + ["weight"]=36 }, { ["type"]=1, ["id"]=1006, ["num"]=1, - ["weight"]=50 + ["weight"]=30 } }, ["rand_drop_num"]=10, @@ -1769,7 +1787,7 @@ local chapter_dungeon_equip = { ["weight"]=100 } }, - ["bao_drop_num"]=2, + ["bao_drop_num"]=3, ["item_show"]={ { ["type"]=1, diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 12d8d401..9c46cc42 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -2003,6 +2003,10 @@ local fx = { ["bind"]="root", ["bg"]=1 }, + [300150]={ + ["res"]="sfx_p0036_b05", + ["bind"]="root" + }, [400000]={ ["res"]="sfx_p0012_b01", ["bind"]="root", @@ -2754,9 +2758,14 @@ local fx = { ["bind"]="root", ["flip"]=1, ["bg"]=1 + }, + [400150]={ + ["res"]="sfx_p0036_b05", + ["bind"]="root", + ["flip"]=1 } } local config = { -data=fx,count=647 +data=fx,count=649 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index f289d22d..5b3a05be 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1562,7 +1562,8 @@ local item = { 4, 5, 6, - 7 + 7, + 8 } }, [1002]={ @@ -1571,14 +1572,14 @@ local item = { ["icon"]="1002", ["get_way_type"]=1, ["get_way"]={ - 6, - 7, - 5, - 8, - 4, 9, - 3, - 10 + 8, + 10, + 6, + 11, + 5, + 4, + 3 } }, [1003]={ @@ -1587,14 +1588,15 @@ local item = { ["icon"]="1003", ["get_way_type"]=1, ["get_way"]={ - 9, - 10, - 8, - 11, 12, + 13, + 11, + 14, + 10, + 9, + 8, 7, - 6, - 13 + 6 } }, [1004]={ @@ -1603,18 +1605,18 @@ local item = { ["icon"]="1004", ["get_way_type"]=1, ["get_way"]={ - 13, - 14, - 12, 15, - 11, 16, - 10, 17, 18, 19, + 14, 20, - 10 + 13, + 12, + 11, + 10, + 9 } }, [1005]={ @@ -1623,12 +1625,12 @@ local item = { ["icon"]="1005", ["get_way_type"]=1, ["get_way"]={ - 16, 17, 18, + 16, 19, - 15, 20, + 15, 14, 13, 12 @@ -1674,21 +1676,21 @@ local item = { ["icon"]="1008", ["get_way_type"]=2, ["get_way"]={ + 25, + 31, 19, 13, - 25, 7, - 31, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1009]={ @@ -1697,22 +1699,22 @@ local item = { ["icon"]="1009", ["get_way_type"]=2, ["get_way"]={ - 31, 37, + 43, + 31, 25, 19, - 43, 13, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -1723,22 +1725,22 @@ local item = { ["icon"]="1010", ["get_way_type"]=2, ["get_way"]={ - 43, 49, + 55, + 43, 37, 31, - 55, 25, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -1772,7 +1774,7 @@ local item = { 55, 49, 59, - 60, + 54, 53, 54 } @@ -1803,21 +1805,21 @@ local item = { ["icon"]="1020", ["get_way_type"]=2, ["get_way"]={ + 26, + 32, 20, 14, - 26, 8, - 32, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1015]={ @@ -1826,22 +1828,22 @@ local item = { ["icon"]="1021", ["get_way_type"]=2, ["get_way"]={ - 32, 38, + 44, + 32, 26, 20, - 44, 14, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -1852,22 +1854,22 @@ local item = { ["icon"]="1022", ["get_way_type"]=2, ["get_way"]={ - 44, 50, + 56, + 44, 38, 32, - 56, 26, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -1901,7 +1903,7 @@ local item = { 56, 50, 59, - 60, + 54, 53, 54 } @@ -1932,21 +1934,21 @@ local item = { ["icon"]="1014", ["get_way_type"]=2, ["get_way"]={ + 27, + 33, 21, 15, - 27, 9, - 33, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1021]={ @@ -1955,22 +1957,22 @@ local item = { ["icon"]="1015", ["get_way_type"]=2, ["get_way"]={ - 33, 39, + 45, + 33, 27, 21, - 45, 15, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -1981,22 +1983,22 @@ local item = { ["icon"]="1016", ["get_way_type"]=2, ["get_way"]={ - 45, 51, + 57, + 45, 39, 33, - 57, 27, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -2030,7 +2032,7 @@ local item = { 57, 51, 59, - 60, + 54, 53, 54 } @@ -2061,21 +2063,21 @@ local item = { ["icon"]="1026", ["get_way_type"]=2, ["get_way"]={ + 28, + 34, 22, 16, - 28, 10, - 34, + 29, + 30, + 35, + 36, 23, 24, 17, 18, - 29, - 30, 11, - 12, - 35, - 36 + 12 } }, [1027]={ @@ -2084,22 +2086,22 @@ local item = { ["icon"]="1027", ["get_way_type"]=2, ["get_way"]={ - 34, 40, + 46, + 34, 28, 22, - 46, 16, - 35, - 36, 41, 42, + 47, + 48, + 35, + 36, 29, 30, 23, 24, - 47, - 48, 17, 18 } @@ -2110,22 +2112,22 @@ local item = { ["icon"]="1028", ["get_way_type"]=2, ["get_way"]={ - 46, 52, + 58, + 46, 40, 34, - 58, 28, - 47, - 48, 53, 54, + 59, + 60, + 47, + 48, 41, 42, 35, 36, - 59, - 60, 29, 30 } @@ -2159,7 +2161,7 @@ local item = { 58, 52, 59, - 60, + 54, 53, 54 } diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index b0e511bc..b5621ba9 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -463,9 +463,9 @@ local LocalizationGlobalConst = ARENA_DESC_42 = "ARENA_DESC_42", EQUIP_DESC_26 = "EQUIP_DESC_26", EQUIP_DESC_27 = "EQUIP_DESC_27", - ["SEIZED_DESC_1"] ="SEIZED_DESC_1", - ["SEIZED_DESC_2"] ="SEIZED_DESC_2", - ["SEIZED_DESC_3"]= "SEIZED_DESC_3", + SEIZED_DESC_1 = "SEIZED_DESC_1", + SEIZED_DESC_2 = "SEIZED_DESC_2", + SEIZED_DESC_3 = "SEIZED_DESC_3", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index e972a867..759d0ee2 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -369,13 +369,13 @@ local skin_skill = { ["sound"]=14001200, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300049, + ["fx_self"]=300150, ["bullet_time"]={ 1166, 3000, 200 }, - ["fx_self_mirror"]=400082 + ["fx_self_mirror"]=400150 } } local config = { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 831b5708..eeb2e910 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -463,9 +463,9 @@ local localization_global = ["ARENA_DESC_42"] = "未领取奖励", ["EQUIP_DESC_26"] = "武器直升{0}级礼包", ["EQUIP_DESC_27"] = "防具直升{0}级礼包", - ["SEIZED_DESC_1"] ="检测到你的账号存在异常,请联系客服或删除账号使用新建账号继续游戏。", - ["SEIZED_DESC_2"] ="联系客服", - ["SEIZED_DESC_3"]= "删除账号", + ["SEIZED_DESC_1"] = "检测到你的账号存在异常,请联系客服或删除账号使用新建账号继续游戏。", + ["SEIZED_DESC_2"] = "联系客服", + ["SEIZED_DESC_3"] = "删除账号", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 7ace9ebc..444267f4 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "Unclaimed Rewards", ["EQUIP_DESC_26"] = "Weapon Upgrade Lv.{0} Pack", ["EQUIP_DESC_27"] = "Armor Upgrade Lv.{0} Pack", + ["SEIZED_DESC_1"] = "Detected abnormality on your account. Please contact customer service or delete the account and continue playing with a new account.", + ["SEIZED_DESC_2"] = "Customer Service", + ["SEIZED_DESC_3"] = "Delete Account", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index c7178a8f..3f1b18f4 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "Recompensas no colectadas", ["EQUIP_DESC_26"] = "Paquete de Mejora de Arma al Nv. {0}", ["EQUIP_DESC_27"] = "Paquete de Mejora de Armadura al Nv. {0}", + ["SEIZED_DESC_1"] = "Se ha detectado una anomalía en tu cuenta. Por favor contacta con Atención al Cliente, o elimina la cuenta actual y crear una nueva para continuar el juego.", + ["SEIZED_DESC_2"] = "Atención al Cliente", + ["SEIZED_DESC_3"] = "Eliminar Cuenta", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index cdc07705..2a87a07f 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "Hadiah yang belum diklaim", ["EQUIP_DESC_26"] = "Pack Peningkatan Senjata Lv.{0}", ["EQUIP_DESC_27"] = "Pack upgrade Armor Lv.{0}", + ["SEIZED_DESC_1"] = "Telah terdeteksi kondisi tidak normal pada akunmuu. Silakan hubungi layanan pelanggan atau hapus akun, dan gunakan akun baru untuk melanjutkan permainan.", + ["SEIZED_DESC_2"] = "Hubungi Layanan Pelanggan", + ["SEIZED_DESC_3"] = "Hapus Akun", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index 9114d4d0..75b48475 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "未受取の報酬", ["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック", ["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック", + ["SEIZED_DESC_1"] = "アカウントに異常が検出されました。サポートセンターに連絡するか、アカウントを削除し、新しいアカウントを作成してゲームを続行してください。", + ["SEIZED_DESC_2"] = "サポートセンターに連絡する", + ["SEIZED_DESC_3"] = "アカウントを削除する", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index 979c7389..8c6a59c2 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "미수령 보상", ["EQUIP_DESC_26"] = "무기 {0}레벨 업그레이드 패키지", ["EQUIP_DESC_27"] = "방어구 {0}레벨 업그레이드 패키지", + ["SEIZED_DESC_1"] = "계정에 이상이 발견되었습니다. 문제 해결을 위해 고객 서비스에 문의하거나 계정을 삭제하시고 새 계정을 사용하여 게임을 계속 진행하시기 바랍니다.", + ["SEIZED_DESC_2"] = "고객 서비스 문의", + ["SEIZED_DESC_3"] = "계정 삭제", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index c875feba..64419409 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "Recompensas não coletadas", ["EQUIP_DESC_26"] = "Pacote de Melhoria de Arma a Nv.{0}", ["EQUIP_DESC_27"] = "Pacote de Melhoria de Armadura a Nv.{0}", + ["SEIZED_DESC_1"] = "Foi detectada alguma anormalidade com sua conta. Entre em contato com o atendimento ao cliente ou exclua a conta atual e crie uma nova conta para continuar jogando.", + ["SEIZED_DESC_2"] = "Atendimento ao Cliente", + ["SEIZED_DESC_3"] = "Excluir Conta", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index 92a43d78..2f55a840 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "รางวัลที่ยังไม่ได้รับ", ["EQUIP_DESC_26"] = "แพ็คอัปอาวุธ {0} เลเวล", ["EQUIP_DESC_27"] = "แพ็คอัปเกราะ {0} เลเวล", + ["SEIZED_DESC_1"] = "ตรวจพบบัญชีของคุณผิดปกติ โปรดติดต่อฝ่ายบริการลูกค้าหรือลบบัญชีและใช้บัญชีใหม่เพื่อเล่นเกมต่อ", + ["SEIZED_DESC_2"] = "ติดต่อฝ่ายบริการลูกค้า", + ["SEIZED_DESC_3"] = "ลบบัญชี", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index 54b69062..7f16b8b2 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "Chưa nhận quà", ["EQUIP_DESC_26"] = "Quà Tăng Ngay Vũ Khí Lv{0}", ["EQUIP_DESC_27"] = "Quà Tăng Ngay Phòng Cụ Lv{0}", + ["SEIZED_DESC_1"] = "Đã phát hiện tài khoản có bất thường, vui lòng liên hệ CSKH hoặc xóa TK và sử dụng TK mới để tiếp tục trò chơi.", + ["SEIZED_DESC_2"] = "Liên hệ CSKH", + ["SEIZED_DESC_3"] = "Xóa TK", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index 06ea2f80..dae7df04 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -462,6 +462,9 @@ local localization_global = ["ARENA_DESC_42"] = "未領取獎勵", ["EQUIP_DESC_26"] = "武器直升{0}級禮包", ["EQUIP_DESC_27"] = "防具直升{0}級禮包", + ["SEIZED_DESC_1"] = "檢測到你的賬號存在異常,請聯繫客服或刪除賬號使用新建賬號繼續遊戲。", + ["SEIZED_DESC_2"] = "聯繫客服", + ["SEIZED_DESC_3"] = "刪除賬號", } return localization_global \ No newline at end of file diff --git a/lua/app/module/equip/equip_manager.lua b/lua/app/module/equip/equip_manager.lua index d632787e..cfab2b57 100644 --- a/lua/app/module/equip/equip_manager.lua +++ b/lua/app/module/equip/equip_manager.lua @@ -24,7 +24,7 @@ end -- 请求触发装备升级礼包 function EquipManager:reqEquipUpgradeGift(heroId, part) - if DataManager.EquipData:getGiftId(heroId, part) ~= nil then + if DataManager.EquipData:getCanShowGiftId(heroId, part) ~= nil then return end diff --git a/lua/app/ui/arena/arena_grading_reward_ui.lua b/lua/app/ui/arena/arena_grading_reward_ui.lua index 7606f4cc..66a39251 100644 --- a/lua/app/ui/arena/arena_grading_reward_ui.lua +++ b/lua/app/ui/arena/arena_grading_reward_ui.lua @@ -33,9 +33,12 @@ function ArenaGradingRewardUI:onLoadRootComplete() self.scrollrectComp = uiMap["arena_grading_reward_ui.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) self.scrollrectContent = uiMap["arena_grading_reward_ui.scrollrect.viewport.content"] + self.bannerCanvas = uiMap["arena_grading_reward_ui.banner"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS) self.btnClose = uiMap["arena_grading_reward_ui.banner.btn_close"] self.txTips = uiMap["arena_grading_reward_ui.banner.tx_tips"] + self.bannerCanvas.overrideSorting = true + self.bannerCanvas.sortingOrder = self:getUIOrder() + GConst.UI_EFFECT_ORDER.LEVEL5 local cfg = DataManager.ArenaData:getGradingRewardCfg() self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_39)) @@ -43,6 +46,7 @@ function ArenaGradingRewardUI:onLoadRootComplete() return "app/ui/arena/cell/arena_grading_reward_cell" end) self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:setUI(self) cell:refresh(index) end) self.scrollrectComp:clearCells() diff --git a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua index 8b13f80c..9114a954 100644 --- a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua +++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua @@ -1,5 +1,8 @@ local ArenaGradingRewardCell = class("ArenaGradingRewardCell", BaseCell) +-- 光效 +local EFFECT_LIGHT = "assets/prefabs/effects/ui/vfx_ui_arena_gift_b01.prefab" + local COMMON_GRADING_POSY = 265 local UNLOCK_GRADING_POSY = 375 @@ -22,6 +25,7 @@ function ArenaGradingRewardCell:init() self.commonReward = uiMap["arena_grading_reward_cell.common_reward"] self.txDesc = uiMap["arena_grading_reward_cell.common_reward.tx_desc"] self.maskReward = uiMap["arena_grading_reward_cell.common_reward.mask"] + self.rootEffect = uiMap["arena_grading_reward_cell.common_reward.root_effect"] self.rewards = {} for i = 1, 4 do table.insert(self.rewards, uiMap["arena_grading_reward_cell.common_reward.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) @@ -42,6 +46,10 @@ function ArenaGradingRewardCell:init() end) end +function ArenaGradingRewardCell:setUI(root) + self.uiRoot = root +end + function ArenaGradingRewardCell:refresh(id) self.id = id local cfg = DataManager.ArenaData:getGradingRewardCfg()[self.id] @@ -135,10 +143,19 @@ function ArenaGradingRewardCell:refresh(id) self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_6)) end + self.rootEffect:removeAllChildren() + if canGet and not isReceived then + EffectManager:loadUIEffectAsync(EFFECT_LIGHT, self.uiRoot, self.rootEffect, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) + obj:setAnchoredPosition(0, 0) + obj:play() + end) + end + for idx, reward in ipairs(self.rewards) do if cfg.reward[idx] then reward:setVisible(true) reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived) + reward:showLight(canGet and not isReceived, self.uiRoot) else reward:setVisible(false) end diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index c2aaac5c..648455ed 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -1,5 +1,7 @@ local RewardCell = class("RewardCell", BaseCell) +local EFFECT_LIGHT = "assets/prefabs/effects/ui/vfx_ui_arena_gift_b02.prefab" + function RewardCell:init() local uiMap = self:getUIMap() self.icon = uiMap["reward_cell.item_bg.icon"] @@ -19,6 +21,8 @@ function RewardCell:init() -- 皮肤 self.skin = uiMap["reward_cell.skin"] self.skinQlt = uiMap["reward_cell.skin.img_qlt"] + -- 特效 + self.rootEffect = uiMap["reward_cell.root_effect"] self:hideFrameAnimation() self.baseObject:addClickListener(function() @@ -127,6 +131,8 @@ function RewardCell:_refreshItem(info, count) self.matchImg:setVisible(false) self.skin:setVisible(false) end + + self:showLight(false) end function RewardCell:setNumTx(str) @@ -202,4 +208,15 @@ function RewardCell:showLock(show) self.lock:setVisible(show == true) end +-- 展示光效 +function RewardCell:showLight(show, ui) + self.rootEffect:removeAllChildren() + if show and ui ~= nil then + EffectManager:loadUIEffectAsync(EFFECT_LIGHT, ui, self.rootEffect, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) + obj:setAnchoredPosition(0, 0) + obj:play() + end) + end +end + return RewardCell \ No newline at end of file diff --git a/lua/app/ui/dungeon/item_get_ui.lua b/lua/app/ui/dungeon/item_get_ui.lua index 2e651b11..f1be7771 100644 --- a/lua/app/ui/dungeon/item_get_ui.lua +++ b/lua/app/ui/dungeon/item_get_ui.lua @@ -128,7 +128,7 @@ function ItemGetUI:checkShowPanelGift() self.panelMain:setAnchoredPositionY(COMMON_MAIN_POSY) self.btnClose:setAnchoredPositionY(COMMON_CLOSE_POSY) - self.giftId = DataManager.EquipData:getGiftId(self.equipEntity:getHeroId(), self.equipEntity:getPart()) + self.giftId = DataManager.EquipData:getCanShowGiftId(self.equipEntity:getHeroId(), self.equipEntity:getPart()) if self.giftId == nil then return end diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 3ffda486..802c5f6b 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -455,7 +455,7 @@ end -- 是否有入口红点 function ArenaData:hasEntranceRedDot() - return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() + return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() or self:hasGradingRewardRedDot() end -- 广告宝箱 ---------------------------------------------------------------------- @@ -571,7 +571,8 @@ function ArenaData:getGradingRewardProgressByScore(id, score) local prog = 0.5 if score > point then - prog = prog + ((score - point) / (rangeMax - point)) + local half = ((score - point) / (rangeMax - point)) * 0.5 + prog = prog + half end return prog end diff --git a/lua/app/userdata/equip/equip_data.lua b/lua/app/userdata/equip/equip_data.lua index 40481cf0..579096fd 100644 --- a/lua/app/userdata/equip/equip_data.lua +++ b/lua/app/userdata/equip/equip_data.lua @@ -172,7 +172,7 @@ end -- 获取所有存在的该类型礼包 function EquipData:getGiftIdsByType(actType) local ids = {} - for id, trigger in pairs(self.gifts) do + for id, data in pairs(self.gifts) do local cfg = DataManager.ShopData:getActGiftConfig()[id] if cfg and actType == cfg.type and self:getGiftRemainTime(id) > 0 then table.insert(ids, id) @@ -183,8 +183,28 @@ function EquipData:getGiftIdsByType(actType) return ids end --- 获取当前存在的对应礼包 -function EquipData:getGiftId(heroId, part) +-- 获取可以展示的礼包 +function EquipData:getCanShowGiftId(heroId, part) + local giftId = self:getEquipGiftId(heroId, part) + + if not self:hasGiftData(giftId) then + return nil + end + + if self:getGiftRemainTime(giftId) > 0 then + return giftId + end + + return nil +end + +-- 当前是否存在礼包数据 +function EquipData:hasGiftData(giftId) + return self.gifts[giftId] ~= nil +end + +-- 获取装备对应的礼包id +function EquipData:getEquipGiftId(heroId, part) local giftType if part == GConst.EquipConst.PART_TYPE.WEAPON then giftType = PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT @@ -198,7 +218,7 @@ function EquipData:getGiftId(heroId, part) local level = DataManager.EquipData:getEquip(heroId, part):getLevel() for idx, id in pairs(self:getGiftIdsByType(giftType)) do - if self:meetGiftLevelRange(id, level) and self:getGiftRemainTime(id) > 0 then + if self:meetGiftLevelRange(id, level) then return id end end @@ -218,18 +238,41 @@ end -- 获取礼包剩余时间 function EquipData:getGiftRemainTime(giftId) + -- 没有礼包 if self.gifts[giftId] == nil then return 0 end - local cfg = DataManager.ShopData:getActGiftConfig()[giftId] - if cfg == nil then + -- 在冷却中 + if self:isGiftCooling(giftId) then return 0 end - local duration = cfg.limit_time * 60 * 60 + return (self.gifts[giftId].expire_at // 1000) - Time:getServerTime() +end - return (self.gifts[giftId] // 1000) + duration - Time:getServerTime() +-- 礼包是否在冷却时间中 +function EquipData:isGiftCooling(giftId) + local giftData = DataManager.ShopData:getActGiftDetailData(PayManager.PURCHARSE_TYPE.ACT_GIFT, giftId) + + if giftData then + local latestBuyTime = giftData.latest_buy_at // 1000 + local cfg = DataManager.ShopData:getActGiftConfig()[giftId] + if latestBuyTime > 0 then + -- 购买冷却 + local cdTime = (cfg.cd or 0) * 3600 + if latestBuyTime + cdTime > Time:getServerTime() then + return true + end + elseif self:hasGiftData(giftId) then + -- 到期冷却 + if self.gifts[giftId].cd_end_at // 1000 < Time:getServerTime() then + return true + end + end + end + + return false end -- 获取礼包显示的标题 @@ -255,7 +298,6 @@ end -- 购买礼包成功 function EquipData:onBuyGiftSuccess(giftId) Logger.logHighlight("购买装备礼包成功:"..giftId) - self.gifts[giftId] = nil self:setDirty() end