diff --git a/lua/app/config/attr.lua b/lua/app/config/attr.lua
index 4adc128b..fc68e6bc 100644
--- a/lua/app/config/attr.lua
+++ b/lua/app/config/attr.lua
@@ -2,506 +2,506 @@ local attr = {
[1]={
["id"]=1,
["name"]="hp",
- ["power"]=100
+ ["power"]=1
},
[2]={
["id"]=2,
["name"]="atk_red",
- ["power"]=200
+ ["power"]=3
},
[3]={
["id"]=3,
["name"]="atk_yellow",
- ["power"]=200
+ ["power"]=3
},
[4]={
["id"]=4,
["name"]="atk_green",
- ["power"]=200
+ ["power"]=3
},
[5]={
["id"]=5,
["name"]="atk_blue",
- ["power"]=200
+ ["power"]=3
},
[6]={
["id"]=6,
["name"]="atk_purple",
- ["power"]=200
+ ["power"]=3
},
[7]={
["id"]=7,
["name"]="attr_crit_red",
- ["power"]=500,
+ ["power"]=5,
["is_percent"]=1
},
[8]={
["id"]=8,
["name"]="attr_crit_yellow",
- ["power"]=500,
+ ["power"]=5,
["is_percent"]=1
},
[9]={
["id"]=9,
["name"]="attr_crit_green",
- ["power"]=500,
+ ["power"]=5,
["is_percent"]=1
},
[10]={
["id"]=10,
["name"]="attr_crit_blue",
- ["power"]=500,
+ ["power"]=5,
["is_percent"]=1
},
[11]={
["id"]=11,
["name"]="attr_crit_purple",
- ["power"]=500,
+ ["power"]=5,
["is_percent"]=1
},
[12]={
["id"]=12,
["name"]="attr_crit_time_red",
- ["power"]=500,
+ ["power"]=1,
["is_percent"]=1
},
[13]={
["id"]=13,
["name"]="attr_crit_time_yellow",
- ["power"]=500,
+ ["power"]=1,
["is_percent"]=1
},
[14]={
["id"]=14,
["name"]="attr_crit_time_green",
- ["power"]=500,
+ ["power"]=1,
["is_percent"]=1
},
[15]={
["id"]=15,
["name"]="attr_crit_time_blue",
- ["power"]=500,
+ ["power"]=1,
["is_percent"]=1
},
[16]={
["id"]=16,
["name"]="attr_crit_time_purple",
- ["power"]=500,
+ ["power"]=1,
["is_percent"]=1
},
[17]={
["id"]=17,
["name"]="attr_cured_red",
- ["power"]=100,
+ ["power"]=1,
["is_percent"]=1
},
[18]={
["id"]=18,
["name"]="attr_cured_yellow",
- ["power"]=100,
+ ["power"]=1,
["is_percent"]=1
},
[19]={
["id"]=19,
["name"]="attr_cured_green",
- ["power"]=100,
+ ["power"]=1,
["is_percent"]=1
},
[20]={
["id"]=20,
["name"]="attr_cured_blue",
- ["power"]=100,
+ ["power"]=1,
["is_percent"]=1
},
[21]={
["id"]=21,
["name"]="attr_cured_purple",
- ["power"]=100,
+ ["power"]=1,
["is_percent"]=1
},
[22]={
["id"]=22,
["name"]="attr_atkp_red",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[23]={
["id"]=23,
["name"]="attr_atkp_yellow",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[24]={
["id"]=24,
["name"]="attr_atkp_green",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[25]={
["id"]=25,
["name"]="attr_atkp_blue",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[26]={
["id"]=26,
["name"]="attr_atkp_purple",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[27]={
["id"]=27,
["name"]="attr_hpp_red",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[28]={
["id"]=28,
["name"]="attr_hpp_yellow",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[29]={
["id"]=29,
["name"]="attr_hpp_green",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[30]={
["id"]=30,
["name"]="attr_hpp_blue",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[31]={
["id"]=31,
["name"]="attr_hpp_purple",
- ["power"]=100,
+ ["power"]=3,
["is_percent"]=1
},
[32]={
["id"]=32,
["name"]="attr_normal_hurt_red",
- ["power"]=50
+ ["power"]=5
},
[33]={
["id"]=33,
["name"]="attr_normal_hurt_yellow",
- ["power"]=50
+ ["power"]=5
},
[34]={
["id"]=34,
["name"]="attr_normal_hurt_green",
- ["power"]=50
+ ["power"]=5
},
[35]={
["id"]=35,
["name"]="attr_normal_hurt_blue",
- ["power"]=50
+ ["power"]=5
},
[36]={
["id"]=36,
["name"]="attr_normal_hurt_purple",
- ["power"]=50
+ ["power"]=5
},
[37]={
["id"]=37,
["name"]="attr_skill_hurt_red",
- ["power"]=50
+ ["power"]=5
},
[38]={
["id"]=38,
["name"]="attr_skill_hurt_yellow",
- ["power"]=50
+ ["power"]=5
},
[39]={
["id"]=39,
["name"]="attr_skill_hurt_green",
- ["power"]=50
+ ["power"]=5
},
[40]={
["id"]=40,
["name"]="attr_skill_hurt_blue",
- ["power"]=50
+ ["power"]=5
},
[41]={
["id"]=41,
["name"]="attr_skill_hurt_purple",
- ["power"]=50
+ ["power"]=5
},
[42]={
["id"]=42,
["name"]="attr_normal_hurtp_red",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[43]={
["id"]=43,
["name"]="attr_normal_hurtp_yellow",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[44]={
["id"]=44,
["name"]="attr_normal_hurtp_green",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[45]={
["id"]=45,
["name"]="attr_normal_hurtp_blue",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[46]={
["id"]=46,
["name"]="attr_normal_hurtp_purple",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[47]={
["id"]=47,
["name"]="attr_skill_hurtp_red",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[48]={
["id"]=48,
["name"]="attr_skill_hurtp_yellow",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[49]={
["id"]=49,
["name"]="attr_skill_hurtp_green",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[50]={
["id"]=50,
["name"]="attr_skill_hurtp_blue",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[51]={
["id"]=51,
["name"]="attr_skill_hurtp_purple",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[52]={
["id"]=52,
["name"]="attr_hp_red",
- ["power"]=50
+ ["power"]=1
},
[53]={
["id"]=53,
["name"]="attr_hp_yellow",
- ["power"]=50
+ ["power"]=1
},
[54]={
["id"]=54,
["name"]="attr_hp_green",
- ["power"]=50
+ ["power"]=1
},
[55]={
["id"]=55,
["name"]="attr_hp_blue",
- ["power"]=50
+ ["power"]=1
},
[56]={
["id"]=56,
["name"]="attr_hp_purple",
- ["power"]=50
+ ["power"]=1
},
[57]={
["id"]=57,
["name"]="attr_all_hurtp_red",
- ["power"]=50,
+ ["power"]=10,
["is_percent"]=1
},
[58]={
["id"]=58,
["name"]="attr_all_hurtp_yellow",
- ["power"]=50,
+ ["power"]=10,
["is_percent"]=1
},
[59]={
["id"]=59,
["name"]="attr_all_hurtp_green",
- ["power"]=50,
+ ["power"]=10,
["is_percent"]=1
},
[60]={
["id"]=60,
["name"]="attr_all_hurtp_blue",
- ["power"]=50,
+ ["power"]=10,
["is_percent"]=1
},
[61]={
["id"]=61,
["name"]="attr_all_hurtp_purple",
- ["power"]=50,
+ ["power"]=10,
["is_percent"]=1
},
[62]={
["id"]=62,
["name"]="attr_atkp_red_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[63]={
["id"]=63,
["name"]="attr_atkp_yellow_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[64]={
["id"]=64,
["name"]="attr_atkp_green_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[65]={
["id"]=65,
["name"]="attr_atkp_blue_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[67]={
["id"]=67,
["name"]="atk_all",
- ["power"]=50
+ ["power"]=3
},
[68]={
["id"]=68,
["name"]="attr_hp_all",
- ["power"]=50
+ ["power"]=1
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all",
- ["power"]=50
+ ["power"]=2
},
[70]={
["id"]=70,
["name"]="attr_crit_all",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all",
- ["power"]=50,
+ ["power"]=1,
["is_percent"]=1
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[74]={
["id"]=74,
["name"]="attr_atkp_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[75]={
["id"]=75,
["name"]="attr_atk",
- ["power"]=50
+ ["power"]=3
},
[76]={
["id"]=76,
["name"]="attr_hp",
- ["power"]=50
+ ["power"]=1
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt",
- ["power"]=50
+ ["power"]=5
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt",
- ["power"]=50
+ ["power"]=5
},
[79]={
["id"]=79,
["name"]="dmgdec",
- ["power"]=50
+ ["power"]=2
},
[80]={
["id"]=80,
["name"]="attr_hpp_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[81]={
["id"]=81,
["name"]="attr_monster_dmg",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[82]={
["id"]=82,
["name"]="attr_boss_dmg",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[83]={
["id"]=83,
["name"]="attr_normal_hurtp",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[84]={
["id"]=84,
["name"]="attr_skill_hurtp",
- ["power"]=50,
+ ["power"]=5,
["is_percent"]=1
},
[85]={
["id"]=85,
["name"]="attr_hpp_red_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[86]={
["id"]=86,
["name"]="attr_hpp_yellow_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[87]={
["id"]=87,
["name"]="attr_hpp_green_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[88]={
["id"]=88,
["name"]="attr_hpp_blue_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
},
[89]={
["id"]=89,
["name"]="attr_hpp_purple_all",
- ["power"]=50,
+ ["power"]=3,
["is_percent"]=1
}
}
diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua
index 51b0769c..b8928173 100644
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@@ -215,7 +215,7 @@ local buff = {
["buff_type"]=1,
["stack"]=2,
["decr"]=1,
- ["icon"]="weakness_all_add",
+ ["icon"]="dmg_add_all",
["is_percent"]=1
},
[25]={
diff --git a/lua/app/config/equip_resonate.lua b/lua/app/config/equip_resonate.lua
index 28621733..61efc362 100644
--- a/lua/app/config/equip_resonate.lua
+++ b/lua/app/config/equip_resonate.lua
@@ -263,7 +263,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=1,
["parameter"]={
- 1,
+ 2,
1
},
["attr"]={
@@ -277,7 +277,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=2,
["parameter"]={
- 1,
+ 2,
2
},
["attr"]={
@@ -291,7 +291,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=3,
["parameter"]={
- 2,
+ 3,
1
},
["attr"]={
@@ -305,7 +305,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=4,
["parameter"]={
- 2,
+ 3,
2
},
["attr"]={
@@ -319,7 +319,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=5,
["parameter"]={
- 2,
+ 3,
3
},
["attr"]={
@@ -333,7 +333,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=6,
["parameter"]={
- 3,
+ 4,
1
},
["attr"]={
@@ -347,7 +347,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=7,
["parameter"]={
- 3,
+ 4,
2
},
["attr"]={
@@ -361,7 +361,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=8,
["parameter"]={
- 3,
+ 4,
3
},
["attr"]={
@@ -375,7 +375,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=9,
["parameter"]={
- 3,
+ 4,
4
},
["attr"]={
@@ -389,7 +389,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=10,
["parameter"]={
- 4,
+ 5,
1
},
["attr"]={
@@ -403,7 +403,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=11,
["parameter"]={
- 4,
+ 5,
2
},
["attr"]={
@@ -417,7 +417,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=12,
["parameter"]={
- 4,
+ 5,
3
},
["attr"]={
@@ -431,7 +431,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=13,
["parameter"]={
- 4,
+ 5,
4
},
["attr"]={
@@ -445,7 +445,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=14,
["parameter"]={
- 4,
+ 5,
5
},
["attr"]={
@@ -459,7 +459,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=15,
["parameter"]={
- 5,
+ 6,
1
},
["attr"]={
@@ -473,7 +473,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=16,
["parameter"]={
- 5,
+ 6,
2
},
["attr"]={
@@ -487,7 +487,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=17,
["parameter"]={
- 5,
+ 6,
3
},
["attr"]={
@@ -501,7 +501,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=18,
["parameter"]={
- 5,
+ 6,
4
},
["attr"]={
@@ -515,7 +515,7 @@ local equip_resonate = {
["type"]=2,
["lv"]=19,
["parameter"]={
- 5,
+ 6,
5
},
["attr"]={
diff --git a/lua/app/config/fund_chapter.lua b/lua/app/config/fund_chapter.lua
index 2ac09cba..b71de2aa 100755
--- a/lua/app/config/fund_chapter.lua
+++ b/lua/app/config/fund_chapter.lua
@@ -376,7 +376,7 @@ local fund_chapter = {
},
[1016]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=16,
["reward_free"]={
{
@@ -401,7 +401,7 @@ local fund_chapter = {
},
[1017]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=17,
["reward_free"]={
{
@@ -426,7 +426,7 @@ local fund_chapter = {
},
[1018]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=18,
["reward_free"]={
{
@@ -451,7 +451,7 @@ local fund_chapter = {
},
[1019]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=19,
["reward_free"]={
{
@@ -476,7 +476,7 @@ local fund_chapter = {
},
[1020]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=20,
["reward_free"]={
{
@@ -501,7 +501,7 @@ local fund_chapter = {
},
[1021]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=21,
["reward_free"]={
{
@@ -526,7 +526,7 @@ local fund_chapter = {
},
[1022]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=22,
["reward_free"]={
{
@@ -551,7 +551,7 @@ local fund_chapter = {
},
[1023]={
["stage"]=2,
- ["act_gift"]=1024000001,
+ ["act_gift"]=1024000101,
["chapter"]=23,
["reward_free"]={
{
@@ -926,7 +926,7 @@ local fund_chapter = {
},
[1038]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=38,
["reward_free"]={
{
@@ -951,7 +951,7 @@ local fund_chapter = {
},
[1039]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=39,
["reward_free"]={
{
@@ -976,7 +976,7 @@ local fund_chapter = {
},
[1040]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=40,
["reward_free"]={
{
@@ -1001,7 +1001,7 @@ local fund_chapter = {
},
[1041]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=41,
["reward_free"]={
{
@@ -1026,7 +1026,7 @@ local fund_chapter = {
},
[1042]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=42,
["reward_free"]={
{
@@ -1051,7 +1051,7 @@ local fund_chapter = {
},
[1043]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=43,
["reward_free"]={
{
@@ -1076,7 +1076,7 @@ local fund_chapter = {
},
[1044]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=44,
["reward_free"]={
{
@@ -1101,7 +1101,7 @@ local fund_chapter = {
},
[1045]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=45,
["reward_free"]={
{
@@ -1126,7 +1126,7 @@ local fund_chapter = {
},
[1046]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=46,
["reward_free"]={
{
@@ -1151,7 +1151,7 @@ local fund_chapter = {
},
[1047]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=47,
["reward_free"]={
{
@@ -1176,7 +1176,7 @@ local fund_chapter = {
},
[1048]={
["stage"]=3,
- ["act_gift"]=1024000101,
+ ["act_gift"]=1024000201,
["chapter"]=48,
["reward_free"]={
{
@@ -1426,7 +1426,7 @@ local fund_chapter = {
},
[1058]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=58,
["reward_free"]={
{
@@ -1451,7 +1451,7 @@ local fund_chapter = {
},
[1059]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=59,
["reward_free"]={
{
@@ -1476,7 +1476,7 @@ local fund_chapter = {
},
[1060]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=60,
["reward_free"]={
{
@@ -1501,7 +1501,7 @@ local fund_chapter = {
},
[1061]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=61,
["reward_free"]={
{
@@ -1526,7 +1526,7 @@ local fund_chapter = {
},
[1062]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=62,
["reward_free"]={
{
@@ -1551,7 +1551,7 @@ local fund_chapter = {
},
[1063]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=63,
["reward_free"]={
{
@@ -1576,7 +1576,7 @@ local fund_chapter = {
},
[1064]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=64,
["reward_free"]={
{
@@ -1601,7 +1601,7 @@ local fund_chapter = {
},
[1065]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=65,
["reward_free"]={
{
@@ -1626,7 +1626,7 @@ local fund_chapter = {
},
[1066]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=66,
["reward_free"]={
{
@@ -1651,7 +1651,7 @@ local fund_chapter = {
},
[1067]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=67,
["reward_free"]={
{
@@ -1676,7 +1676,7 @@ local fund_chapter = {
},
[1068]={
["stage"]=4,
- ["act_gift"]=1024000201,
+ ["act_gift"]=1024000301,
["chapter"]=68,
["reward_free"]={
{
@@ -1801,7 +1801,7 @@ local fund_chapter = {
},
[1073]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=73,
["reward_free"]={
{
@@ -1826,7 +1826,7 @@ local fund_chapter = {
},
[1074]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=74,
["reward_free"]={
{
@@ -1851,7 +1851,7 @@ local fund_chapter = {
},
[1075]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=75,
["reward_free"]={
{
@@ -1876,7 +1876,7 @@ local fund_chapter = {
},
[1076]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=76,
["reward_free"]={
{
@@ -1901,7 +1901,7 @@ local fund_chapter = {
},
[1077]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=77,
["reward_free"]={
{
@@ -1926,7 +1926,7 @@ local fund_chapter = {
},
[1078]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=78,
["reward_free"]={
{
@@ -1951,7 +1951,7 @@ local fund_chapter = {
},
[1079]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=79,
["reward_free"]={
{
@@ -1976,7 +1976,7 @@ local fund_chapter = {
},
[1080]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=80,
["reward_free"]={
{
@@ -2001,7 +2001,7 @@ local fund_chapter = {
},
[1081]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=81,
["reward_free"]={
{
@@ -2026,7 +2026,7 @@ local fund_chapter = {
},
[1082]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=82,
["reward_free"]={
{
@@ -2051,7 +2051,7 @@ local fund_chapter = {
},
[1083]={
["stage"]=5,
- ["act_gift"]=1024000301,
+ ["act_gift"]=1024000401,
["chapter"]=83,
["reward_free"]={
{
diff --git a/lua/app/config/mall_daily_store.lua b/lua/app/config/mall_daily_store.lua
index d43c8a20..60bacec3 100644
--- a/lua/app/config/mall_daily_store.lua
+++ b/lua/app/config/mall_daily_store.lua
@@ -834,7 +834,7 @@ local mall_daily_store = {
}
},
["limit"]=1,
- ["unlock"]=0,
+ ["unlock"]=11,
["value"]={
0,
0,
@@ -1058,7 +1058,7 @@ local mall_daily_store = {
}
},
["limit"]=1,
- ["unlock"]=23,
+ ["unlock"]=19,
["value"]={
0,
0,
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index 056bb3df..6be57c39 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -8959,6 +8959,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10001001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -8983,6 +8984,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10001002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9007,6 +9009,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10001003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9031,6 +9034,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10002001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9055,6 +9059,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10002002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9079,6 +9084,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10002003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9103,6 +9109,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10003001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9127,6 +9134,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10003002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9151,6 +9159,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10003003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9175,6 +9184,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10004001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9199,6 +9209,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10004002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9223,6 +9234,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10004003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9247,6 +9259,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10005001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9271,6 +9284,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10005002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9295,6 +9309,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10005003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9319,6 +9334,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10006001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9343,6 +9359,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10006002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9367,6 +9384,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10006003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9391,6 +9409,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10007001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9415,6 +9434,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10007002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9439,6 +9459,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10007003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9463,6 +9484,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10008001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9487,6 +9509,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10008002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9511,6 +9534,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10008003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9535,6 +9559,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10009001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9559,6 +9584,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10009002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9583,6 +9609,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10009003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9607,6 +9634,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10010001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -9631,6 +9659,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10010002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -9655,6 +9684,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10010003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -9679,6 +9709,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10011001,
["name_act"]="attack01",
["name_hit"]={
"suffer02"
@@ -9703,6 +9734,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10011002,
["name_act"]="attack02",
["name_hit"]={
"suffer01"
@@ -9727,6 +9759,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10011003,
["name_act"]="attack03",
["name_hit"]={
"suffer02"
@@ -9751,6 +9784,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10012001,
["name_act"]="attack01",
["name_hit"]={
"suffer02"
@@ -9775,6 +9809,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10012002,
["name_act"]="attack02",
["name_hit"]={
"suffer01"
@@ -9799,6 +9834,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10012003,
["name_act"]="attack03",
["name_hit"]={
"suffer02"
@@ -9823,6 +9859,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10013001,
["name_act"]="attack01",
["name_hit"]={
"suffer02"
@@ -9847,6 +9884,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10013002,
["name_act"]="attack02",
["name_hit"]={
"suffer01"
@@ -9871,6 +9909,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10013003,
["name_act"]="attack03",
["name_hit"]={
"suffer02"
@@ -9895,6 +9934,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10014001,
["name_act"]="attack01",
["name_hit"]={
"suffer02"
@@ -9919,6 +9959,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10014002,
["name_act"]="attack02",
["name_hit"]={
"suffer01"
@@ -9943,6 +9984,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10014003,
["name_act"]="attack03",
["name_hit"]={
"suffer02"
@@ -9967,6 +10009,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10015001,
["name_act"]="attack01",
["name_hit"]={
"suffer02"
@@ -9991,6 +10034,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10015002,
["name_act"]="attack02",
["name_hit"]={
"suffer01"
@@ -10015,6 +10059,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10015003,
["name_act"]="attack03",
["name_hit"]={
"suffer02"
@@ -10039,6 +10084,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10016001,
["name_act"]="attack01",
["name_hit"]={
"suffer02"
@@ -10063,6 +10109,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10016002,
["name_act"]="attack02",
["name_hit"]={
"suffer01"
@@ -10087,6 +10134,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10016003,
["name_act"]="attack03",
["name_hit"]={
"suffer02"
@@ -10111,6 +10159,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10017001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -10135,6 +10184,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10017002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -10159,6 +10209,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10017003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
@@ -10183,6 +10234,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10018001,
["name_act"]="attack01",
["name_hit"]={
"suffer02"
@@ -10207,6 +10259,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10018002,
["name_act"]="attack02",
["name_hit"]={
"suffer01"
@@ -10231,6 +10284,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10018003,
["name_act"]="attack03",
["name_hit"]={
"suffer02"
@@ -10255,6 +10309,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10019001,
["name_act"]="attack01",
["name_hit"]={
"suffer01"
@@ -10279,6 +10334,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10019002,
["name_act"]="attack02",
["name_hit"]={
"suffer02"
@@ -10303,6 +10359,7 @@ local skill = {
},
["shake_time"]=100,
["shake_type"]=1,
+ ["sound"]=10019003,
["name_act"]="attack03",
["name_hit"]={
"suffer01"
diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua
index 0ff6fcc0..a0d679c7 100644
--- a/lua/app/config/skill_rogue.lua
+++ b/lua/app/config/skill_rogue.lua
@@ -2,7 +2,7 @@ local skill_rogue = {
[1]={
["universal"]=1,
["limit_times"]=1,
- ["weight"]=500,
+ ["weight"]=300,
["qlt"]=5,
["type"]=9,
["effect"]={
@@ -20,7 +20,7 @@ local skill_rogue = {
[2]={
["universal"]=1,
["limit_times"]=1,
- ["weight"]=500,
+ ["weight"]=300,
["qlt"]=5,
["type"]=9,
["effect"]={
@@ -38,7 +38,7 @@ local skill_rogue = {
[3]={
["universal"]=1,
["limit_times"]=1,
- ["weight"]=500,
+ ["weight"]=300,
["qlt"]=5,
["type"]=9,
["effect"]={
@@ -56,7 +56,7 @@ local skill_rogue = {
[4]={
["universal"]=1,
["limit_times"]=1,
- ["weight"]=600,
+ ["weight"]=360,
["qlt"]=5,
["type"]=9,
["effect"]={
@@ -75,7 +75,7 @@ local skill_rogue = {
["universal"]=1,
["toast_mark"]=1,
["limit_times"]=1,
- ["weight"]=800,
+ ["weight"]=500,
["qlt"]=5,
["type"]=5,
["attr"]={
@@ -121,7 +121,7 @@ local skill_rogue = {
["universal"]=1,
["toast_mark"]=2,
["limit_times"]=1,
- ["weight"]=800,
+ ["weight"]=500,
["qlt"]=5,
["type"]=5,
["attr"]={
@@ -167,7 +167,7 @@ local skill_rogue = {
["universal"]=1,
["toast_mark"]=3,
["limit_times"]=1,
- ["weight"]=800,
+ ["weight"]=500,
["qlt"]=5,
["type"]=5,
["attr"]={
@@ -228,7 +228,7 @@ local skill_rogue = {
["universal"]=1,
["toast_mark"]=8,
["limit_times"]=1,
- ["weight"]=800,
+ ["weight"]=500,
["qlt"]=5,
["type"]=5,
["attr"]={
diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua
index 028a79c0..91987581 100644
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@@ -780,8 +780,8 @@ local localization_global =
["FIRST_CHARGE_TITLE_1"] = "启程助力",
["FIRST_CHARGE_TITLE_2"] = "特惠臻选",
["FIRST_CHARGE_TITLE_3"] = "超值尊享",
- ["FIRST_CHARGE_TIPS_1"] = "购买获得强力输出雷神鼠尔,连续3天领好礼",
- ["FIRST_CHARGE_TIPS_2"] = "购买获得闪电树懒,解锁电系合体英雄",
+ ["FIRST_CHARGE_TIPS_1"] = "购买获得强力输出快递仙人,连续3天领好礼",
+ ["FIRST_CHARGE_TIPS_2"] = "购买获得火花姬,自愈治疗全队生存稳稳!",
["FIRST_CHARGE_TIPS_3"] = "购买获得神话宝物-许愿神灯,连续3天领好礼。",
["FIRST_CHARGE_1"] = "第{0}天",
["FIRST_CHARGE_2"] = "{0}首充",