diff --git a/lua/app/config/act_growup_gift.lua b/lua/app/config/act_growup_gift.lua index 0a45e470..e2f0b83c 100644 --- a/lua/app/config/act_growup_gift.lua +++ b/lua/app/config/act_growup_gift.lua @@ -1,6 +1,6 @@ local act_growup_gift = { [1014]={ - ["hero_id"]=23001, + ["hero_id"]=14001, ["recharge_id"]=7, ["reward"]={ { @@ -16,8 +16,16 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["time_type"]=1, @@ -27,7 +35,7 @@ local act_growup_gift = { ["value"]=800 }, [1024]={ - ["hero_id"]=23001, + ["hero_id"]=14001, ["recharge_id"]=10, ["reward"]={ { @@ -35,8 +43,8 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, @@ -45,6 +53,14 @@ local act_growup_gift = { ["id_for_nothing"]="Vw==", ["num"]=10000, ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=12, + ["num_for_nothing"]="Vwo=" } }, ["time_type"]=1, @@ -54,7 +70,7 @@ local act_growup_gift = { ["value"]=800 }, [1034]={ - ["hero_id"]=23001, + ["hero_id"]=14001, ["recharge_id"]=13, ["reward"]={ { @@ -70,8 +86,16 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=24, + ["num_for_nothing"]="VAw=" } }, ["time_type"]=1, @@ -81,7 +105,7 @@ local act_growup_gift = { ["value"]=800 }, [1044]={ - ["hero_id"]=23001, + ["hero_id"]=14001, ["recharge_id"]=15, ["reward"]={ { @@ -89,16 +113,24 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=400, - ["num_for_nothing"]="Ughc" + ["num"]=450, + ["num_for_nothing"]="Ug1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=24000, + ["num_for_nothing"]="VAxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=36, + ["num_for_nothing"]="VQ4=" } }, ["time_type"]=1, @@ -108,7 +140,7 @@ local act_growup_gift = { ["value"]=800 }, [1054]={ - ["hero_id"]=23001, + ["hero_id"]=14001, ["recharge_id"]=17, ["reward"]={ { @@ -116,16 +148,24 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=34000, + ["num_for_nothing"]="VQxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=96, + ["num_for_nothing"]="Xw4=" } }, ["time_type"]=1, @@ -135,7 +175,7 @@ local act_growup_gift = { ["value"]=800 }, [1064]={ - ["hero_id"]=23001, + ["hero_id"]=14001, ["recharge_id"]=18, ["reward"]={ { @@ -143,16 +183,24 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=600, - ["num_for_nothing"]="UAhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=42000, + ["num_for_nothing"]="UgpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14001, + ["id_for_nothing"]="VwxcA2Q=", + ["num"]=138, + ["num_for_nothing"]="VwtU" } }, ["time_type"]=1, @@ -162,7 +210,7 @@ local act_growup_gift = { ["value"]=800 }, [2014]={ - ["hero_id"]=43001, + ["hero_id"]=24001, ["recharge_id"]=7, ["reward"]={ { @@ -178,8 +226,16 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24001, + ["id_for_nothing"]="VAxcA2Q=", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["time_type"]=1, @@ -190,7 +246,7 @@ local act_growup_gift = { ["value_2"]=1 }, [2024]={ - ["hero_id"]=43001, + ["hero_id"]=24001, ["recharge_id"]=10, ["reward"]={ { @@ -198,8 +254,8 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, @@ -208,6 +264,14 @@ local act_growup_gift = { ["id_for_nothing"]="Vw==", ["num"]=10000, ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24001, + ["id_for_nothing"]="VAxcA2Q=", + ["num"]=12, + ["num_for_nothing"]="Vwo=" } }, ["time_type"]=1, @@ -218,7 +282,7 @@ local act_growup_gift = { ["value_2"]=1 }, [2034]={ - ["hero_id"]=43001, + ["hero_id"]=24001, ["recharge_id"]=13, ["reward"]={ { @@ -234,8 +298,16 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24001, + ["id_for_nothing"]="VAxcA2Q=", + ["num"]=24, + ["num_for_nothing"]="VAw=" } }, ["time_type"]=1, @@ -246,7 +318,7 @@ local act_growup_gift = { ["value_2"]=1 }, [2044]={ - ["hero_id"]=43001, + ["hero_id"]=24001, ["recharge_id"]=15, ["reward"]={ { @@ -254,16 +326,24 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=400, - ["num_for_nothing"]="Ughc" + ["num"]=450, + ["num_for_nothing"]="Ug1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=24000, + ["num_for_nothing"]="VAxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24001, + ["id_for_nothing"]="VAxcA2Q=", + ["num"]=36, + ["num_for_nothing"]="VQ4=" } }, ["time_type"]=1, @@ -274,7 +354,7 @@ local act_growup_gift = { ["value_2"]=1 }, [2054]={ - ["hero_id"]=43001, + ["hero_id"]=24001, ["recharge_id"]=17, ["reward"]={ { @@ -282,16 +362,24 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=34000, + ["num_for_nothing"]="VQxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24001, + ["id_for_nothing"]="VAxcA2Q=", + ["num"]=96, + ["num_for_nothing"]="Xw4=" } }, ["time_type"]=1, @@ -302,7 +390,7 @@ local act_growup_gift = { ["value_2"]=1 }, [2064]={ - ["hero_id"]=43001, + ["hero_id"]=24001, ["recharge_id"]=18, ["reward"]={ { @@ -310,8 +398,80 @@ local act_growup_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=600, - ["num_for_nothing"]="UAhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=42000, + ["num_for_nothing"]="UgpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24001, + ["id_for_nothing"]="VAxcA2Q=", + ["num"]=138, + ["num_for_nothing"]="VwtU" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [3014]={ + ["hero_id"]=34001, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [3024]={ + ["hero_id"]=34001, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, @@ -320,6 +480,590 @@ local act_growup_gift = { ["id_for_nothing"]="Vw==", ["num"]=10000, ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [3034]={ + ["hero_id"]=34001, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=24, + ["num_for_nothing"]="VAw=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [3044]={ + ["hero_id"]=34001, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=450, + ["num_for_nothing"]="Ug1c" + }, + { + ["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"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=36, + ["num_for_nothing"]="VQ4=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [3054]={ + ["hero_id"]=34001, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=34000, + ["num_for_nothing"]="VQxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=96, + ["num_for_nothing"]="Xw4=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [3064]={ + ["hero_id"]=34001, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=42000, + ["num_for_nothing"]="UgpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34001, + ["id_for_nothing"]="VQxcA2Q=", + ["num"]=138, + ["num_for_nothing"]="VwtU" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [4014]={ + ["hero_id"]=44001, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [4024]={ + ["hero_id"]=44001, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [4034]={ + ["hero_id"]=44001, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=24, + ["num_for_nothing"]="VAw=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [4044]={ + ["hero_id"]=44001, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=450, + ["num_for_nothing"]="Ug1c" + }, + { + ["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"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=36, + ["num_for_nothing"]="VQ4=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [4054]={ + ["hero_id"]=44001, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=34000, + ["num_for_nothing"]="VQxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=96, + ["num_for_nothing"]="Xw4=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [4064]={ + ["hero_id"]=44001, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=42000, + ["num_for_nothing"]="UgpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=138, + ["num_for_nothing"]="VwtU" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [5014]={ + ["hero_id"]=54001, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [5024]={ + ["hero_id"]=54001, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=12, + ["num_for_nothing"]="Vwo=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [5034]={ + ["hero_id"]=54001, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=24, + ["num_for_nothing"]="VAw=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [5044]={ + ["hero_id"]=54001, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=450, + ["num_for_nothing"]="Ug1c" + }, + { + ["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"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=36, + ["num_for_nothing"]="VQ4=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [5054]={ + ["hero_id"]=54001, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=34000, + ["num_for_nothing"]="VQxcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=96, + ["num_for_nothing"]="Xw4=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [5064]={ + ["hero_id"]=54001, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=42000, + ["num_for_nothing"]="UgpcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=138, + ["num_for_nothing"]="VwtU" } }, ["time_type"]=1, @@ -331,6 +1075,6 @@ local act_growup_gift = { } } local config = { -data=act_growup_gift,count=12 +data=act_growup_gift,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 1e846264..9bf7a209 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -118,8 +118,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 10000, - 10000 + 30000, + 30000 } }, [2]={ @@ -415,8 +415,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 50000, - 50000 + 30000, + 30000 } }, [4]={ @@ -612,8 +612,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 100000, - 100000 + 30000, + 30000 } }, [5]={ @@ -815,8 +815,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 150000, - 150000 + 30000, + 30000 } }, [6]={ @@ -1018,8 +1018,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 200000, - 200000 + 30000, + 30000 } }, [7]={ @@ -1237,8 +1237,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 250000, - 250000 + 30000, + 30000 } }, [8]={ @@ -1456,8 +1456,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 300000, - 300000 + 30000, + 30000 } }, [9]={ @@ -1675,8 +1675,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 400000, - 400000 + 30000, + 30000 } }, [10]={ @@ -1894,8 +1894,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 500000, - 500000 + 30000, + 30000 } }, [11]={ @@ -2113,8 +2113,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 600000, - 700000 + 30000, + 30000 } }, [12]={ @@ -2332,8 +2332,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 700000, - 900000 + 30000, + 30000 } }, [13]={ @@ -2551,8 +2551,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 870000, - 1080000 + 30000, + 30000 } }, [14]={ @@ -2770,8 +2770,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 1050000, - 1300000 + 30000, + 30000 } }, [15]={ @@ -2989,8 +2989,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 1240000, - 1550000 + 30000, + 30000 } }, [16]={ @@ -3208,8 +3208,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 1440000, - 1810000 + 30000, + 30000 } }, [17]={ @@ -3427,8 +3427,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 1660000, - 2100000 + 30000, + 30000 } }, [18]={ @@ -3646,8 +3646,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 1850000, - 2350000 + 30000, + 30000 } }, [19]={ @@ -3865,8 +3865,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 2040000, - 2600000 + 30000, + 30000 } }, [20]={ @@ -4084,8 +4084,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 2230000, - 2860000 + 30000, + 30000 } }, [21]={ @@ -4303,8 +4303,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 2430000, - 3110000 + 30000, + 30000 } }, [22]={ @@ -4522,8 +4522,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 2590000, - 3330000 + 30000, + 30000 } }, [23]={ @@ -4741,8 +4741,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 2760000, - 3560000 + 30000, + 30000 } }, [24]={ @@ -4960,8 +4960,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 2910000, - 3770000 + 30000, + 30000 } }, [25]={ @@ -5179,8 +5179,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 3080000, - 3990000 + 30000, + 30000 } }, [26]={ @@ -5398,8 +5398,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 3200000, - 4150000 + 30000, + 30000 } }, [27]={ @@ -5617,8 +5617,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 3320000, - 4310000 + 30000, + 30000 } }, [28]={ @@ -5836,8 +5836,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 3430000, - 4470000 + 30000, + 30000 } }, [29]={ @@ -6055,8 +6055,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 3570000, - 4660000 + 30000, + 30000 } }, [30]={ @@ -6273,8 +6273,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 3710000, - 4850000 + 30000, + 30000 } } } diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 47c897b8..f2452563 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -191,9 +191,15 @@ local const = { }, ["model_daily_challenge"]={ ["value"]=8000 + }, + ["level_fund_hero_1"]={ + ["value"]=14001 + }, + ["level_fund_hero_2"]={ + ["value"]=54001 } } local config = { -data=const,count=41 +data=const,count=43 } return config \ No newline at end of file diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 4696b23b..59b643f4 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -44,7 +44,7 @@ local func_open = { ["icon"]="main_daily_challenge" }, ["act_gift_show_open"]={ - ["stage"]=2, + ["stage"]=3, ["pop_ups"]=1 }, ["first_charge"]={ diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 75649dc4..a027d9ce 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -529,6 +529,11 @@ local monster_base = { ["body"]=2, ["model_ui"]=1.0 }, + [30019]={ + ["model_id"]="p0019", + ["body"]=2, + ["model_ui"]=1.0 + }, [30020]={ ["model_id"]="p0020", ["body"]=2, @@ -541,6 +546,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index ef2a7129..30968d88 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -1148,20 +1148,20 @@ local monster_chapter = { ["monster_exp"]=17000 }, [9001]={ - ["monster_base"]=30022, + ["monster_base"]=30019, ["is_boss"]=2, ["hp"]=108900000, ["atk"]=1070000, ["atk_times"]=4, ["hurt_skill"]={ - 40001, - 40002, - 40003, - 40004 + 40029, + 40030, + 40031, + 40032 }, ["skill"]={ - 10021, - 10022 + 10067, + 10068 }, ["monster_exp"]=22000 }, @@ -4283,22 +4283,19 @@ local monster_chapter = { ["monster_exp"]=17000 }, [33001]={ - ["monster_base"]=30006, + ["monster_base"]=30020, ["is_boss"]=2, ["hp"]=264700000, ["atk"]=2850000, ["atk_times"]=4, ["hurt_skill"]={ - 40017, - 40018, - 40019, - 40020 + 40033, + 40034, + 40035, + 40036 }, ["skill"]={ - 10038 - }, - ["passive_skill"]={ - 10037 + 10069 }, ["monster_exp"]=22000 }, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 3aeb1c33..b06e7002 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -6311,6 +6311,121 @@ local skill = { ["cd"]=3, ["cd_start"]=0 }, + [10067]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=30000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]=4200120, + ["name_act"]="skill01" + }, + [10068]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="counterattack", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1, + ["cd"]=3, + ["cd_start"]=0 + }, + [10069]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=9400, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="vulnerable", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="poison", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["eliminate_obj"]=1, + ["effect_block"]={ + 1, + 2, + 3, + 6 + }, + ["skill_position"]=1, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, [20001]={ ["effect_type"]=1, ["trigger"]=1, @@ -11735,6 +11850,158 @@ local skill = { ["name_act"]="attack04", ["fx_target"]=300015 }, + [40029]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200111, + ["name_act"]="attack01", + ["fx_target"]=300013 + }, + [40030]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200112, + ["name_act"]="attack02", + ["fx_target"]=300013 + }, + [40031]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200113, + ["name_act"]="attack03", + ["fx_target"]=300014 + }, + [40032]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200114, + ["name_act"]="attack04", + ["fx_target"]=300015 + }, + [40033]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200111, + ["name_act"]="attack01", + ["fx_target"]=300013 + }, + [40034]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200112, + ["name_act"]="attack02", + ["fx_target"]=300013 + }, + [40035]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200113, + ["name_act"]="attack03", + ["fx_target"]=300014 + }, + [40036]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=5200114, + ["name_act"]="attack04", + ["fx_target"]=300015 + }, [110001]={ ["skill_type"]=5, ["skill_position"]=2, @@ -11813,6 +12080,6 @@ local skill = { } } local config = { -data=skill,count=557 +data=skill,count=568 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua index e6b7458c..0cc0b082 100644 --- a/lua/app/config/strings/cn/monster_base.lua +++ b/lua/app/config/strings/cn/monster_base.lua @@ -317,6 +317,9 @@ local monster_base = { [30017]={ ["name"]="雷神" }, + [30019]={ + ["name"]="灵魂猎手" + }, [30020]={ ["name"]="森林狼" }, @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/monster_base.lua b/lua/app/config/strings/de/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/de/monster_base.lua +++ b/lua/app/config/strings/de/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/en/monster_base.lua +++ b/lua/app/config/strings/en/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/monster_base.lua b/lua/app/config/strings/fr/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/fr/monster_base.lua +++ b/lua/app/config/strings/fr/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/monster_base.lua b/lua/app/config/strings/id/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/id/monster_base.lua +++ b/lua/app/config/strings/id/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/monster_base.lua b/lua/app/config/strings/ja/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/ja/monster_base.lua +++ b/lua/app/config/strings/ja/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/monster_base.lua b/lua/app/config/strings/ko/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/ko/monster_base.lua +++ b/lua/app/config/strings/ko/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/monster_base.lua b/lua/app/config/strings/pt/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/pt/monster_base.lua +++ b/lua/app/config/strings/pt/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/monster_base.lua b/lua/app/config/strings/ru/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/ru/monster_base.lua +++ b/lua/app/config/strings/ru/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/monster_base.lua b/lua/app/config/strings/th/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/th/monster_base.lua +++ b/lua/app/config/strings/th/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/monster_base.lua b/lua/app/config/strings/vi/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/vi/monster_base.lua +++ b/lua/app/config/strings/vi/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua index a6020910..224fcc53 100644 --- a/lua/app/config/strings/zh/monster_base.lua +++ b/lua/app/config/strings/zh/monster_base.lua @@ -316,6 +316,9 @@ local monster_base = { }, [30017]={ + }, + [30019]={ + }, [30020]={ @@ -325,6 +328,6 @@ local monster_base = { } } local config = { -data=monster_base,count=108 +data=monster_base,count=109 } return config \ No newline at end of file diff --git a/lua/app/ui/fund/growth_fund_ui.lua b/lua/app/ui/fund/growth_fund_ui.lua index 7c4a8ffc..af9d2f42 100644 --- a/lua/app/ui/fund/growth_fund_ui.lua +++ b/lua/app/ui/fund/growth_fund_ui.lua @@ -49,6 +49,9 @@ function GrowthFundUI:onClose() if self.originTitleBgHeight then self.uiMap["growth_fund_ui.title_img.bg"]:setSizeDeltaY(self.originTitleBgHeight) end + if self.heroNode then + self.heroNode:removeAllChildren() + end end function GrowthFundUI:onLoadRootComplete() @@ -68,6 +71,7 @@ function GrowthFundUI:initTitle() self.titleTx = self.uiMap["growth_fund_ui.title_img.title_tx"] self.titleDialogBg = self.uiMap["growth_fund_ui.title_img.bg"] self.originTitleBgHeight = self.titleDialogBg:fastGetSizeDeltaY() + self.heroNode = self.uiMap["growth_fund_ui.title_img.hero_node"] end function GrowthFundUI:initPayBtns() @@ -131,8 +135,12 @@ function GrowthFundUI:refreshTitle() local fundGrade = DataManager.GrowthFundData:getFundGrade() if fundGrade == 1 then self.uiMap["growth_fund_ui.title_img"]:setTexture("assets/arts/textures/background/fund/fund_bg_1.png") + self.titleDialogBg:setSprite(GConst.ATLAS_PATH.FUND, "fund_bg_9") + self:showHeroSpine(1) elseif fundGrade == 2 then self.uiMap["growth_fund_ui.title_img"]:setTexture("assets/arts/textures/background/fund/fund_bg_2.png") + self.titleDialogBg:setSprite(GConst.ATLAS_PATH.FUND, "fund_bg_1") + self:showHeroSpine(2) end self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.LEVEL_FUND_DESC_1, fundGrade)) local height = self.titleTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredHeight + 58 @@ -200,4 +208,35 @@ function GrowthFundUI:refreshRewards() self.horizontalLine:setAnchoredPositionY(-topRecoveryOffset - (self.inactiveIndex - 1)*cellWidth) end +function GrowthFundUI:showHeroSpine(index) + if self.heroSpineIndex == index then + return + end + self.heroSpineIndex = index + local heroId = 0 + if index == 1 then + heroId = GFunc.getConstValue("level_fund_hero_1") + elseif index == 2 then + heroId = GFunc.getConstValue("level_fund_hero_2") + end + if heroId <= 0 then + return + end + local hero = DataManager.HeroData:getHeroById(heroId) + if not hero then + return + end + SpineManager:loadHeroAsync(hero:getModelId(), self.heroNode, function(spineObject) + if self:isClosed() then + spineObject:destroy() + return + end + if self.heroSpine then + self.heroSpine:destroy() + end + spineObject:playAnimation("idle", true) + self.heroSpine = spineObject + end) +end + return GrowthFundUI \ No newline at end of file