diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 367126eb..c08b50f3 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1567,9 +1567,139 @@ local act_gift = { ["limit_time"]=12, ["cd"]=1, ["value"]=1000 + }, + [130002]={ + ["type"]=13, + ["recharge_id"]=10, + ["limit"]=1 + }, + [130102]={ + ["type"]=13, + ["recharge_id"]=13, + ["limit"]=1 + }, + [130202]={ + ["type"]=13, + ["recharge_id"]=15, + ["reward"]={ + { + ["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"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=43, + ["id_for_nothing"]="Ugs=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["limit"]=1, + ["value"]=1000 + }, + [130302]={ + ["type"]=13, + ["recharge_id"]=15, + ["reward"]={ + { + ["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"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=43, + ["id_for_nothing"]="Ugs=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["limit"]=1, + ["value"]=1000 + }, + [130402]={ + ["type"]=13, + ["recharge_id"]=12, + ["reward"]={ + { + ["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"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=43, + ["id_for_nothing"]="Ugs=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["limit"]=1, + ["value"]=1000 } } local config = { -data=act_gift,count=49 +data=act_gift,count=54 } return config \ No newline at end of file diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua new file mode 100644 index 00000000..68e7d1e1 --- /dev/null +++ b/lua/app/config/activity.lua @@ -0,0 +1,11 @@ +local activity = { + [106]={ + ["act_type"]=1, + ["start_time"]="2023-08-22 00:00:00", + ["end_time"]="2023-08-29 00:00:00" + } +} +local config = { +data=activity,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity.lua.meta b/lua/app/config/activity.lua.meta new file mode 100644 index 00000000..7c48794a --- /dev/null +++ b/lua/app/config/activity.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fe4c1620192e0df40af27ef7fd1a21b6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/activity_bounty_level.lua b/lua/app/config/activity_bounty_level.lua new file mode 100644 index 00000000..660aba85 --- /dev/null +++ b/lua/app/config/activity_bounty_level.lua @@ -0,0 +1,846 @@ +local activity_bounty_level = { + [101]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [102]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["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"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [103]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [104]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [105]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [106]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [107]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["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"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [108]={ + ["act_id"]=106, + ["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"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [109]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [110]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [111]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [112]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [113]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [114]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [115]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [116]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["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"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [117]={ + ["act_id"]=106, + ["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"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [118]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [119]={ + ["act_id"]=106, + ["exp"]=150, + ["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==" + } + }, + [120]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [121]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [122]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + [123]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [124]={ + ["act_id"]=106, + ["exp"]=150, + ["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==" + } + }, + [125]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54001, + ["id_for_nothing"]="UwxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [126]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["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"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + [127]={ + ["act_id"]=106, + ["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"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [128]={ + ["act_id"]=106, + ["exp"]=150, + ["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"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [129]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [130]={ + ["act_id"]=106, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["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==" + } + } +} +local config = { +data=activity_bounty_level,count=30 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_bounty_level.lua.meta b/lua/app/config/activity_bounty_level.lua.meta new file mode 100644 index 00000000..a958c5f0 --- /dev/null +++ b/lua/app/config/activity_bounty_level.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 60cbee20c73d9fe49b70a17eba0931e6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/activity_bounty_task.lua b/lua/app/config/activity_bounty_task.lua new file mode 100644 index 00000000..1070d8e7 --- /dev/null +++ b/lua/app/config/activity_bounty_task.lua @@ -0,0 +1,132 @@ +local activity_bounty_task = { + [1]={ + ["type"]=22, + ["number"]={ + 1, + 2, + 3, + 4, + 5, + 6, + 7 + }, + ["reward"]={ + 100, + 100, + 100, + 100, + 100, + 100, + 100 + } + }, + [2]={ + ["type"]=1, + ["number"]={ + 10, + 20, + 30, + 40, + 50, + 60, + 70 + }, + ["reward"]={ + 100, + 100, + 100, + 100, + 100, + 100, + 100 + } + }, + [3]={ + ["type"]=11, + ["number"]={ + 30, + 60, + 90, + 120, + 150, + 180, + 210 + }, + ["reward"]={ + 100, + 100, + 100, + 100, + 100, + 100, + 100 + } + }, + [4]={ + ["type"]=12, + ["number"]={ + 10, + 20, + 30, + 40, + 50, + 60, + 70 + }, + ["reward"]={ + 100, + 100, + 100, + 100, + 100, + 100, + 100 + } + }, + [5]={ + ["type"]=10, + ["number"]={ + 1, + 2, + 3, + 4, + 5, + 6, + 7 + }, + ["reward"]={ + 100, + 100, + 100, + 100, + 100, + 100, + 100 + } + }, + [6]={ + ["type"]=19, + ["number"]={ + 10, + 20, + 30, + 40, + 50, + 60, + 70 + }, + ["reward"]={ + 100, + 100, + 100, + 100, + 100, + 100, + 100 + } + } +} +local config = { +data=activity_bounty_task,count=6 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_bounty_task.lua.meta b/lua/app/config/activity_bounty_task.lua.meta new file mode 100644 index 00000000..612637c0 --- /dev/null +++ b/lua/app/config/activity_bounty_task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d61c8b9ff81efe2428f8d9f200681630 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/arena_board.lua b/lua/app/config/arena_board.lua index 5c4b8208..819bb7bc 100644 --- a/lua/app/config/arena_board.lua +++ b/lua/app/config/arena_board.lua @@ -17038,4269 +17038,9 @@ local arena_board = { 0 } } - }, - [61]={ - ["board"]={ - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - } - } - }, - [62]={ - ["board"]={ - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - } - } - }, - [63]={ - ["board"]={ - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - } - } - }, - [64]={ - ["board"]={ - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - } - } - }, - [65]={ - ["board"]={ - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - } - } - }, - [66]={ - ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - } - } - }, - [67]={ - ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - } - } - }, - [68]={ - ["board"]={ - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - } - } - }, - [69]={ - ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - } - } - }, - [70]={ - ["board"]={ - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - } - } - }, - [71]={ - ["board"]={ - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - } - } - }, - [72]={ - ["board"]={ - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 35 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - } - } - }, - [73]={ - ["board"]={ - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - } - } - }, - [74]={ - ["board"]={ - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - } - } - }, - [75]={ - ["board"]={ - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 36, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 35, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - } - } } } local config = { -data=arena_board,count=75 +data=arena_board,count=60 } return config \ No newline at end of file diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index 8f17d73b..b96e1fee 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -1633,8 +1633,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44, - ["id_for_nothing"]="Ugw=", + ["id"]=23, + ["id_for_nothing"]="VAs=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 87b1a066..fbc203a0 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -2186,11 +2186,11 @@ local arena_rank = { } }, ["rand_board"]={ - 61, - 62, - 63, - 64, - 65 + 1, + 2, + 3, + 4, + 5 }, ["effect"]={ { @@ -2352,11 +2352,11 @@ local arena_rank = { } }, ["rand_board"]={ - 61, - 62, - 63, - 64, - 65 + 6, + 7, + 8, + 9, + 10 }, ["effect"]={ { @@ -2518,11 +2518,11 @@ local arena_rank = { } }, ["rand_board"]={ - 61, - 62, - 63, - 64, - 65 + 11, + 12, + 13, + 14, + 15 }, ["effect"]={ { @@ -2557,8 +2557,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=45, - ["id_for_nothing"]="Ug0=", + ["id"]=24, + ["id_for_nothing"]="VAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2692,11 +2692,11 @@ local arena_rank = { } }, ["rand_board"]={ - 66, - 67, - 68, - 69, - 70 + 16, + 17, + 18, + 19, + 20 }, ["effect"]={ { @@ -2731,8 +2731,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=45, - ["id_for_nothing"]="Ug0=", + ["id"]=24, + ["id_for_nothing"]="VAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2866,11 +2866,11 @@ local arena_rank = { } }, ["rand_board"]={ - 66, - 67, - 68, - 69, - 70 + 21, + 22, + 23, + 24, + 25 }, ["effect"]={ { @@ -2905,8 +2905,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=45, - ["id_for_nothing"]="Ug0=", + ["id"]=24, + ["id_for_nothing"]="VAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3040,11 +3040,11 @@ local arena_rank = { } }, ["rand_board"]={ - 66, - 67, - 68, - 69, - 70 + 26, + 27, + 28, + 29, + 30 }, ["effect"]={ { @@ -3079,8 +3079,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=45, - ["id_for_nothing"]="Ug0=", + ["id"]=24, + ["id_for_nothing"]="VAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3214,11 +3214,11 @@ local arena_rank = { } }, ["rand_board"]={ - 66, - 67, - 68, - 69, - 70 + 31, + 32, + 33, + 34, + 35 }, ["effect"]={ { @@ -3253,8 +3253,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=46, - ["id_for_nothing"]="Ug4=", + ["id"]=25, + ["id_for_nothing"]="VA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3388,11 +3388,11 @@ local arena_rank = { } }, ["rand_board"]={ - 71, - 72, - 73, - 74, - 75 + 36, + 37, + 38, + 39, + 40 }, ["effect"]={ { @@ -3427,8 +3427,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=46, - ["id_for_nothing"]="Ug4=", + ["id"]=25, + ["id_for_nothing"]="VA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3562,11 +3562,11 @@ local arena_rank = { } }, ["rand_board"]={ - 71, - 72, - 73, - 74, - 75 + 41, + 42, + 43, + 44, + 45 }, ["effect"]={ { @@ -3601,8 +3601,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=46, - ["id_for_nothing"]="Ug4=", + ["id"]=25, + ["id_for_nothing"]="VA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3736,11 +3736,11 @@ local arena_rank = { } }, ["rand_board"]={ - 71, - 72, - 73, - 74, - 75 + 46, + 47, + 48, + 49, + 50 }, ["effect"]={ { @@ -3775,8 +3775,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=46, - ["id_for_nothing"]="Ug4=", + ["id"]=25, + ["id_for_nothing"]="VA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3910,11 +3910,11 @@ local arena_rank = { } }, ["rand_board"]={ - 71, - 72, - 73, - 74, - 75 + 51, + 52, + 53, + 54, + 55 }, ["effect"]={ { @@ -3949,8 +3949,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=46, - ["id_for_nothing"]="Ug4=", + ["id"]=25, + ["id_for_nothing"]="VA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4084,11 +4084,11 @@ local arena_rank = { } }, ["rand_board"]={ - 71, - 72, - 73, - 74, - 75 + 56, + 57, + 58, + 59, + 60 }, ["effect"]={ { diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua index 204745ac..cc73659d 100644 --- a/lua/app/config/avatar.lua +++ b/lua/app/config/avatar.lua @@ -3,11 +3,6 @@ local avatar = { ["iconId"]="avatar_1", ["item"]=23 }, - [24]={ - ["iconId"]="avatar_2", - ["item"]=44, - ["unlock_show"]=true - }, [1001]={ ["iconId"]="1", ["hero"]=12001 @@ -113,6 +108,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua index 818a2917..a45443e0 100644 --- a/lua/app/config/avatar_frame.lua +++ b/lua/app/config/avatar_frame.lua @@ -10,19 +10,9 @@ local avatar_frame = { [25]={ ["iconId"]="avatar_frame_3", ["item"]=25 - }, - [26]={ - ["iconId"]="avatar_frame_2", - ["item"]=45, - ["unlock_show"]=true - }, - [27]={ - ["iconId"]="avatar_frame_3", - ["item"]=46, - ["unlock_show"]=true } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 40f383f6..8a819eeb 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -38492,6 +38492,13 @@ local chapter_board = { 0, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=45, + ["type"]=1, + ["direction"]=1 + } } }, [132]={ diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 86e757f4..2da00c81 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -350,9 +350,22 @@ local const = { ["num"]=5, ["num_for_nothing"]="Uw==" } + }, + ["activity_bounty_day"]={ + ["value"]=6 + }, + ["activity_bounty_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } } } local config = { -data=const,count=73 +data=const,count=75 } 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 e481f6d9..6e56f104 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -94,9 +94,17 @@ local func_open = { ["dungeon_armor_open"]={ ["stage"]=10, ["pop_ups"]=1 + }, + ["skin_open"]={ + ["stage"]=5, + ["pop_ups"]=1 + }, + ["activity_open"]={ + ["stage"]=4, + ["pop_ups"]=1 } } local config = { -data=func_open,count=24 +data=func_open,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/grid_edge_type.lua b/lua/app/config/grid_edge_type.lua index de272561..8b3c5a45 100644 --- a/lua/app/config/grid_edge_type.lua +++ b/lua/app/config/grid_edge_type.lua @@ -1,29 +1,14 @@ local grid_edge_type = { [1]={ - ["icon"]="battle_obstacle_stick_3", - ["break_condition"]={ - 1, - 2, - 3 - } + ["icon"]="battle_obstacle_stick_3" }, [2]={ ["icon"]="battle_obstacle_stick_2", - ["next_type"]=1, - ["break_condition"]={ - 1, - 2, - 3 - } + ["next_type"]=1 }, [3]={ ["icon"]="battle_obstacle_stick_1", ["next_type"]=2, - ["break_condition"]={ - 1, - 2, - 3 - }, ["break_sfx"]="sfx_piece_za_b01" } } diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 9b918709..4e098105 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -56,7 +56,10 @@ local hero = { ["icon"]="1", ["item_id"]=12001, ["unlock_chapter"]=1, - ["collection_point"]=2 + ["collection_point"]=2, + ["skin"]={ + 12001 + } }, [13001]={ ["position"]=1, @@ -116,7 +119,10 @@ local hero = { ["item_id"]=13001, ["unlock_chapter"]=5, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 13001 + } }, [13002]={ ["position"]=1, @@ -176,7 +182,10 @@ local hero = { ["item_id"]=13002, ["unlock_chapter"]=9, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 13002 + } }, [14001]={ ["position"]=1, @@ -236,7 +245,10 @@ local hero = { ["item_id"]=14001, ["unlock_chapter"]=14, ["is_show"]=1, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 14001 + } }, [14002]={ ["position"]=1, @@ -294,7 +306,11 @@ local hero = { ["model_id"]="p0018", ["icon"]="23", ["item_id"]=14002, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 14002, + 1400201 + } }, [22001]={ ["position"]=2, @@ -353,7 +369,10 @@ local hero = { ["icon"]="2", ["item_id"]=22001, ["unlock_chapter"]=1, - ["collection_point"]=2 + ["collection_point"]=2, + ["skin"]={ + 22001 + } }, [23001]={ ["position"]=2, @@ -413,7 +432,10 @@ local hero = { ["item_id"]=23001, ["unlock_chapter"]=8, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 23001 + } }, [23002]={ ["position"]=2, @@ -473,7 +495,10 @@ local hero = { ["item_id"]=23002, ["unlock_chapter"]=5, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 23002 + } }, [24001]={ ["position"]=2, @@ -533,7 +558,10 @@ local hero = { ["item_id"]=24001, ["unlock_chapter"]=6, ["is_show"]=1, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 24001 + } }, [24002]={ ["position"]=2, @@ -591,7 +619,10 @@ local hero = { ["model_id"]="p0017", ["icon"]="22", ["item_id"]=24002, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 24002 + } }, [32001]={ ["position"]=3, @@ -650,7 +681,10 @@ local hero = { ["icon"]="3", ["item_id"]=32001, ["unlock_chapter"]=1, - ["collection_point"]=2 + ["collection_point"]=2, + ["skin"]={ + 32001 + } }, [33001]={ ["position"]=3, @@ -710,7 +744,10 @@ local hero = { ["item_id"]=33001, ["unlock_chapter"]=4, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 33001 + } }, [33002]={ ["position"]=3, @@ -770,7 +807,10 @@ local hero = { ["item_id"]=33002, ["unlock_chapter"]=7, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 33002 + } }, [34001]={ ["position"]=3, @@ -830,7 +870,11 @@ local hero = { ["item_id"]=34001, ["unlock_chapter"]=2, ["is_show"]=1, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 34001, + 3400101 + } }, [34002]={ ["position"]=3, @@ -888,7 +932,72 @@ local hero = { ["model_id"]="p0024", ["icon"]="24", ["item_id"]=34002, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 34002 + } + }, + [34003]={ + ["position"]=3, + ["qlt"]=4, + ["hurt_skill"]={ + 3400310, + 3400311, + 3400312, + 3400313 + }, + ["base_skill"]=3400320, + ["rouge_skill"]=3400300, + ["rouge_skill_1"]=3400301, + ["rouge_skill_2"]=3400302, + ["rouge_skill_3"]=3400303, + ["rouge_skill_4"]=3400304, + ["rouge_skill_5"]=3400305, + ["rouge_skill_6"]=3400306, + ["rouge_skill_7"]=3400307, + ["begin_lv"]=5, + ["hp"]={ + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 + }, + ["atk"]={ + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 + }, + ["model_id"]="p0027", + ["icon"]="24", + ["item_id"]=34002, + ["unlock_arena"]=6, + ["collection_point"]=5, + ["skin"]={ + 34003 + } }, [42001]={ ["position"]=4, @@ -947,7 +1056,10 @@ local hero = { ["icon"]="4", ["item_id"]=42001, ["unlock_chapter"]=1, - ["collection_point"]=2 + ["collection_point"]=2, + ["skin"]={ + 42001 + } }, [43001]={ ["position"]=4, @@ -1007,7 +1119,10 @@ local hero = { ["item_id"]=43001, ["unlock_chapter"]=2, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 43001 + } }, [43002]={ ["position"]=4, @@ -1067,7 +1182,10 @@ local hero = { ["item_id"]=43002, ["unlock_chapter"]=7, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 43002 + } }, [44001]={ ["position"]=4, @@ -1127,7 +1245,10 @@ local hero = { ["item_id"]=44001, ["unlock_chapter"]=10, ["is_show"]=1, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 44001 + } }, [44002]={ ["position"]=4, @@ -1187,7 +1308,71 @@ local hero = { ["item_id"]=44002, ["unlock_chapter"]=18, ["is_show"]=1, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 44002 + } + }, + [44003]={ + ["position"]=3, + ["qlt"]=4, + ["hurt_skill"]={ + 4400310, + 4400311, + 4400312, + 4400313 + }, + ["base_skill"]=4400320, + ["rouge_skill"]=4400300, + ["rouge_skill_1"]=4400301, + ["rouge_skill_2"]=4400302, + ["rouge_skill_3"]=4400303, + ["rouge_skill_4"]=4400304, + ["rouge_skill_5"]=4400305, + ["rouge_skill_6"]=4400306, + ["rouge_skill_7"]=4400307, + ["begin_lv"]=5, + ["hp"]={ + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 + }, + ["atk"]={ + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 + }, + ["model_id"]="p0030", + ["icon"]="24", + ["item_id"]=44003, + ["collection_point"]=5, + ["skin"]={ + 44003 + } }, [52001]={ ["position"]=5, @@ -1247,7 +1432,10 @@ local hero = { ["item_id"]=52001, ["unlock_chapter"]=2, ["is_show"]=1, - ["collection_point"]=2 + ["collection_point"]=2, + ["skin"]={ + 52001 + } }, [53001]={ ["position"]=5, @@ -1307,7 +1495,11 @@ local hero = { ["item_id"]=53001, ["unlock_chapter"]=9, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 53001, + 5300101 + } }, [53002]={ ["position"]=5, @@ -1367,7 +1559,10 @@ local hero = { ["item_id"]=53002, ["unlock_chapter"]=6, ["is_show"]=1, - ["collection_point"]=3 + ["collection_point"]=3, + ["skin"]={ + 53002 + } }, [54001]={ ["position"]=5, @@ -1425,7 +1620,11 @@ local hero = { ["model_id"]="p0023", ["icon"]="20", ["item_id"]=54001, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 54001, + 5400101 + } }, [54002]={ ["position"]=5, @@ -1485,10 +1684,13 @@ local hero = { ["item_id"]=54002, ["unlock_chapter"]=22, ["is_show"]=1, - ["collection_point"]=5 + ["collection_point"]=5, + ["skin"]={ + 54002 + } } } local config = { -data=hero,count=25 +data=hero,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index b7d696f3..0f12a857 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1408,21 +1408,6 @@ local item = { } } }, - [44]={ - ["type"]=9, - ["qlt"]=5, - ["icon"]="44" - }, - [45]={ - ["type"]=10, - ["qlt"]=4, - ["icon"]="45" - }, - [46]={ - ["type"]=10, - ["qlt"]=5, - ["icon"]="46" - }, [1001]={ ["type"]=2, ["qlt"]=1, @@ -2126,6 +2111,12 @@ local item = { ["qlt"]=4, ["icon"]="34002" }, + [34003]={ + ["type"]=5, + ["parameter"]=34003, + ["qlt"]=4, + ["icon"]="34002" + }, [42001]={ ["type"]=5, ["parameter"]=42001, @@ -2185,9 +2176,33 @@ local item = { ["parameter"]=54002, ["qlt"]=4, ["icon"]="54002" + }, + [1400201]={ + ["type"]=12, + ["parameter"]=1400201, + ["qlt"]=4, + ["icon"]="1400201" + }, + [3400101]={ + ["type"]=12, + ["parameter"]=3400101, + ["qlt"]=4, + ["icon"]="3400101" + }, + [5300101]={ + ["type"]=12, + ["parameter"]=5300101, + ["qlt"]=4, + ["icon"]="5300101" + }, + [5400101]={ + ["type"]=12, + ["parameter"]=5400101, + ["qlt"]=4, + ["icon"]="5400101" } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 7bb71e74..c88b8794 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -423,7 +423,14 @@ local LocalizationGlobalConst = DUNGEON_ARMOR_DESC_17 = "DUNGEON_ARMOR_DESC_17", NAVER_SETTING_DESC = "NAVER_SETTING_DESC", EQUIP_DESC_26 = "EQUIP_DESC_26", - BATTLE_DESC_14 = "BATTLE_DESC_14", + SKIN = "SKIN", + SKIN_ATTR = "SKIN_ATTR", + SKIN_LIST = "SKIN_LIST", + BTN_LOCKED = "BTN_LOCKED", + SKIN_GOT_1 = "SKIN_GOT_1", + SKIN_GOT_2 = "SKIN_GOT_2", + SKIN_GOT_TIPS = "SKIN_GOT_TIPS", + GOTO_COIN_STORE_DESC = "GOTO_COIN_STORE_DESC", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 2996c54b..e385c10f 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -762,9 +762,6 @@ local skill = { ["fx_self_mirror"]=400023 }, [1300220]={ - ["buff_id"]={ - "burn" - }, ["energy"]=10, ["link"]=1, ["position"]=1, @@ -2210,9 +2207,6 @@ local skill = { ["fx_self_mirror"]=400003 }, [2300220]={ - ["buff_id"]={ - "dmg_addition_all_add" - }, ["energy"]=10, ["link"]=1, ["position"]=2, @@ -3453,9 +3447,6 @@ local skill = { ["fx_self_mirror"]=400038 }, [3300220]={ - ["buff_id"]={ - "dmg_addition_all_add" - }, ["energy"]=10, ["link"]=1, ["position"]=3, @@ -3802,9 +3793,6 @@ local skill = { ["fx_self_mirror"]=400093 }, [3400120]={ - ["buff_id"]={ - "dmg_addition_all_add" - }, ["energy"]=10, ["link"]=1, ["position"]=3, @@ -4098,9 +4086,6 @@ local skill = { ["fx_self_mirror"]=400108 }, [3400220]={ - ["buff_id"]={ - "lethargy" - }, ["energy"]=10, ["link"]=1, ["position"]=3, @@ -4285,6 +4270,236 @@ local skill = { }, ["fx_self_mirror"]=400109 }, + [3400310]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000001 + }, + ["name_act"]="attack01" + }, + [3400311]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000002 + }, + ["name_act"]="attack02" + }, + [3400312]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10049 + }, + ["name_act"]="attack03" + }, + [3400313]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10048 + }, + ["name_act"]="attack04" + }, + [3400320]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=1, + ["skill_type"]=1, + ["boardrange"]={ + { + ["type"]=0, + ["range"]=3 + } + }, + ["battle_icon"]="23", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_green", + ["num"]=20000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_delay"]=0.0, + ["name_act"]="skill01" + }, + [3400321]={ + ["position"]=3, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="bleed", + ["num"]=3500, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [3400322]={ + ["position"]=3, + ["skill_type"]=11, + ["skill_type_parameter"]={ + 0, + 2 + }, + ["effect_type"]=2, + ["trigger"]=3, + ["obj"]=1 + }, + [3400323]={ + ["position"]=3, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="vulnerable", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="bleed", + ["num"]=3500, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [3400324]={ + ["position"]=3, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="thorns", + ["num"]=20000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1 + }, + [3400325]={ + ["position"]=3, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="thorns", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1 + }, [4200110]={ ["position"]=4, ["effect_type"]=1, @@ -4611,9 +4826,6 @@ local skill = { ["fx_self_mirror"]=400043 }, [4300120]={ - ["buff_id"]={ - "normal_attack_dec" - }, ["energy"]=10, ["link"]=1, ["position"]=4, @@ -4922,9 +5134,6 @@ local skill = { ["fx_self_mirror"]=400086 }, [4300220]={ - ["buff_id"]={ - "corrupt" - }, ["energy"]=10, ["link"]=1, ["position"]=4, @@ -5181,9 +5390,6 @@ local skill = { ["fx_self_mirror"]=400047 }, [4400120]={ - ["buff_id"]={ - "normal_attack_dec" - }, ["energy"]=10, ["link"]=1, ["position"]=4, @@ -5395,9 +5601,6 @@ local skill = { ["fx_self_mirror"]=400110 }, [4400220]={ - ["buff_id"]={ - "curse" - }, ["energy"]=10, ["link"]=1, ["position"]=4, @@ -5565,6 +5768,209 @@ local skill = { }, ["obj"]=2 }, + [4400310]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10005 + }, + ["name_act"]="attack01" + }, + [4400311]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10006 + }, + ["name_act"]="attack02" + }, + [4400312]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10023 + }, + ["name_act"]="attack03" + }, + [4400313]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10048 + }, + ["name_act"]="attack04" + }, + [4400320]={ + ["energy"]=10, + ["link"]=1, + ["position"]=4, + ["method"]=1, + ["skill_type"]=0, + ["battle_icon"]="24", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_blue", + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_blue", + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_blue", + ["num"]=12000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="frozen", + ["num"]=0, + ["ratio"]=5000, + ["round"]=1 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3, + 5 + }, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["name_act"]="skill01" + }, + [4400321]={ + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="stun", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + } + }, + [4400322]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="normal_attack_dec", + ["num"]=1, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + } + }, [5200110]={ ["position"]=5, ["effect_type"]=1, @@ -5670,9 +6076,6 @@ local skill = { ["fx_self_mirror"]=400066 }, [5200120]={ - ["buff_id"]={ - "shield" - }, ["energy"]=10, ["link"]=1, ["position"]=5, @@ -10411,7 +10814,7 @@ local skill = { [10105]={ ["skill_type"]=9, ["skill_type_parameter"]={ - 10000 + 15000 }, ["effect_type"]=1, ["trigger"]=1, @@ -10763,7 +11166,7 @@ local skill = { [10116]={ ["skill_type"]=9, ["skill_type_parameter"]={ - 10000 + 20000 }, ["effect_type"]=1, ["trigger"]=1, @@ -11115,7 +11518,7 @@ local skill = { [10127]={ ["skill_type"]=9, ["skill_type_parameter"]={ - 10000 + 25000 }, ["effect_type"]=1, ["trigger"]=1, @@ -24619,6 +25022,6 @@ local skill = { } } local config = { -data=skill,count=886 +data=skill,count=903 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index e6b302c4..32e5a1a6 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -688,9 +688,6 @@ local skill_rogue = { ["icon"]="171" }, [1200101]={ - ["buff_id"]={ - "burn" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -760,9 +757,6 @@ local skill_rogue = { ["icon"]="34" }, [1200105]={ - ["buff_id"]={ - "normal_attack_add" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -800,9 +794,6 @@ local skill_rogue = { ["icon"]="36" }, [1200107]={ - ["buff_id"]={ - "normal_attack_add" - }, ["unlock"]=1200105, ["cover_unlock"]=1200105, ["limit_times"]=1, @@ -833,9 +824,6 @@ local skill_rogue = { ["icon"]="176" }, [1300101]={ - ["buff_id"]={ - "burn" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -881,9 +869,6 @@ local skill_rogue = { ["icon"]="68" }, [1300104]={ - ["buff_id"]={ - "burn" - }, ["unlock"]=1300101, ["cover_unlock"]=1300101, ["limit_times"]=1, @@ -945,9 +930,6 @@ local skill_rogue = { ["icon"]="71" }, [1300107]={ - ["buff_id"]={ - "normal_attack_add" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1037,9 +1019,6 @@ local skill_rogue = { ["icon"]="104" }, [1300205]={ - ["buff_id"]={ - "burn" - }, ["unlock"]=1300203, ["limit_times"]=1, ["weight"]=3000, @@ -1101,9 +1080,6 @@ local skill_rogue = { ["icon"]="186" }, [1400101]={ - ["buff_id"]={ - "burn" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -1121,9 +1097,6 @@ local skill_rogue = { ["icon"]="136" }, [1400102]={ - ["buff_id"]={ - "stun" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1158,9 +1131,6 @@ local skill_rogue = { ["icon"]="138" }, [1400104]={ - ["buff_id"]={ - "stun" - }, ["unlock"]=1400102, ["cover_unlock"]=1400102, ["limit_times"]=1, @@ -1180,9 +1150,6 @@ local skill_rogue = { ["icon"]="139" }, [1400105]={ - ["buff_id"]={ - "burn" - }, ["unlock"]=1400101, ["cover_unlock"]=1400101, ["limit_times"]=1, @@ -1247,9 +1214,6 @@ local skill_rogue = { ["icon"]="191" }, [1400201]={ - ["buff_id"]={ - "burn" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1295,9 +1259,6 @@ local skill_rogue = { ["icon"]="198" }, [1400204]={ - ["buff_id"]={ - "burn" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1315,9 +1276,6 @@ local skill_rogue = { ["icon"]="199" }, [1400205]={ - ["buff_id"]={ - "normal_attack_add" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1513,9 +1471,6 @@ local skill_rogue = { ["icon"]="182" }, [2300101]={ - ["buff_id"]={ - "bleed" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -1544,9 +1499,6 @@ local skill_rogue = { ["icon"]="109" }, [2300103]={ - ["buff_id"]={ - "stun" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1564,9 +1516,6 @@ local skill_rogue = { ["icon"]="110" }, [2300104]={ - ["buff_id"]={ - "bleed" - }, ["unlock"]=2300101, ["cover_unlock"]=2300101, ["limit_times"]=1, @@ -1603,9 +1552,6 @@ local skill_rogue = { ["icon"]="112" }, [2300106]={ - ["buff_id"]={ - "stun" - }, ["unlock"]=2300103, ["cover_unlock"]=2300103, ["limit_times"]=1, @@ -1885,9 +1831,6 @@ local skill_rogue = { ["icon"]="146" }, [2400105]={ - ["buff_id"]={ - "imprison" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1899,9 +1842,6 @@ local skill_rogue = { ["icon"]="147" }, [2400106]={ - ["buff_id"]={ - "imprison" - }, ["unlock"]=2400105, ["cover_unlock"]=2400105, ["limit_times"]=1, @@ -2002,9 +1942,6 @@ local skill_rogue = { ["icon"]="206" }, [2400205]={ - ["buff_id"]={ - "shield_rebound_200" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2041,9 +1978,6 @@ local skill_rogue = { ["icon"]="208" }, [2400207]={ - ["buff_id"]={ - "shield_rebound_400" - }, ["unlock"]=2400205, ["cover_unlock"]=2400205, ["limit_times"]=1, @@ -2146,9 +2080,6 @@ local skill_rogue = { ["icon"]="48" }, [3200105]={ - ["buff_id"]={ - "stun" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2166,9 +2097,6 @@ local skill_rogue = { ["icon"]="49" }, [3200106]={ - ["buff_id"]={ - "stun" - }, ["unlock"]=3200105, ["cover_unlock"]=3200105, ["limit_times"]=1, @@ -2254,9 +2182,6 @@ local skill_rogue = { ["icon"]="82" }, [3300104]={ - ["buff_id"]={ - "skill_hurt_add_show" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2291,9 +2216,6 @@ local skill_rogue = { ["icon"]="84" }, [3300106]={ - ["buff_id"]={ - "skill_hurt_add_show" - }, ["unlock"]=3300104, ["cover_unlock"]=3300104, ["limit_times"]=1, @@ -2341,9 +2263,6 @@ local skill_rogue = { ["icon"]="183" }, [3300201]={ - ["buff_id"]={ - "vulnerable" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2390,9 +2309,6 @@ local skill_rogue = { ["icon"]="117" }, [3300204]={ - ["buff_id"]={ - "poison" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2404,9 +2320,6 @@ local skill_rogue = { ["icon"]="118" }, [3300205]={ - ["buff_id"]={ - "poison" - }, ["unlock"]=3300204, ["limit_times"]=1, ["weight"]=3000, @@ -2437,9 +2350,6 @@ local skill_rogue = { ["icon"]="120" }, [3300207]={ - ["buff_id"]={ - "poison" - }, ["unlock"]=3300204, ["cover_unlock"]=3300204, ["limit_times"]=1, @@ -2461,9 +2371,6 @@ local skill_rogue = { ["icon"]="188" }, [3400101]={ - ["buff_id"]={ - "vulnerable" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2510,9 +2417,6 @@ local skill_rogue = { ["icon"]="152" }, [3400104]={ - ["buff_id"]={ - "vulnerable" - }, ["unlock"]=3400101, ["cover_unlock"]=3400101, ["limit_times"]=1, @@ -2532,9 +2436,6 @@ local skill_rogue = { ["icon"]="153" }, [3400105]={ - ["buff_id"]={ - "bleed" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2552,9 +2453,6 @@ local skill_rogue = { ["icon"]="154" }, [3400106]={ - ["buff_id"]={ - "bleed" - }, ["unlock"]=3400106, ["cover_unlock"]=3400106, ["limit_times"]=1, @@ -2680,9 +2578,6 @@ local skill_rogue = { ["icon"]="212" }, [3400204]={ - ["buff_id"]={ - "lethargy" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2695,9 +2590,6 @@ local skill_rogue = { ["icon"]="213" }, [3400205]={ - ["buff_id"]={ - "imprison" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2742,6 +2634,121 @@ local skill_rogue = { ["skill_position"]=3, ["icon"]="216" }, + [3400300]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=3, + ["icon"]="193" + }, + [3400301]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400321, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["icon"]="210" + }, + [3400302]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400322, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["icon"]="211" + }, + [3400303]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400323, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["icon"]="212" + }, + [3400304]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=3, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="atkp", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["icon"]="213" + }, + [3400305]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400324, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["icon"]="214" + }, + [3400306]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=0, + ["range"]=3 + } + }, + ["icon"]="215" + }, + [3400307]={ + ["unlock"]=3400305, + ["cover_unlock"]=3400305, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400325, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["icon"]="216" + }, [4200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -2782,9 +2789,6 @@ local skill_rogue = { ["icon"]="53" }, [4200103]={ - ["buff_id"]={ - "normal_attack_dec" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2816,9 +2820,6 @@ local skill_rogue = { ["icon"]="55" }, [4200105]={ - ["buff_id"]={ - "frozen" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2853,9 +2854,6 @@ local skill_rogue = { ["icon"]="57" }, [4200107]={ - ["buff_id"]={ - "frozen" - }, ["unlock"]=4200105, ["cover_unlock"]=4200105, ["limit_times"]=1, @@ -2912,9 +2910,6 @@ local skill_rogue = { ["icon"]="88" }, [4300103]={ - ["buff_id"]={ - "normal_attack_dec" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2939,9 +2934,6 @@ local skill_rogue = { ["icon"]="90" }, [4300105]={ - ["buff_id"]={ - "frozen" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2959,9 +2951,6 @@ local skill_rogue = { ["icon"]="91" }, [4300106]={ - ["buff_id"]={ - "shield_ice" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2979,9 +2968,6 @@ local skill_rogue = { ["icon"]="92" }, [4300107]={ - ["buff_id"]={ - "shield_ice_rebound_400" - }, ["unlock"]=4300106, ["cover_unlock"]=4300106, ["limit_times"]=1, @@ -3021,9 +3007,6 @@ local skill_rogue = { ["icon"]="122" }, [4300202]={ - ["buff_id"]={ - "normal_attack_dec" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -3058,9 +3041,6 @@ local skill_rogue = { ["icon"]="124" }, [4300204]={ - ["buff_id"]={ - "normal_attack_dec" - }, ["unlock"]=4300302, ["cover_unlock"]=4300302, ["limit_times"]=1, @@ -3080,9 +3060,6 @@ local skill_rogue = { ["icon"]="125" }, [4300205]={ - ["buff_id"]={ - "weaken" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3119,9 +3096,6 @@ local skill_rogue = { ["icon"]="127" }, [4300207]={ - ["buff_id"]={ - "weaken" - }, ["unlock"]=4300305, ["cover_unlock"]=4300305, ["limit_times"]=1, @@ -3192,9 +3166,6 @@ local skill_rogue = { ["icon"]="159" }, [4400104]={ - ["buff_id"]={ - "normal_attack_dec" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3207,9 +3178,6 @@ local skill_rogue = { ["icon"]="160" }, [4400105]={ - ["buff_id"]={ - "frozen" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3244,9 +3212,6 @@ local skill_rogue = { ["icon"]="162" }, [4400107]={ - ["buff_id"]={ - "frozen" - }, ["unlock"]=4400105, ["cover_unlock"]=4400105, ["limit_times"]=1, @@ -3303,9 +3268,6 @@ local skill_rogue = { ["icon"]="218" }, [4400203]={ - ["buff_id"]={ - "curse" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3318,9 +3280,6 @@ local skill_rogue = { ["icon"]="219" }, [4400204]={ - ["buff_id"]={ - "curse" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3333,9 +3292,6 @@ local skill_rogue = { ["icon"]="220" }, [4400205]={ - ["buff_id"]={ - "corrupt" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3372,9 +3328,6 @@ local skill_rogue = { ["icon"]="222" }, [4400207]={ - ["buff_id"]={ - "corrupt" - }, ["unlock"]=4400205, ["cover_unlock"]=4400205, ["limit_times"]=1, @@ -3393,6 +3346,130 @@ local skill_rogue = { ["obj"]=6, ["icon"]="223" }, + [4400300]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=4, + ["icon"]="194" + }, + [4400301]={ + ["method"]=2, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=2 + }, + { + ["type"]=2, + ["range"]=2 + } + }, + ["icon"]="217" + }, + [4400302]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4400321, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=6, + ["icon"]="218" + }, + [4400303]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=7, + ["parameter"]={ + 1, + 7500 + }, + ["skill_position"]=4, + ["icon"]="219" + }, + [4400304]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=8, + ["parameter"]={ + 5, + 1 + }, + ["skill_position"]=4, + ["icon"]="220" + }, + [4400305]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4400322, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=6, + ["icon"]="221" + }, + [4400306]={ + ["method"]=2, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=3, + ["range"]=2 + }, + { + ["type"]=4, + ["range"]=2 + } + }, + ["icon"]="222" + }, + [4400307]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=14, + ["parameter"]={ + 6 + }, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="skill_fire_times", + ["num"]=4400320, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=6, + ["icon"]="223" + }, [5200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -3414,9 +3491,6 @@ local skill_rogue = { ["icon"]="59" }, [5200102]={ - ["buff_id"]={ - "poison" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -3473,9 +3547,6 @@ local skill_rogue = { ["icon"]="62" }, [5200105]={ - ["buff_id"]={ - "shield_rebound_200" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3504,9 +3575,6 @@ local skill_rogue = { ["icon"]="64" }, [5200107]={ - ["buff_id"]={ - "shield_rebound_400" - }, ["unlock"]=5200105, ["limit_times"]=1, ["weight"]=3000, @@ -3527,9 +3595,6 @@ local skill_rogue = { ["icon"]="180" }, [5300101]={ - ["buff_id"]={ - "poison" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -3564,9 +3629,6 @@ local skill_rogue = { ["icon"]="95" }, [5300103]={ - ["buff_id"]={ - "lethargy" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3639,9 +3701,6 @@ local skill_rogue = { ["icon"]="99" }, [5300107]={ - ["buff_id"]={ - "undead" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3679,9 +3738,6 @@ local skill_rogue = { ["icon"]="129" }, [5300202]={ - ["buff_id"]={ - "frozen" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3711,9 +3767,6 @@ local skill_rogue = { ["icon"]="131" }, [5300204]={ - ["buff_id"]={ - "counterattack" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3748,9 +3801,6 @@ local skill_rogue = { ["icon"]="132" }, [5300206]={ - ["buff_id"]={ - "frozen" - }, ["unlock"]=5300202, ["cover_unlock"]=5300202, ["limit_times"]=1, @@ -3770,9 +3820,6 @@ local skill_rogue = { ["icon"]="134" }, [5300207]={ - ["buff_id"]={ - "counterattack" - }, ["unlock"]=5300205, ["cover_unlock"]=5300205, ["limit_times"]=1, @@ -3945,9 +3992,6 @@ local skill_rogue = { ["icon"]="225" }, [5400203]={ - ["buff_id"]={ - "counterattack" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3982,9 +4026,6 @@ local skill_rogue = { ["icon"]="227" }, [5400205]={ - ["buff_id"]={ - "poison" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -4002,9 +4043,6 @@ local skill_rogue = { ["icon"]="228" }, [5400206]={ - ["buff_id"]={ - "counterattack" - }, ["unlock"]=5400203, ["cover_unlock"]=5400203, ["limit_times"]=1, @@ -4043,6 +4081,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=244 +data=skill_rogue,count=260 } return config \ No newline at end of file diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua new file mode 100644 index 00000000..fecdd4fd --- /dev/null +++ b/lua/app/config/skin.lua @@ -0,0 +1,184 @@ +local skin = { + [12001]={ + ["model_id"]="p0005", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=12001 + }, + [13001]={ + ["model_id"]="p0014", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=13001 + }, + [13002]={ + ["model_id"]="p0009", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=13002 + }, + [14001]={ + ["model_id"]="p0011", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=14001 + }, + [14002]={ + ["model_id"]="p0018", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=14002 + }, + [1400201]={ + ["qlt"]=3, + ["got"]=2, + ["skin_point"]=2, + ["hero_id"]=14002, + ["item_id"]=1400201 + }, + [22001]={ + ["model_id"]="p0002", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=22001 + }, + [23001]={ + ["model_id"]="p0010", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=23001 + }, + [23002]={ + ["model_id"]="p0012", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=23002 + }, + [24001]={ + ["model_id"]="p0007", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=24001 + }, + [24002]={ + ["model_id"]="p0017", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=24002 + }, + [32001]={ + ["model_id"]="p0001", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=32001 + }, + [33001]={ + ["model_id"]="p0006", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=33001 + }, + [33002]={ + ["model_id"]="p0020", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=33002 + }, + [34001]={ + ["model_id"]="p0016", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=34001 + }, + [3400101]={ + ["qlt"]=4, + ["got"]=1, + ["skin_point"]=2, + ["hero_id"]=34001, + ["item_id"]=3400101 + }, + [34002]={ + ["model_id"]="p0024", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=34002 + }, + [42001]={ + ["model_id"]="p0003", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=42001 + }, + [43001]={ + ["model_id"]="p0022", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=43001 + }, + [43002]={ + ["model_id"]="p0021", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=43002 + }, + [44001]={ + ["model_id"]="p0008", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=44001 + }, + [44002]={ + ["model_id"]="p0025", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=44002 + }, + [52001]={ + ["model_id"]="p0004", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=52001 + }, + [53001]={ + ["model_id"]="p0015", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=53001 + }, + [5300101]={ + ["qlt"]=2, + ["got"]=2, + ["skin_point"]=2, + ["hero_id"]=53001, + ["item_id"]=5300101 + }, + [53002]={ + ["model_id"]="p0019", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=53002 + }, + [54001]={ + ["model_id"]="p0023", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=54001 + }, + [5400101]={ + ["qlt"]=4, + ["got"]=1, + ["skin_point"]=2, + ["hero_id"]=54001, + ["item_id"]=5400101 + }, + [54002]={ + ["model_id"]="p0026", + ["qlt"]=1, + ["skin_point"]=0, + ["hero_id"]=54002 + } +} +local config = { +data=skin,count=29 +} +return config \ No newline at end of file diff --git a/lua/app/config/skin.lua.meta b/lua/app/config/skin.lua.meta new file mode 100644 index 00000000..0d0841df --- /dev/null +++ b/lua/app/config/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 10aef0691ee20124780874c92020938f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua index 84839025..230c4f5d 100644 --- a/lua/app/config/strings/cn/avatar.lua +++ b/lua/app/config/strings/cn/avatar.lua @@ -2,9 +2,6 @@ local avatar = { [23]={ ["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！" }, - [24]={ - ["desc"]="S2竞技战令头像，愿你像洋葱头勇往直前！" - }, [1001]={ ["desc"]="激活舞女后获得。" }, @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar_frame.lua b/lua/app/config/strings/cn/avatar_frame.lua index 3a5ddc02..e73ac8dd 100644 --- a/lua/app/config/strings/cn/avatar_frame.lua +++ b/lua/app/config/strings/cn/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="S1竞技场黄金头像，实力的证明。" - }, - [26]={ - ["desc"]="S2赛季白银头像框" - }, - [27]={ - ["desc"]="S2赛季黄金头像框" } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index c343927b..551e5085 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -32,183 +32,156 @@ local buff = { [24]={ ["id"]=24, ["desc"]="伤害提升：造成的伤害提升{0}。", - ["tips_desc"]="伤害提升：造成的所有伤害提升。", ["name"]="dmg_addition_all_add" }, [33]={ ["id"]=33, ["show_name"]="眩晕", ["desc"]="眩晕：本回合无法行动。", - ["tips_desc"]="眩晕：本回合无法行动。", ["name"]="stun" }, [34]={ ["id"]=34, ["desc"]="护盾：可承受最大生命值{0}的伤害。", - ["tips_desc"]="护盾：可承受一定伤害。", ["name"]="shield" }, [36]={ ["id"]=36, ["show_name"]="冰霜", ["desc"]="冰霜：普攻次数-{0}。", - ["tips_desc"]="冰霜：普攻次数减少。", ["name"]="normal_attack_dec" }, [37]={ ["id"]=37, ["show_name"]="亢奋", ["desc"]="亢奋：普攻次数+{0}。", - ["tips_desc"]="亢奋：普攻次数增加。", ["name"]="normal_attack_add" }, [47]={ ["id"]=47, ["desc"]="反伤护盾：可承受最大生命值{0}的伤害，反弹200%对方伤害。", - ["tips_desc"]="反伤护盾：可承受一定伤害，反弹对方伤害。", ["name"]="shield_rebound_200" }, [48]={ ["id"]=48, ["show_name"]="灼烧", ["desc"]="灼烧：回合结束时造成释放者攻击力{0}的伤害。", - ["tips_desc"]="灼烧：回合结束时造成一定的伤害。", ["name"]="burn" }, [49]={ ["id"]=49, ["show_name"]="易伤", ["desc"]="易伤：受到所有伤害提升{0}。", - ["tips_desc"]="易伤：受到所有伤害提升。", ["name"]="vulnerable" }, [50]={ ["id"]=50, ["show_name"]="冻结", ["desc"]="冻结：本回合无法行动，且增益效果不生效。", - ["tips_desc"]="冻结：本回合无法行动，且增益效果不生效。", ["name"]="frozen" }, [51]={ ["id"]=51, ["show_name"]="中毒", ["desc"]="中毒：回合结束时造成释放者攻击力{0}的伤害。", - ["tips_desc"]="中毒：回合结束时造成一定伤害。", ["name"]="poison" }, [52]={ ["id"]=52, ["show_name"]="禁锢", ["desc"]="禁锢：本回合只可使用普攻，且技能进度不会增长。", - ["tips_desc"]="禁锢：本回合只可使用普攻，且技能进度不会增长。", ["name"]="imprison" }, [53]={ ["id"]=53, ["show_name"]="腐败", ["desc"]="腐败：生命恢复效果降低{0}。", - ["tips_desc"]="腐败：生命恢复效果降低。", ["name"]="corrupt" }, [54]={ ["id"]=54, ["show_name"]="流血", ["desc"]="流血：受击时恢复攻击者生命，回合结束时造成释放者攻击力{0}的伤害。", - ["tips_desc"]="流血：受击时恢复攻击者生命，回合结束时造成伤害。", ["name"]="bleed" }, [55]={ ["id"]=55, ["show_name"]="虚弱", ["desc"]="虚弱：造成的伤害降低{0}。", - ["tips_desc"]="虚弱：造成的伤害降低。", ["name"]="weaken" }, [56]={ ["id"]=56, ["show_name"]="昏睡", ["desc"]="昏睡：本回合无法行动，受击会移除效果。", - ["tips_desc"]="昏睡：本回合无法行动，受击会移除效果。", ["name"]="lethargy" }, [57]={ ["id"]=57, ["show_name"]="诅咒", ["desc"]="诅咒：攻击不会造成伤害，而是治疗对方。", - ["tips_desc"]="诅咒：攻击不会造成伤害，而是治疗对方。", ["name"]="curse" }, [58]={ ["id"]=58, ["show_name"]="锁定", ["desc"]="锁定：随机锁定棋盘上的一种颜色，无法选中。", - ["tips_desc"]="锁定：随机锁定棋盘上的一种颜色，无法选中。", ["name"]="lock" }, [59]={ ["id"]=59, ["show_name"]="先手", ["desc"]="先手：每回合都率先出手。", - ["tips_desc"]="先手：每回合都率先出手。", ["name"]="first_hand" }, [61]={ ["id"]=61, ["show_name"]="不死", ["desc"]="不死：受到致命伤害不会死亡。", - ["tips_desc"]="不死：本回合受到致命伤害不会死亡。", ["name"]="undead" }, [62]={ ["id"]=62, ["show_name"]="反击", ["desc"]="反击：受到直接伤害时有{0}的概率进行反击。", - ["tips_desc"]="反击：受到直接伤害时有概率进行反击。", ["name"]="counterattack" }, [63]={ ["id"]=63, ["show_name"]="反伤", ["desc"]="反伤：反弹{0}对方伤害。", - ["tips_desc"]="反伤：反弹对方伤害。", ["name"]="thorns" }, [73]={ ["id"]=73, ["desc"]="反伤护盾：可承受最大生命值{0}的伤害，反弹400%对方伤害。", - ["tips_desc"]="反伤护盾2：可承受一定伤害，反弹对方大量伤害。", ["name"]="shield_rebound_400" }, [74]={ ["id"]=74, ["desc"]="冰霜护盾：可承受最大生命值{0}的伤害。", - ["tips_desc"]="冰霜护盾：可承受一定伤害。", ["name"]="shield_ice" }, [75]={ ["id"]=75, ["desc"]="冰霜护盾：可承受最大生命值{0}的伤害，反弹400%对方伤害。", - ["tips_desc"]="冰霜护盾2：可承受一定伤害，反弹对方大量伤害。", ["name"]="shield_ice_rebound_400" }, [79]={ ["id"]=79, ["show_name"]="意念护盾", ["desc"]="意念护盾：护盾存在时不会受到任何伤害，每被攻击命中1次将扣除1层护盾。", - ["tips_desc"]="意念护盾：护盾存在时不会受到任何伤害，每被攻击命中1次将扣除1层护盾。", ["name"]="invincible_shield" }, [80]={ ["id"]=80, ["desc"]="冰霜护盾：可承受最大生命值{0}的伤害。", - ["tips_desc"]="冰霜护盾：可承受一定伤害。", ["name"]="shield_ice_02" }, [81]={ ["id"]=81, ["show_name"]="技能增伤", ["desc"]="技能增伤：所有技能伤害增加", - ["tips_desc"]="技能增伤：所有技能伤害增加", ["name"]="skill_hurt_add_show" } } diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 6c04356f..e518337c 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -423,7 +423,13 @@ local localization_global = ["DUNGEON_ARMOR_DESC_17"] = "本关今日剩余次数：{0}", ["NAVER_SETTING_DESC"] = "Naver", ["EQUIP_DESC_26"] = "4件防具 +{0}:", - ["BATTLE_DESC_14"] = "有还未完成的战斗，是否继续？", + ["SKIN"] = "皮肤", + ["SKIN_ATTR"] = "皮肤属性", + ["SKIN_LIST"] = "皮肤列表", + ["BTN_LOCKED"] = "角色待解锁", + ["SKIN_GOT_1"] = "通过活动获取", + ["SKIN_GOT_2"] = "通过战令获取", + ["SKIN_GOT_TIPS"] = "解锁皮肤可领取", ["GOTO_COIN_STORE_DESC"] = "是否前往商城购买金币", } diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index eacb9a3f..b978bcfe 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -171,18 +171,6 @@ local item = { ["name"]="6阶防具材料包", ["desc"]="开启后可获得以下材料" }, - [44]={ - ["name"]="勇气洋葱头2", - ["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！" - }, - [45]={ - ["name"]="S2赛季白银头像框", - ["desc"]="S2竞技场白银头像框，力量的证明。" - }, - [46]={ - ["name"]="S2赛季黄金头像框", - ["desc"]="S2竞技场黄金头像框，英雄的光辉。" - }, [1001]={ ["name"]="暗淡陨铁", ["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。" @@ -363,6 +351,9 @@ local item = { ["name"]="梦魔碎片", ["desc"]="梦魔碎片，凑齐可激活或升级。" }, + [34003]={ + ["name"]="忍者菲尔碎片" + }, [42001]={ ["name"]="冰心碎片", ["desc"]="冰心碎片，凑齐可激活或升级。" @@ -402,9 +393,25 @@ local item = { [54002]={ ["name"]="闪烁法师碎片", ["desc"]="闪烁法师碎片，凑齐可激活或升级。" + }, + [1400201]={ + ["name"]="泳池派对", + ["desc"]="潘达的新衣装。" + }, + [3400101]={ + ["name"]="骄阳晨露", + ["desc"]="花木兰的新衣装。" + }, + [5300101]={ + ["name"]="小红帽", + ["desc"]="魔女琪琪的新衣装。" + }, + [5400101]={ + ["name"]="翩然起舞", + ["desc"]="蝴蝶的新衣装。" } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 7ec358d9..704d92fb 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -6,7 +6,7 @@ local skill = { ["desc"]="巨剑旋风：额外造成多次技能伤害。" }, [1300220]={ - ["desc"]="炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。" + ["desc"]="炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。" }, [1400120]={ ["desc"]="钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。" @@ -42,22 +42,22 @@ local skill = { ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" }, [3400220]={ - ["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，2回合。" + ["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，2回合。" }, [4200120]={ ["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。" }, [4300120]={ - ["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300220]={ - ["desc"]="腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。" + ["desc"]="腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4400120]={ - ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" }, [4400220]={ - ["desc"]="法老诅咒：额外造成一次技能伤害，附加诅咒效果，1回合。" + ["desc"]="法老诅咒：额外造成一次技能伤害，附加诅咒效果，1回合。" }, [5200120]={ ["desc"]="护盾术：为团队附加一个护盾，1回合。" diff --git a/lua/app/config/strings/cn/skin.lua b/lua/app/config/strings/cn/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/cn/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skin.lua.meta b/lua/app/config/strings/cn/skin.lua.meta new file mode 100644 index 00000000..9f2b282e --- /dev/null +++ b/lua/app/config/strings/cn/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d173accc0dfa75c4facd20dcfa1cd763 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/avatar.lua b/lua/app/config/strings/de/avatar.lua index e43f949e..192d69b3 100644 --- a/lua/app/config/strings/de/avatar.lua +++ b/lua/app/config/strings/de/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ - }, - [24]={ - }, [1001]={ @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar_frame.lua b/lua/app/config/strings/de/avatar_frame.lua index 924596db..d3496ad5 100644 --- a/lua/app/config/strings/de/avatar_frame.lua +++ b/lua/app/config/strings/de/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index 83d2f4dd..c133ff1c 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -127,15 +127,6 @@ local item = { }, [43]={ - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ @@ -271,6 +262,9 @@ local item = { }, [34002]={ + }, + [34003]={ + }, [42001]={ @@ -301,9 +295,21 @@ local item = { }, [54002]={ + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skin.lua b/lua/app/config/strings/de/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/de/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skin.lua.meta b/lua/app/config/strings/de/skin.lua.meta new file mode 100644 index 00000000..a6ae94fe --- /dev/null +++ b/lua/app/config/strings/de/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: defcfe098dff4434593bbb55cdf8e01c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua index 285f05c1..553fe14e 100644 --- a/lua/app/config/strings/en/avatar.lua +++ b/lua/app/config/strings/en/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="S1 Arena Battle Pass Avatar. May you forge ahead like a brave Onion Head!" - }, - [24]={ - }, [1001]={ ["desc"]="Obtained after activating Dancer." @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar_frame.lua b/lua/app/config/strings/en/avatar_frame.lua index db78378c..92c27c22 100644 --- a/lua/app/config/strings/en/avatar_frame.lua +++ b/lua/app/config/strings/en/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="S1 Gold Arena Avatar Frame. Proof of your prowess." - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 30527633..7bddb95a 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="Tier 6 Armor Material Pack", ["desc"]="Open to obtain following materials" - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="Dim Meteorite", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="Nightmare Shard", ["desc"]="Nightmare Shard that can activate or upgrade Nightmare." + }, + [34003]={ + }, [42001]={ ["name"]="Iceheart Shard", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="Twinkling Mage Shard", ["desc"]="Twinkling Mage Shard that can activate or upgrade Twinkling Mage." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skin.lua b/lua/app/config/strings/en/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/en/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skin.lua.meta b/lua/app/config/strings/en/skin.lua.meta new file mode 100644 index 00000000..410d35ce --- /dev/null +++ b/lua/app/config/strings/en/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3d04b574cfad14a478020104a842ad78 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/es/avatar.lua b/lua/app/config/strings/es/avatar.lua index 004667cd..c4f1c33a 100644 --- a/lua/app/config/strings/es/avatar.lua +++ b/lua/app/config/strings/es/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="Avatar de Pase de Batalla de Arena S1. Que sigue adelante con valentía como Cebolla!" - }, - [24]={ - }, [1001]={ ["desc"]="Se obtiene tras activar Bailarina." @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/avatar_frame.lua b/lua/app/config/strings/es/avatar_frame.lua index 0c842351..99901eb6 100644 --- a/lua/app/config/strings/es/avatar_frame.lua +++ b/lua/app/config/strings/es/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="Marco de avatar de oro Temporada S1, prueba de fuerza." - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index 45a71008..c44124d1 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="Paquete de Material para Armadura Clase 6", ["desc"]="Abre para obtener los siguientes materiales" - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="Meteorito Opaco", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="Fragmento de Íncubo", ["desc"]="Fragmento de Íncubo. Se puede activar o actualizar al reunir todos los fragmentos." + }, + [34003]={ + }, [42001]={ ["name"]="Fragmento de Alma Glacial", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="Fragmento de Mago Brillante", ["desc"]="Fragmento de Mago Brillante. Se puede activar o actualizar al reunir todos los fragmentos." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skin.lua b/lua/app/config/strings/es/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/es/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skin.lua.meta b/lua/app/config/strings/es/skin.lua.meta new file mode 100644 index 00000000..e4bc913c --- /dev/null +++ b/lua/app/config/strings/es/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 14f39e6695fa0ab468ea7b4c8f711a5e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/avatar.lua b/lua/app/config/strings/fr/avatar.lua index e43f949e..192d69b3 100644 --- a/lua/app/config/strings/fr/avatar.lua +++ b/lua/app/config/strings/fr/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ - }, - [24]={ - }, [1001]={ @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar_frame.lua b/lua/app/config/strings/fr/avatar_frame.lua index 924596db..d3496ad5 100644 --- a/lua/app/config/strings/fr/avatar_frame.lua +++ b/lua/app/config/strings/fr/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index 83d2f4dd..c133ff1c 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -127,15 +127,6 @@ local item = { }, [43]={ - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ @@ -271,6 +262,9 @@ local item = { }, [34002]={ + }, + [34003]={ + }, [42001]={ @@ -301,9 +295,21 @@ local item = { }, [54002]={ + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skin.lua b/lua/app/config/strings/fr/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/fr/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skin.lua.meta b/lua/app/config/strings/fr/skin.lua.meta new file mode 100644 index 00000000..867eb7de --- /dev/null +++ b/lua/app/config/strings/fr/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: def807be0c4091543a628d79893455da +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua index 4a7f6824..d6b3df3b 100644 --- a/lua/app/config/strings/id/avatar.lua +++ b/lua/app/config/strings/id/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="Avatar battle kompetitif S1. Semoga sukses!" - }, - [24]={ - }, [1001]={ ["desc"]="Dapat setelah lolos Dancer" @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar_frame.lua b/lua/app/config/strings/id/avatar_frame.lua index b16be72b..52ad26be 100644 --- a/lua/app/config/strings/id/avatar_frame.lua +++ b/lua/app/config/strings/id/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="Bingkai Avatar Emas S1. Bukti kekuatan!" - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index 76f487bf..7572884f 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="Paket Material Armor Tier 6", ["desc"]="Buka untuk mendapatkan material berikut:" - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="Chondrite", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="Shard Nightmare", ["desc"]="Shard Nightmare. Kumpulkan untuk aktivasi atau upgrade." + }, + [34003]={ + }, [42001]={ ["name"]="Shard Hati Es", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="Shard Blink Mage", ["desc"]="Shard Blink Mage. Kumpulkan untuk aktivasi atau upgrade." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skin.lua b/lua/app/config/strings/id/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/id/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skin.lua.meta b/lua/app/config/strings/id/skin.lua.meta new file mode 100644 index 00000000..4e335b10 --- /dev/null +++ b/lua/app/config/strings/id/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 216ba1877e1a5294484781b10b18960d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua index 9bfd80f3..c918e8e7 100644 --- a/lua/app/config/strings/ja/avatar.lua +++ b/lua/app/config/strings/ja/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="S1闘技場戦令アイコン。タマネギのように前に進みますように！" - }, - [24]={ - }, [1001]={ ["desc"]="ダンサーをアクティブ化後獲得できる。" @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar_frame.lua b/lua/app/config/strings/ja/avatar_frame.lua index 667bc5a8..231c9cec 100644 --- a/lua/app/config/strings/ja/avatar_frame.lua +++ b/lua/app/config/strings/ja/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="S1闘技場ゴールドフレーム。実力の証。" - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 82fba14e..c5b6acc5 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="6階防具材料パック", ["desc"]="開けると、以下の材料を獲得できる" - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="薄暗い隕石", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="夢魔のピース", ["desc"]="夢魔のピース。必要数を集めると、解放またはレベルアップできる。" + }, + [34003]={ + }, [42001]={ ["name"]="氷心のピース", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="トゥインクリングメイジのピース", ["desc"]="トゥインクリングメイジのピース。必要数を集めると、解放またはレベルアップできる。" + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill.lua b/lua/app/config/strings/ja/skill.lua index 67d38685..c77aa9c4 100644 --- a/lua/app/config/strings/ja/skill.lua +++ b/lua/app/config/strings/ja/skill.lua @@ -42,7 +42,7 @@ local skill = { ["desc"]="ムーンチェイサー：発動するターンダメージがアップ、特⼤ダメージを与えるスキルを1回発動する。" }, [3400220]={ - ["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に2ターン昏睡効果を付与する。" + ["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に2ターン昏睡効果を付与する。" }, [4200120]={ ["desc"]="元素連接：ランダムで3つの元素を消し、スキルを1回発動する。" diff --git a/lua/app/config/strings/ja/skin.lua b/lua/app/config/strings/ja/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/ja/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skin.lua.meta b/lua/app/config/strings/ja/skin.lua.meta new file mode 100644 index 00000000..6fae132c --- /dev/null +++ b/lua/app/config/strings/ja/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3bba24cb27ea2e446b89a26a3ef99b44 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua index 0fe17b3e..dbef4ba1 100644 --- a/lua/app/config/strings/ko/avatar.lua +++ b/lua/app/config/strings/ko/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="S1 아레나 배틀 패스 아이콘, 양파 헤드처럼 씩씩하게 나아가시길 바랍니다!" - }, - [24]={ - }, [1001]={ ["desc"]="무희을(를) 활성화한 후, 획득할 수 있습니다." @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar_frame.lua b/lua/app/config/strings/ko/avatar_frame.lua index e9778a28..2529d319 100644 --- a/lua/app/config/strings/ko/avatar_frame.lua +++ b/lua/app/config/strings/ko/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="S1 아레나 골드 아이콘 프레임, 검증받은 실력입니다." - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index e51b7cd4..00feb766 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="6티어 방어구 재료 패키지", ["desc"]="오픈 후 다음의 재료를 획득할 수 있습니다." - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="알렌데 운석", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="인큐버스 파편", ["desc"]="인큐버스 파편, 다 모으면 인큐버스를 활성화하거나 업그레이드할 수 있습니다." + }, + [34003]={ + }, [42001]={ ["name"]="얼음의 심장 파편", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="반짝이는 마법사 파편", ["desc"]="반짝이는 마법사 파편, 다 모으면 반짝이는 마법사를 활성화하거나 업그레이드할 수 있습니다." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skin.lua b/lua/app/config/strings/ko/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/ko/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skin.lua.meta b/lua/app/config/strings/ko/skin.lua.meta new file mode 100644 index 00000000..249fee4b --- /dev/null +++ b/lua/app/config/strings/ko/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1ef941218fb3c044c96a386c24663545 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua index 05104c94..b968a642 100644 --- a/lua/app/config/strings/pt/avatar.lua +++ b/lua/app/config/strings/pt/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="Avatar da Ordem de Batalha da S1. Que você tenha a coragem como a Cabeça de Cebola!" - }, - [24]={ - }, [1001]={ ["desc"]="Ativar Dançarina para obter." @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar_frame.lua b/lua/app/config/strings/pt/avatar_frame.lua index c7b20baf..5f9fd56b 100644 --- a/lua/app/config/strings/pt/avatar_frame.lua +++ b/lua/app/config/strings/pt/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="Moldura de avatar de ouro da Arena S1, uma testemunha do poder." - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 4278fd13..e5482c88 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="Pacote de Materiais de Armadura do Ranque 6", ["desc"]="Concede os seguintes materiais." - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="Ferro Meteórico Opaco", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="Fragmento do Súcubo", ["desc"]="Fragmento do Súcubo, necessário para ativar ou melhorar." + }, + [34003]={ + }, [42001]={ ["name"]="Fragmento de Alma Glacial", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="Fragmento do Mago do Brilho", ["desc"]="Fragmento do Mago do Brilho, necessário para ativar ou melhorar." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skin.lua b/lua/app/config/strings/pt/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/pt/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skin.lua.meta b/lua/app/config/strings/pt/skin.lua.meta new file mode 100644 index 00000000..adea3c80 --- /dev/null +++ b/lua/app/config/strings/pt/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8f212614e6d4001449c3807b1568ab16 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/avatar.lua b/lua/app/config/strings/ru/avatar.lua index e43f949e..192d69b3 100644 --- a/lua/app/config/strings/ru/avatar.lua +++ b/lua/app/config/strings/ru/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ - }, - [24]={ - }, [1001]={ @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar_frame.lua b/lua/app/config/strings/ru/avatar_frame.lua index 924596db..d3496ad5 100644 --- a/lua/app/config/strings/ru/avatar_frame.lua +++ b/lua/app/config/strings/ru/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index 83d2f4dd..c133ff1c 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -127,15 +127,6 @@ local item = { }, [43]={ - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ @@ -271,6 +262,9 @@ local item = { }, [34002]={ + }, + [34003]={ + }, [42001]={ @@ -301,9 +295,21 @@ local item = { }, [54002]={ + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skin.lua b/lua/app/config/strings/ru/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/ru/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skin.lua.meta b/lua/app/config/strings/ru/skin.lua.meta new file mode 100644 index 00000000..ed7a6636 --- /dev/null +++ b/lua/app/config/strings/ru/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4c6895e8b12c9594c9daa2cd54b7ed71 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua index 713f1c29..ff0a66da 100644 --- a/lua/app/config/strings/th/avatar.lua +++ b/lua/app/config/strings/th/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="อวาตาร์ป้ายรบของอารีน่า S1 ขอให้คุณก้าวไปข้างหน้าอย่างกล้าหาญเหมือนหัวหอม!" - }, - [24]={ - }, [1001]={ ["desc"]="หลังจากการเปิดใช้งานสาวเต้นจะได้รับ" @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar_frame.lua b/lua/app/config/strings/th/avatar_frame.lua index 58eecffc..6d502e0c 100644 --- a/lua/app/config/strings/th/avatar_frame.lua +++ b/lua/app/config/strings/th/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="กรอบรูปทองของอารีน่า S1 พิสูจน์ความแข็งแกร่ง" - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 525998fe..cfdacdfb 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="แพ็ควัสดุเกราะขั้นที่ 6", ["desc"]="หลังเปิดจะได้รับวัสดุต่อไปนี้" - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="อุกกาบาตทื่อ", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="เศษฝันร้าย", ["desc"]="เศษฝันร้าย รวบรวมครบจะเปิดใช้งานหรืออัปเลเวลได้" + }, + [34003]={ + }, [42001]={ ["name"]="เศษหัวใจน้ำแข็ง", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="เศษนักเวทแวบวับ", ["desc"]="เศษนักเวทแวบวับ รวบรวมครบจะเปิดใช้งานหรืออัปเลเวลได้" + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skin.lua b/lua/app/config/strings/th/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/th/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skin.lua.meta b/lua/app/config/strings/th/skin.lua.meta new file mode 100644 index 00000000..cea2aadc --- /dev/null +++ b/lua/app/config/strings/th/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a9f763165f71467478c86fb64c1f59c0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua index 2cd7928d..9819a128 100644 --- a/lua/app/config/strings/vi/avatar.lua +++ b/lua/app/config/strings/vi/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="Avatar Chiến Lệnh S1, như một Onion gan dạ xông lên!" - }, - [24]={ - }, [1001]={ ["desc"]="Kích hoạt Vũ Cơ nhận được." @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar_frame.lua b/lua/app/config/strings/vi/avatar_frame.lua index 647b250e..c98bbf6d 100644 --- a/lua/app/config/strings/vi/avatar_frame.lua +++ b/lua/app/config/strings/vi/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="Khung Avatar Vàng Đấu Trường S1, biểu tượng thực lực." - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index 37a3cb6e..fe7c04e7 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="Quà VL Phòng Cụ Bậc 6", ["desc"]="Mở được nhận vật liệu sau" - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="Thiên Thạch Ảm Đạm", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="Mảnh Incubus", ["desc"]="Mảnh Incubus, thu thập đủ được kích hoạt hoặc tăng cấp." + }, + [34003]={ + }, [42001]={ ["name"]="Mảnh Frozen Heart", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="Mảnh Pháp Sư Blink", ["desc"]="Mảnh Pháp Sư Blink, thu thập đủ được kích hoạt hoặc tăng cấp." + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skin.lua b/lua/app/config/strings/vi/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/vi/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skin.lua.meta b/lua/app/config/strings/vi/skin.lua.meta new file mode 100644 index 00000000..fe0d5d18 --- /dev/null +++ b/lua/app/config/strings/vi/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d0aed7b2ac7b8ef4e8b1a5efd0d3ec42 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua index 87480fbd..21f63044 100644 --- a/lua/app/config/strings/zh/avatar.lua +++ b/lua/app/config/strings/zh/avatar.lua @@ -1,9 +1,6 @@ local avatar = { [23]={ ["desc"]="S1競技戰令頭像，願你像洋蔥頭勇往直前！" - }, - [24]={ - }, [1001]={ ["desc"]="啟動舞孃後獲得。" @@ -82,6 +79,6 @@ local avatar = { } } local config = { -data=avatar,count=27 +data=avatar,count=26 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar_frame.lua b/lua/app/config/strings/zh/avatar_frame.lua index 038aa2d5..ffb89880 100644 --- a/lua/app/config/strings/zh/avatar_frame.lua +++ b/lua/app/config/strings/zh/avatar_frame.lua @@ -7,15 +7,9 @@ local avatar_frame = { }, [25]={ ["desc"]="S1競技場黃金頭像框，實力的證明。" - }, - [26]={ - - }, - [27]={ - } } local config = { -data=avatar_frame,count=5 +data=avatar_frame,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 034d5292..6647d6d2 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -170,15 +170,6 @@ local item = { [43]={ ["name"]="6階防具材料包", ["desc"]="開啟後可獲得以下材料" - }, - [44]={ - - }, - [45]={ - - }, - [46]={ - }, [1001]={ ["name"]="暗淡隕鐵", @@ -359,6 +350,9 @@ local item = { [34002]={ ["name"]="夢魔碎片", ["desc"]="夢魔碎片，集滿可啟用或升級。" + }, + [34003]={ + }, [42001]={ ["name"]="冰心碎片", @@ -399,9 +393,21 @@ local item = { [54002]={ ["name"]="閃爍法師碎片", ["desc"]="閃爍法師碎片，集滿可啟用或升級。" + }, + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + } } local config = { -data=item,count=101 +data=item,count=103 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill.lua b/lua/app/config/strings/zh/skill.lua index 48d76091..2ce66421 100644 --- a/lua/app/config/strings/zh/skill.lua +++ b/lua/app/config/strings/zh/skill.lua @@ -42,19 +42,19 @@ local skill = { ["desc"]="流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。" }, [3400220]={ - ["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附帶昏睡效果，2回合。" + ["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附帶昏睡效果，2回合。" }, [4200120]={ ["desc"]="元素連接：隨機消除3個元素，並造成一次技能傷害。" }, [4300120]={ - ["desc"]="霜凍冰晶：額外造成一次技能傷害，附帶冰霜效果，1回合。" + ["desc"]="霜凍冰晶：額外造成一次技能傷害，附帶冰霜效果，1回合。" }, [4300220]={ ["desc"]="腐敗利刃：額外造成一次技能傷害，附帶腐敗效果，1回合。" }, [4400120]={ - ["desc"]="冰霜劍舞：隨機消除3個元素，並造成一次技能傷害，附帶冰霜效果，1回合。" + ["desc"]="冰霜劍舞：隨機消除3個元素，並造成一次技能傷害，附帶冰霜效果，1回合。" }, [4400220]={ ["desc"]="法老詛咒：額外造成一次技能傷害，附帶詛咒效果，1回合。" diff --git a/lua/app/config/strings/zh/skin.lua b/lua/app/config/strings/zh/skin.lua new file mode 100644 index 00000000..deb9b4b0 --- /dev/null +++ b/lua/app/config/strings/zh/skin.lua @@ -0,0 +1,18 @@ +local skin = { + [1400201]={ + + }, + [3400101]={ + + }, + [5300101]={ + + }, + [5400101]={ + + } +} +local config = { +data=skin,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skin.lua.meta b/lua/app/config/strings/zh/skin.lua.meta new file mode 100644 index 00000000..d3fd883d --- /dev/null +++ b/lua/app/config/strings/zh/skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ec4945c63bff32c46973c1c4ab79a04f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 350de8d7..d05e0d87 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -619,6 +619,7 @@ local tutorial = { ["next_id"]=80010, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -639,6 +640,7 @@ local tutorial = { ["delay"]=0.5, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -650,6 +652,7 @@ local tutorial = { ["next_id"]=80030, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/common/btns/btn_weapon", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -663,7 +666,8 @@ local tutorial = { ["txt_offset"]={ 0, 200 - } + }, + ["func_id"]="dungeon_weapon_open" }, [80040]={ ["next_id"]=80050, @@ -674,6 +678,7 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -684,6 +689,7 @@ local tutorial = { ["next_id"]=80060, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -703,6 +709,7 @@ local tutorial = { ["next_id"]=80070, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -717,7 +724,8 @@ local tutorial = { }, [80070]={ ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_2/btn_start", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/dungeon_weapon_open/btn_start", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -728,6 +736,7 @@ local tutorial = { ["next_id"]=90010, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -748,6 +757,7 @@ local tutorial = { ["delay"]=0.5, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -759,6 +769,7 @@ local tutorial = { ["next_id"]=90030, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/common/btns/btn_armor", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -772,7 +783,8 @@ local tutorial = { ["txt_offset"]={ 0, 200 - } + }, + ["func_id"]="dungeon_armor_open" }, [90040]={ ["next_id"]=90050, @@ -783,6 +795,7 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -793,6 +806,7 @@ local tutorial = { ["next_id"]=90060, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -812,6 +826,7 @@ local tutorial = { ["next_id"]=90070, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -827,7 +842,8 @@ local tutorial = { [90070]={ ["next_id"]=90080, ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_3/btn_start", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/dungeon_armor_open/btn_start", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -837,6 +853,7 @@ local tutorial = { [90080]={ ["type"]=2, ["target_name"]="dungeon_armor_main_ui(Clone)/scrollrect/viewport/content/scroll_cell_1/touch_node", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=4, ["arrow_offset"]={ 20,