灼烧、易伤、中毒、腐败、削弱、诅咒buff提交

lua/app/config/act_chapter_store.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: e1c21d8a7d40ea54bac5ddca0ef0eab8
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/act_gift.lua

@@ -0,0 +1,20 @@
+local act_gift = {
+	[10002]={
+		["type"]=7,
+		["recharge_id"]=11,
+		["time_type"]=3,
+		["limit"]=1,
+		["value"]=3000
+	},
+	[10102]={
+		["type"]=7,
+		["recharge_id"]=12,
+		["time_type"]=3,
+		["limit"]=1,
+		["value"]=25
+	}
+}
+local config = {
+data=act_gift,count=2
+}
+return config

lua/app/config/act_gift.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5d4e36b21dd4c58408962b5a7f47a459
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/act_growup_gift.lua

@@ -0,0 +1,336 @@
+local act_growup_gift = {
+	[1014]={
+		["hero_id"]=23001,
+		["recharge_id"]=7,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800
+	},
+	[1024]={
+		["hero_id"]=23001,
+		["recharge_id"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800
+	},
+	[1034]={
+		["hero_id"]=23001,
+		["recharge_id"]=13,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800
+	},
+	[1044]={
+		["hero_id"]=23001,
+		["recharge_id"]=15,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=400,
+ 				["num_for_nothing"]="Ughc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800
+	},
+	[1054]={
+		["hero_id"]=23001,
+		["recharge_id"]=17,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=500,
+ 				["num_for_nothing"]="Uwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800
+	},
+	[1064]={
+		["hero_id"]=23001,
+		["recharge_id"]=18,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800
+	},
+	[2014]={
+		["hero_id"]=43001,
+		["recharge_id"]=7,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800,
+		["value_2"]=1
+	},
+	[2024]={
+		["hero_id"]=43001,
+		["recharge_id"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800,
+		["value_2"]=1
+	},
+	[2034]={
+		["hero_id"]=43001,
+		["recharge_id"]=13,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800,
+		["value_2"]=1
+	},
+	[2044]={
+		["hero_id"]=43001,
+		["recharge_id"]=15,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=400,
+ 				["num_for_nothing"]="Ughc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800,
+		["value_2"]=1
+	},
+	[2054]={
+		["hero_id"]=43001,
+		["recharge_id"]=17,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=500,
+ 				["num_for_nothing"]="Uwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800,
+		["value_2"]=1
+	},
+	[2064]={
+		["hero_id"]=43001,
+		["recharge_id"]=18,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=3,
+		["cd"]=12,
+		["limit"]=1,
+		["value"]=800,
+		["value_2"]=1
+	}
+}
+local config = {
+data=act_growup_gift,count=12
+}
+return config

lua/app/config/act_growup_gift.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 956a66427f61d674b86d5c5b729862d6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/bounty_level.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 69710b76d77270f40aafa0077807c9dd
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/bounty_time.lua

@@ -0,0 +1,16 @@
+local bounty_time = {
+	[1]={
+		["season"]=1,
+		["start_time"]="2023-5-1 00:00:00",
+		["end_time"]="2022-6-1 00:00:00"
+	},
+	[2]={
+		["season"]=2,
+		["start_time"]="2023-6-1 00:00:00",
+		["end_time"]="2022-7-1 00:00:00"
+	}
+}
+local config = {
+data=bounty_time,count=2
+}
+return config

lua/app/config/bounty_time.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b6823cf4d657ca14290f9453c0dedebf
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/buff.lua

@@ -2,174 +2,232 @@ local buff = {
 	[1]={
 		["name"]="hurt",
 		["buff_type"]=3,
+		["decr"]=3,
 		["formula"]=1
 	},
 	[2]={
 		["name"]="hurt_red",
 		["buff_type"]=3,
 		["position"]=1,
+		["decr"]=3,
 		["formula"]=1
 	},
 	[3]={
 		["name"]="hurt_yellow",
 		["buff_type"]=3,
 		["position"]=2,
+		["decr"]=3,
 		["formula"]=1
 	},
 	[4]={
 		["name"]="hurt_green",
 		["buff_type"]=3,
 		["position"]=3,
+		["decr"]=3,
 		["formula"]=1
 	},
 	[5]={
 		["name"]="hurt_blue",
 		["buff_type"]=3,
 		["position"]=4,
+		["decr"]=3,
 		["formula"]=1
 	},
 	[6]={
 		["name"]="hurt_purple",
 		["buff_type"]=3,
 		["position"]=5,
+		["decr"]=3,
 		["formula"]=1
 	},
 	[7]={
 		["name"]="dec_dmg_red_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=1,
+		["decr"]=1,
 		["icon"]="dec_dmg_red_add"
 	},
 	[8]={
 		["name"]="dec_dmg_yellow_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=2,
+		["decr"]=1,
 		["icon"]="dec_dmg_yellow_add"
 	},
 	[9]={
 		["name"]="dec_dmg_green_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=3,
+		["decr"]=1,
 		["icon"]="dec_dmg_green_add"
 	},
 	[10]={
 		["name"]="dec_dmg_blue_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=4,
+		["decr"]=1,
 		["icon"]="dec_dmg_blue_add"
 	},
 	[11]={
 		["name"]="dec_dmg_purple_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=5,
+		["decr"]=1,
 		["icon"]="dec_dmg_purple_add"
 	},
 	[12]={
 		["name"]="dec_dmg_all_add",
 		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1,
 		["icon"]="dec_dmg_all_add"
 	},
 	[13]={
 		["name"]="weakness_red_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=1,
+		["decr"]=2,
 		["icon"]="weakness_red_add"
 	},
 	[14]={
 		["name"]="weakness_yellow_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=2,
+		["decr"]=2,
 		["icon"]="weakness_yellow_add"
 	},
 	[15]={
 		["name"]="weakness_green_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=3,
+		["decr"]=2,
 		["icon"]="weakness_green_add"
 	},
 	[16]={
 		["name"]="weakness_blue_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=4,
+		["decr"]=2,
 		["icon"]="weakness_blue_add"
 	},
 	[17]={
 		["name"]="weakness_purple_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=5,
+		["decr"]=2,
 		["icon"]="weakness_purple_add"
 	},
 	[18]={
 		["name"]="weakness_all_add",
 		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=2,
 		["icon"]="weakness_all_add"
 	},
 	[19]={
 		["name"]="dmg_addition_red_add",
 		["buff_type"]=1,
-		["position"]=1
+		["stack"]=2,
+		["position"]=1,
+		["decr"]=1
 	},
 	[20]={
 		["name"]="dmg_addition_yellow_add",
 		["buff_type"]=1,
-		["position"]=2
+		["stack"]=2,
+		["position"]=2,
+		["decr"]=1
 	},
 	[21]={
 		["name"]="dmg_addition_green_add",
 		["buff_type"]=1,
-		["position"]=3
+		["stack"]=2,
+		["position"]=3,
+		["decr"]=1
 	},
 	[22]={
 		["name"]="dmg_addition_blue_add",
 		["buff_type"]=1,
-		["position"]=4
+		["stack"]=2,
+		["position"]=4,
+		["decr"]=1
 	},
 	[23]={
 		["name"]="dmg_addition_purple_add",
 		["buff_type"]=1,
-		["position"]=5
+		["stack"]=2,
+		["position"]=5,
+		["decr"]=1
 	},
 	[24]={
 		["name"]="dmg_addition_all_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[25]={
 		["name"]="atkp_color_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[26]={
 		["name"]="atkp_red_add",
 		["buff_type"]=1,
-		["position"]=1
+		["stack"]=2,
+		["position"]=1,
+		["decr"]=1
 	},
 	[27]={
 		["name"]="atkp_yellow_add",
 		["buff_type"]=1,
-		["position"]=2
+		["stack"]=2,
+		["position"]=2,
+		["decr"]=1
 	},
 	[28]={
 		["name"]="atkp_green_add",
 		["buff_type"]=1,
-		["position"]=3
+		["stack"]=2,
+		["position"]=3,
+		["decr"]=1
 	},
 	[29]={
 		["name"]="atkp_blue_add",
 		["buff_type"]=1,
-		["position"]=4
+		["stack"]=2,
+		["position"]=4,
+		["decr"]=1
 	},
 	[30]={
 		["name"]="atkp_purple_add",
 		["buff_type"]=1,
-		["position"]=5
+		["stack"]=2,
+		["position"]=5,
+		["decr"]=1
 	},
 	[31]={
 		["name"]="wavehealp",
 		["buff_type"]=5,
+		["stack"]=2,
+		["decr"]=1,
 		["formula"]=2
 	},
 	[32]={
 		["name"]="heal",
 		["buff_type"]=5,
+		["stack"]=2,
+		["decr"]=1,
 		["formula"]=3,
 		["fx_get"]={
 			300025
@@ -178,6 +236,8 @@ local buff = {
 	[33]={
 		["name"]="stun",
 		["buff_type"]=8,
+		["stack"]=2,
+		["decr"]=2,
 		["icon"]="stun",
 		["fx_continued"]={
 			13
@@ -186,6 +246,7 @@ local buff = {
 	[34]={
 		["name"]="shield",
 		["buff_type"]=2,
+		["decr"]=1,
 		["icon"]="shield",
 		["fx_continued"]={
 			11
@@ -196,11 +257,15 @@ local buff = {
 	},
 	[35]={
 		["name"]="atkp_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[36]={
 		["name"]="normal_attack_dec",
 		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=2,
 		["icon"]="normal_attack_dec",
 		["fx_continued"]={
 			12
@@ -208,43 +273,68 @@ local buff = {
 	},
 	[37]={
 		["name"]="normal_attack_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[38]={
 		["name"]="block",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[39]={
 		["name"]="hpp_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[40]={
 		["name"]="crit_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[41]={
 		["name"]="crit_time_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[42]={
 		["name"]="exp_time_add",
-		["buff_type"]=7
+		["buff_type"]=7,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[43]={
 		["name"]="cured_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1
 	},
 	[44]={
-		["name"]="add_skill",
+		["name"]="cured_dec",
-		["buff_type"]=7
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=2
 	},
 	[45]={
-		["name"]="skill_fire_times",
+		["name"]="add_skill",
-		["buff_type"]=7
+		["buff_type"]=7,
+		["stack"]=2,
+		["decr"]=3
 	},
 	[46]={
+		["name"]="skill_fire_times",
+		["buff_type"]=7,
+		["stack"]=2,
+		["decr"]=3
+	},
+	[47]={
 		["name"]="shield_rebound_200",
 		["buff_type"]=2,
+		["decr"]=1,
 		["icon"]="shield",
 		["fx_continued"]={
 			11
@@ -253,10 +343,143 @@ local buff = {
 			14
 		}
 	},
-	[47]={
+	[48]={
 		["name"]="burn",
 		["buff_type"]=4,
+		["stack"]=1,
+		["decr"]=2,
 		["formula"]=4
+	},
+	[49]={
+		["name"]="vulnerable",
+		["buff_type"]=1,
+		["decr"]=2
+	},
+	[50]={
+		["name"]="frozen",
+		["buff_type"]=8,
+		["decr"]=2
+	},
+	[51]={
+		["name"]="poison",
+		["buff_type"]=4,
+		["stack"]=2,
+		["decr"]=2,
+		["formula"]=4
+	},
+	[52]={
+		["name"]="Imprison",
+		["buff_type"]=7,
+		["decr"]=2
+	},
+	[53]={
+		["name"]="corrupt",
+		["buff_type"]=1,
+		["decr"]=2
+	},
+	[54]={
+		["name"]="bleed",
+		["buff_type"]=7,
+		["decr"]=2,
+		["formula"]=4
+	},
+	[55]={
+		["name"]="weaken",
+		["buff_type"]=1,
+		["decr"]=2
+	},
+	[56]={
+		["name"]="lethargy",
+		["buff_type"]=8,
+		["stack"]=1,
+		["decr"]=2
+	},
+	[57]={
+		["name"]="curse",
+		["buff_type"]=1,
+		["decr"]=2
+	},
+	[58]={
+		["name"]="lock",
+		["buff_type"]=7,
+		["decr"]=2
+	},
+	[59]={
+		["name"]="first_hand",
+		["buff_type"]=7,
+		["decr"]=1
+	},
+	[60]={
+		["name"]="skill_hurt_add",
+		["buff_type"]=1,
+		["decr"]=1
+	},
+	[61]={
+		["name"]="undead",
+		["buff_type"]=7,
+		["decr"]=1
+	},
+	[62]={
+		["name"]="counterattack",
+		["buff_type"]=7,
+		["stack"]=1,
+		["decr"]=1
+	},
+	[63]={
+		["name"]="thorns",
+		["buff_type"]=7,
+		["decr"]=1
+	},
+	[64]={
+		["name"]="dmg_dec_red_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=1,
+		["decr"]=2
+	},
+	[65]={
+		["name"]="dmg_dec_yellow_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=2,
+		["decr"]=2
+	},
+	[66]={
+		["name"]="dmg_dec_green_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=3,
+		["decr"]=2
+	},
+	[67]={
+		["name"]="dmg_dec_blue_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=4,
+		["decr"]=2
+	},
+	[68]={
+		["name"]="dmg_dec_purple_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["position"]=5,
+		["decr"]=2
+	},
+	[69]={
+		["name"]="dmg_dec_all_add",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=2
+	},
+	[70]={
+		["name"]="be_sucked",
+		["buff_type"]=1,
+		["decr"]=2
+	},
+	[71]={
+		["name"]="be_dmg_to_heal",
+		["buff_type"]=1,
+		["decr"]=2
 	}
 }
 local keys = {
@@ -304,15 +527,39 @@ local keys = {
 		["crit_time_add"]=buff[41],
 		["exp_time_add"]=buff[42],
 		["cured_add"]=buff[43],
-		["add_skill"]=buff[44],
+		["cured_dec"]=buff[44],
-		["skill_fire_times"]=buff[45],
+		["add_skill"]=buff[45],
-		["shield_rebound_200"]=buff[46],
+		["skill_fire_times"]=buff[46],
-		["burn"]=buff[47]
+		["shield_rebound_200"]=buff[47],
+		["burn"]=buff[48],
+		["vulnerable"]=buff[49],
+		["frozen"]=buff[50],
+		["poison"]=buff[51],
+		["Imprison"]=buff[52],
+		["corrupt"]=buff[53],
+		["bleed"]=buff[54],
+		["weaken"]=buff[55],
+		["lethargy"]=buff[56],
+		["curse"]=buff[57],
+		["lock"]=buff[58],
+		["first_hand"]=buff[59],
+		["skill_hurt_add"]=buff[60],
+		["undead"]=buff[61],
+		["counterattack"]=buff[62],
+		["thorns"]=buff[63],
+		["dmg_dec_red_add"]=buff[64],
+		["dmg_dec_yellow_add"]=buff[65],
+		["dmg_dec_green_add"]=buff[66],
+		["dmg_dec_blue_add"]=buff[67],
+		["dmg_dec_purple_add"]=buff[68],
+		["dmg_dec_all_add"]=buff[69],
+		["be_sucked"]=buff[70],
+		["be_dmg_to_heal"]=buff[71]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=47
+count=71
 }
 return config

lua/app/config/const.lua

@@ -41,9 +41,45 @@ local const = {
 	},
 	["act_gold_pig_full_cd"]={
 		["value"]=12
+	},
+	["stamina_diamond_buy"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	},
+	["stamina_diamond_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	},
+	["stamina_diamond_times"]={
+		["value"]=3
+	},
+	["stamina_ad_buy"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	["stamina_ad_times"]={
+		["value"]=5
 	}
 }
 local config = {
-data=const,count=12
+data=const,count=17
 }
 return config

lua/app/config/func_open.lua

@@ -2,9 +2,12 @@ local func_open = {
 	["act_gold_pig"]={
 		["stage"]=3,
 		["pop_ups"]=1
+	},
+	["task"]={
+		["stage"]=2
 	}
 }
 local config = {
-data=func_open,count=1
+data=func_open,count=2
 }
 return config

lua/app/config/item.lua

@@ -101,6 +101,23 @@ local item = {
 			}
 		}
 	},
+	[7]={
+		["type"]=1,
+		["qlt"]=5,
+		["icon"]="7"
+	},
+	[8]={
+		["type"]=4
+	},
+	[9]={
+		["type"]=4
+	},
+	[10]={
+		["type"]=4
+	},
+	[11]={
+		["type"]=4
+	},
 	[12001]={
 		["type"]=5,
 		["parameter"]=12001,
@@ -151,6 +168,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=19
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -56,6 +56,19 @@ local LocalizationGlobalConst =
 	CLICK_COPY_ACOUNT_DESC = "CLICK_COPY_ACOUNT_DESC",
 	APP = "APP",
 	CHAPTER_DESC_1 = "CHAPTER_DESC_1",
+	SETTING_DESC = "SETTING_DESC",
+	SETTING_DESC_MUSIC = "SETTING_DESC_MUSIC",
+	SETTING_DESC_VOICE = "SETTING_DESC_VOICE",
+	SETTING_DESC_LANGUAGE = "SETTING_DESC_LANGUAGE",
+	SERVICE_DESC = "SERVICE_DESC",
+	PRIVACY_DESC = "PRIVACY_DESC",
+	CLIENT_VERSION = "CLIENT_VERSION",
+	BIND_ACCOUNT_DESC = "BIND_ACCOUNT_DESC",
+	CHANGE_ACCOUNT_DESC = "CHANGE_ACCOUNT_DESC",
+	DELETE_ACCOUNT_DESC = "DELETE_ACCOUNT_DESC",
+	SETTING_DESC_1 = "SETTING_DESC_1",
+	ACCOUNT_ALREADY_BINDED_DESC = "ACCOUNT_ALREADY_BINDED_DESC",
+	LANGUAGE_DESC = "LANGUAGE_DESC",
 }
 
 return LocalizationGlobalConst

lua/app/config/player_initial.lua

@@ -1,15 +1,5 @@
 local player_initial = {
 	[1]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=60,
- 			["num_for_nothing"]="UAg="
-		}
-	},
-	[2]={
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
@@ -19,7 +9,7 @@ local player_initial = {
  			["num_for_nothing"]="Vw=="
 		}
 	},
-	[3]={
+	[2]={
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
@@ -29,7 +19,7 @@ local player_initial = {
  			["num_for_nothing"]="Vw=="
 		}
 	},
-	[4]={
+	[3]={
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
@@ -41,6 +31,6 @@ local player_initial = {
 	}
 }
 local config = {
-data=player_initial,count=4
+data=player_initial,count=3
 }
 return config

lua/app/config/recharge.lua

@@ -76,10 +76,18 @@ local recharge = {
 		["price"]=9.99,
 		["price_cn"]=68,
 		["same_price"]=10,
-		["price_str"]="$9.99",
+		["price_str"]="9.99",
 		["score"]=10
 	},
 	[11]={
+		["payId"]="com.idle.ko.io.11.99dollar",
+		["price"]=11.99,
+		["price_cn"]=78,
+		["same_price"]=12,
+		["price_str"]="11.99",
+		["score"]=12
+	},
+	[12]={
 		["payId"]="com.idle.ko.io.14.99dollar",
 		["price"]=14.99,
 		["price_cn"]=98,
@@ -87,7 +95,7 @@ local recharge = {
 		["price_str"]="$14.99",
 		["score"]=15
 	},
-	[12]={
+	[13]={
 		["payId"]="com.idle.ko.io.19.99dollar",
 		["price"]=19.99,
 		["price_cn"]=128,
@@ -95,7 +103,7 @@ local recharge = {
 		["price_str"]="$19.99",
 		["score"]=20
 	},
-	[13]={
+	[14]={
 		["payId"]="com.idle.ko.io.24.99dollar",
 		["price"]=24.99,
 		["price_cn"]=168,
@@ -103,7 +111,7 @@ local recharge = {
 		["price_str"]="$24.99",
 		["score"]=25
 	},
-	[14]={
+	[15]={
 		["payId"]="com.idle.ko.io.29.99dollar",
 		["price"]=29.99,
 		["price_cn"]=198,
@@ -111,7 +119,7 @@ local recharge = {
 		["price_str"]="$29.99",
 		["score"]=30
 	},
-	[15]={
+	[16]={
 		["payId"]="com.idle.ko.io.49.99dollar",
 		["price"]=49.99,
 		["price_cn"]=328,
@@ -119,7 +127,7 @@ local recharge = {
 		["price_str"]="$49.99",
 		["score"]=50
 	},
-	[16]={
+	[17]={
 		["payId"]="com.idle.ko.io.69.99dollar",
 		["price"]=69.99,
 		["price_cn"]=448,
@@ -127,7 +135,7 @@ local recharge = {
 		["price_str"]="$69.99",
 		["score"]=70
 	},
-	[17]={
+	[18]={
 		["payId"]="com.idle.ko.io.99.99dollar",
 		["price"]=99.99,
 		["price_cn"]=648,
@@ -137,6 +145,6 @@ local recharge = {
 	}
 }
 local config = {
-data=recharge,count=17
+data=recharge,count=18
 }
 return config

lua/app/config/strings/cn/buff.lua

@@ -59,9 +59,9 @@ local buff = {
 		["desc"]="普攻攻击次数减少",
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
 		["desc"]="护盾可抵挡一定的伤害，并有200%反伤",
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -81,7 +81,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/cn/global.lua

@@ -56,6 +56,19 @@ local localization_global =
     ["CLICK_COPY_ACOUNT_DESC"] = "点击复制用户ID",
     ["APP"] = "版本号：",
     ["CHAPTER_DESC_1"] = "最高纪录：{0}",
+    ["SETTING_DESC"] = "设置",
+    ["SETTING_DESC_MUSIC"] = "音乐",
+    ["SETTING_DESC_VOICE"] = "音效",
+    ["SETTING_DESC_LANGUAGE"] = "语言",
+    ["SERVICE_DESC"] = "使用条款",
+    ["PRIVACY_DESC"] = "隐私政策",
+    ["CLIENT_VERSION"] = "当前版本:{0}",
+    ["BIND_ACCOUNT_DESC"] = "绑定账号",
+    ["CHANGE_ACCOUNT_DESC"] = "切换账号",
+    ["DELETE_ACCOUNT_DESC"] = "删除账号",
+    ["SETTING_DESC_1"] = "ID:{0}",
+    ["ACCOUNT_ALREADY_BINDED_DESC"] = "已绑定",
+    ["LANGUAGE_DESC"] = "语言",
 }
 
 return localization_global

lua/app/config/strings/cn/item.lua

@@ -23,6 +23,10 @@ local item = {
 		["name"]="史诗英雄",
 		["desc"]="可以获得史诗英雄。"
 	},
+	[7]={
+		["name"]="通行证积分",
+		["desc"]="累计积分可提升通行证等级。"
+	},
 	[12001]={
 		["name"]="洛克西英雄碎片",
 		["desc"]="洛克西英雄碎片,凑齐可解锁或升级。"
@@ -57,6 +61,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/de/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/de/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/en/buff.lua

@@ -59,9 +59,9 @@ local buff = {
 		["desc"]="Reduce normal attack hits",
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
 		["desc"]="The shield can absorb a certain amount of damage, reflect and deal 200% damage back to the enemy",
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -81,7 +81,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/en/item.lua

@@ -22,6 +22,9 @@ local item = {
 	[6]={
 		["name"]="Epic Hero",
 		["desc"]="Allows you to get an epic hero"
+	},
+	[7]={
+
 	},
 	[12001]={
 		["name"]="Roxy Shard",
@@ -57,6 +60,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/fr/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/fr/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/id/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/id/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/ja/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/ja/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/ko/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/ko/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/pt/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/pt/item.lua

@@ -18,6 +18,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -45,6 +48,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/ru/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/ru/item.lua

@@ -16,6 +16,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -43,6 +46,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/th/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/th/item.lua

@@ -16,6 +16,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -43,6 +46,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/vi/buff.lua

@@ -44,8 +44,8 @@ local buff = {
 	[36]={
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -65,7 +65,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/vi/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/zh/buff.lua

@@ -59,9 +59,9 @@ local buff = {
 		["desc"]="普攻攻擊次數減少",
 		["name"]="normal_attack_dec"
 	},
-	[46]={
+	[47]={
 		["desc"]="護盾可抵擋一定的傷害，並有200%反傷",
-		["name"]="shield"
+		["name"]="shield_rebound_200"
 	}
 }
 local keys = {
@@ -81,7 +81,7 @@ local keys = {
 		["stun"]=buff[33],
 		["shield"]=buff[34],
 		["normal_attack_dec"]=buff[36],
-		["shield"]=buff[46]
+		["shield_rebound_200"]=buff[47]
 	}
 }
 local config = {

lua/app/config/strings/zh/item.lua

@@ -22,6 +22,9 @@ local item = {
 	[6]={
 		["name"]="史詩英雄",
 		["desc"]="可以獲得史詩英雄。"
+	},
+	[7]={
+
 	},
 	[12001]={
 		["name"]="洛克西英雄碎片",
@@ -57,6 +60,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/task.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 8ae000b3de17b394088b2cfc1a04796f
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/task_daily.lua

@@ -0,0 +1,712 @@
+local task_daily = {
+	[1]={
+		["type"]=1,
+		["reset"]=2,
+		["task"]={
+			{
+				1,
+				100
+			}
+		}
+	},
+	[2]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				2,
+				100
+			}
+		}
+	},
+	[3]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				4,
+				100
+			},
+			{
+				5,
+				100
+			},
+			{
+				6,
+				100
+			},
+			{
+				8,
+				100
+			},
+			{
+				9,
+				100
+			},
+			{
+				10,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				7,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[4]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				12,
+				100
+			},
+			{
+				13,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				16,
+				100
+			},
+			{
+				17,
+				100
+			},
+			{
+				18,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[5]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				32,
+				100
+			},
+			{
+				33,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				72,
+				100
+			},
+			{
+				73,
+				100
+			},
+			{
+				74,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[6]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				56,
+				100
+			},
+			{
+				57,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				60,
+				100
+			},
+			{
+				61,
+				100
+			},
+			{
+				62,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[7]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				3,
+				100
+			}
+		}
+	},
+	[8]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				68,
+				100
+			},
+			{
+				69,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				52,
+				100
+			},
+			{
+				53,
+				100
+			},
+			{
+				54,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1,
+		["bounty"]=1
+	},
+	[9]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				26,
+				100
+			},
+			{
+				27,
+				100
+			},
+			{
+				76,
+				50
+			},
+			{
+				77,
+				50
+			}
+		}
+	},
+	[10]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				38,
+				100
+			},
+			{
+				39,
+				100
+			},
+			{
+				78,
+				50
+			}
+		}
+	},
+	[11]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				50,
+				100
+			},
+			{
+				51,
+				100
+			},
+			{
+				91,
+				50
+			}
+		}
+	},
+	[12]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				66,
+				100
+			},
+			{
+				67,
+				100
+			},
+			{
+				82,
+				50
+			}
+		}
+	},
+	[13]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				30,
+				100
+			},
+			{
+				31,
+				100
+			}
+		}
+	},
+	[14]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				87,
+				50
+			},
+			{
+				42,
+				100
+			},
+			{
+				43,
+				100
+			}
+		}
+	},
+	[15]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				88,
+				50
+			},
+			{
+				89,
+				50
+			},
+			{
+				46,
+				100
+			},
+			{
+				47,
+				100
+			}
+		},
+		["bounty"]=1
+	},
+	[16]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				92,
+				100
+			},
+			{
+				22,
+				100
+			},
+			{
+				23,
+				100
+			}
+		},
+		["bounty"]=1
+	}
+}
+local config = {
+data=task_daily,count=16
+}
+return config

lua/app/config/task_daily.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 022c70d6a5d937d41b72d559d006efb8
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/module/battle/battle_const.lua

@@ -125,6 +125,15 @@ BattleConst.MATCH_DMG_ADDITION_NAME = {
 }
 
 BattleConst.MATCH_DMG_DEC_NAME = {
+    [0] = "dmg_dec_none",
+    [1] = "dmg_dec_red",
+    [2] = "dmg_dec_yellow",
+    [3] = "dmg_dec_green",
+    [4] = "dmg_dec_blue",
+    [5] = "dmg_dec_purple",
+}
+
+BattleConst.MATCH_DEC_DMG_NAME = {
     [0] = "dec_dmg_none",
     [1] = "dec_dmg_red",
     [2] = "dec_dmg_yellow",
@@ -216,9 +225,21 @@ local BUFF_NAME = {
     CRIT_TIME_ADD = "crit_time_add",
     EXP_TIME_ADD = "exp_time_add",
     CURED_ADD = "cured_add",
+    CURED_DEC = "cured_dec",
     ADD_SKILL = "add_skill",
     SKILL_FIRE_TIMES = "skill_fire_times",
     SHIELD_REBOUND_200 = "shield_rebound_200",
+    BURN = "burn",
+    VULNERABLE = "vulnerable",
+    FROAEN = "frozen",
+    POISON = "poison",
+    IMPRISON = "imprison",
+    CORRUPT = "corrupt",
+    BLEED = "bleed",
+    WEAKEN = "weaken",
+    LETHARGY = "lethargy",
+    CURSE = "curse",
+    LOCK = "lock",
 }
 BattleConst.BUFF_NAME = BUFF_NAME
 
@@ -247,13 +268,23 @@ local ATTR_NAME = {
     DMG_ADDITION_BLUE = "dmg_addition_blue",
     DMG_ADDITION_PURPLE = "dmg_addition_purple",
     DMG_ADDITION_ALL = "dmg_addition_all",
+    DMG_DEC_RED = "dmg_dec_red",
+    DMG_DEC_YELLOW = "dmg_dec_yellow",
+    DMG_DEC_GREEN = "dmg_dec_green",
+    DMG_DEC_BLUE = "dmg_dec_blue",
+    DMG_DEC_PURPLE = "dmg_dec_purple",
+    DMG_DEC_ALL = "dmg_dec_all",
     NORMAL_ATTACK_COUNT = "normal_attack_count",
     BLOCK = "block",
     CRIT = "crit",
     CRIT_TIME = "crit_time",
     EXP_TIME = "exp_time",
     CURE_ADDITION = "cure_addition",
+    CURE_DEC = "cure_dec",
     SHIELD_REBOUND = "shield_rebound",
+    BE_DMG_TO_HEAL = "be_dmg_to_heal",
+
+    BE_SUCKED = "be_sucked",
 }
 BattleConst.ATTR_NAME = ATTR_NAME
 
@@ -288,6 +319,11 @@ BattleConst.BUFF_NAME_TO_ATTR = {
     [BUFF_NAME.CRIT_TIME_ADD] = {ATTR_NAME.CRIT_TIME, false},
     [BUFF_NAME.EXP_TIME_ADD] = {ATTR_NAME.EXP_TIME, false},
     [BUFF_NAME.CURED_ADD] = {ATTR_NAME.CURE_ADDITION, false},
+    [BUFF_NAME.VULNERABLE] = {ATTR_NAME.WEAKNESS_ALL, false},
+    [BUFF_NAME.CORRUPT] = {ATTR_NAME.CURE_DEC, false},
+    [BUFF_NAME.CURED_DEC] = {ATTR_NAME.CURE_DEC, false},
+    [BUFF_NAME.WEAKEN] = {ATTR_NAME.DMG_DEC_ALL, false},
+    [BUFF_NAME.CURSE] = {ATTR_NAME.BE_DMG_TO_HEAL, false},
 }
 
 ---- 格子类型

lua/app/module/battle/component/battle_unit_comp.lua

@@ -644,6 +644,9 @@ function BattleUnitComp:updateRecoverHpWaveState(dt)
 		self.recoverHpCount = self.recoverHpCount - 1
 		self.recoverHpTime = BattleConst.RECOVER_HP_INTERVAL
 		local healNum = BattleConst.RECOVER_HP_PERCENT * self.unitEntity:getMaxHp() // DEFAULT_FACTOR
+		if healNum < 0 then -- 治疗效果不能为负数
+			healNum = 0
+		end
 		self:takeDamageOrCure(self, healNum, EFFECT_TYPE.HEAL, 0)
 		if self.recoverHpCount <= 0 then
 			if self.finishRecoverHpCallback then
@@ -1194,6 +1197,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus)
 	if num == 0 then
 		return 0
 	end
+	if num < 0 and atker.unitEntity:getBeDmgToHeal() > 0 then
+		num = -num * atker.unitEntity:getBeDmgToHeal() // DEFAULT_FACTOR
+	end
 	atker.unitEntity:addDamageCount(num)
 	local shieldHpBefore = self.unitEntity:getShieldHp()
 	local hpRealReduce = self.unitEntity:takeDamageOrCure(num)

lua/app/module/battle/helper/battle_formula.lua

@@ -15,11 +15,11 @@ function BattleFormula:getDamageOrCureResult(unitComp, buff, targetUnitComp)
 end
 
 BattleFormula.calculateFormula = {
-	-- （攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）+(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击）*暴击伤害
+	-- （攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）- (攻击者元素伤害降低+所有伤害降低) +(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击）*暴击伤害
 	[1] = function(unitComp, buff, targetUnit)
 		local matchType = unitComp.unitEntity:getMatchType()
 		local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR *
-						(DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDmgDec(matchType)) // DEFAULT_FACTOR
+						(DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDecDmg(matchType)) // DEFAULT_FACTOR
 		local hurtState = 0
 		local crit = unitComp.unitEntity:getCrit()
 		if crit > 0 then
@@ -32,19 +32,21 @@ BattleFormula.calculateFormula = {
 	end,
 	-- 生命值*回合开始时的回血系数*(1 + 治疗效果增加)
 	[2] = function(unitComp,  buff, targetUnit)
-		local result = targetUnit.unitEntity:getMaxHp() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() + DEFAULT_FACTOR) // DEFAULT_FACTOR
+		local result = targetUnit.unitEntity:getMaxHp() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() - unitComp.unitEntity:getCureDec() + DEFAULT_FACTOR) // DEFAULT_FACTOR
 		return result, 0
 	end,
 	-- 角色攻击力*技能倍率*(1+治疗效果增加)
 	[3] = function(unitComp,  buff, targetUnit)
-		local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() + DEFAULT_FACTOR) // DEFAULT_FACTOR
+		local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() - unitComp.unitEntity:getCureDec() + DEFAULT_FACTOR) // DEFAULT_FACTOR
 		return result, 0
 	end,
-	-- buff释放方攻击力*技能倍率
+	-- 释放者攻击*技能系数*(1+(攻击者元素伤害增加+所有伤害增加-攻击者元素伤害降低-所有伤害降低+受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击）)
 	[4] = function(unitComp, buff, targetUnit)
-		local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR
+		local matchType = unitComp.unitEntity:getMatchType()
+		local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR *
+						(DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDecDmg(matchType)) // DEFAULT_FACTOR
 		return result, 0
-	end
+	end,
 }
 
 return BattleFormula

lua/app/userdata/battle/team/battle_team_entity.lua

@@ -6,6 +6,7 @@ local BattleTeamEntity = class("BattleTeamEntity", BaseData)
 
 local MATCH_ATTACK_NAME = GConst.MATCH_ATTACK_NAME
 local MATCH_DMG_ADDITION_NAME = BattleConst.MATCH_DMG_ADDITION_NAME
+local MATCH_DEC_DMG_NAME = BattleConst.MATCH_DEC_DMG_NAME
 local MATCH_DMG_DEC_NAME = BattleConst.MATCH_DMG_DEC_NAME
 local MATCH_WEAKNESS_NAME = BattleConst.MATCH_WEAKNESS_NAME
 local DEFAULT_FACTOR = BattleConst.DEFAULT_FACTOR
@@ -85,6 +86,7 @@ function BattleTeamEntity:addBaseAttr(unitAttr)
 end
 
 function BattleTeamEntity:addAttr(name, num, isPercent)
+	Logger.logHighlight(name)
 	local addNum = 0
 	if isPercent then
 		if self.attr[name] then
@@ -146,7 +148,11 @@ function BattleTeamEntity:getDmgAddition(matchType)
 end
 
 function BattleTeamEntity:getDmgDec(matchType)
-	return (self.attr.dec_dmg_all or 0) + (self.attr[MATCH_DMG_DEC_NAME[matchType]] or 0)
+	return (self.attr.dmg_dec_all or 0) + (self.attr[MATCH_DMG_DEC_NAME[matchType]] or 0)
+end
+
+function BattleTeamEntity:getDecDmg(matchType)
+	return (self.attr.dec_dmg_all or 0) + (self.attr[MATCH_DEC_DMG_NAME[matchType]] or 0)
 end
 
 function BattleTeamEntity:getWeakness(matchType)
@@ -165,6 +171,14 @@ function BattleTeamEntity:getCureAddition()
 	return self.attr.cure_addition or 0
 end
 
+function BattleTeamEntity:getCureDec()
+	return self.attr.cure_dec or 0
+end
+
+function BattleTeamEntity:getBeDmgToHeal()
+	return self.attr.be_dmg_to_heal or 0
+end
+
 function BattleTeamEntity:getNormalAttackAddCount()
 	return self.attr[ATTR_NAME.NORMAL_ATTACK_COUNT] or 0
 end

lua/app/userdata/battle/team/battle_unit_entity.lua

@@ -258,8 +258,12 @@ function BattleUnitEntity:getDmgAddition()
 	return self.team:getDmgAddition(self.unitData.matchType)
 end
 
-function BattleUnitEntity:getDmgDec(matchType)
+function BattleUnitEntity:getDmgDec()
-	return self.team:getDmgDec(matchType)
+	return self.team:getDmgDec(self.unitData.matchType)
+end
+
+function BattleUnitEntity:getDecDmg(matchType)
+	return self.team:getDecDmg(matchType)
 end
 
 function BattleUnitEntity:getWeakness(matchType)
@@ -278,6 +282,14 @@ function BattleUnitEntity:getCureAddition()
 	return self.team:getCureAddition()
 end
 
+function BattleUnitEntity:getCureDec()
+	return self.team:getCureDec()
+end
+
+function BattleUnitEntity:getBeDmgToHeal()
+	return self.team:getBeDmgToHeal()
+end
+
 function BattleUnitEntity:getNormalAttackAddCount()
 	return self.team:getNormalAttackAddCount()
 end