config

lua/app/config/buff.lua

@@ -276,7 +276,7 @@ local buff = {
 		["decr"]=1,
 		["formula"]=3,
 		["fx_get"]={
-			300027
+			47
 		}
 	},
 	[33]={

lua/app/config/const.lua

@@ -564,8 +564,8 @@ local const = {
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
  				["id_for_nothing"]="VQ==",
-				["num"]=5,
+				["num"]=10,
- 				["num_for_nothing"]="Uw=="
+ 				["num_for_nothing"]="Vwg="
 			}
 		}
 	},

lua/app/config/func_open.lua

@@ -68,11 +68,11 @@ local func_open = {
 		["pop_ups"]=1
 	},
 	["arena_open"]={
-		["stage"]=5,
+		["stage"]=15,
 		["icon"]="module_unlock_arena"
 	},
 	["act_arena_gift"]={
-		["stage"]=5,
+		["stage"]=15,
 		["pop_ups"]=1
 	},
 	["equip_weapon_open"]={

lua/app/config/fx.lua

@@ -199,6 +199,10 @@ local fx = {
 		["loop"]=1,
 		["bind"]="root"
 	},
+	[47]={
+		["res"]="sfx_buff_huixue_b01",
+		["bind"]="root"
+	},
 	[100001]={
 		["res"]="sfx_c1_m10001_01",
 		["bind"]="root"
@@ -1047,6 +1051,6 @@ local fx = {
 	}
 }
 local config = {
-data=fx,count=242
+data=fx,count=243
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -688,6 +688,52 @@ local LocalizationGlobalConst =
 	DAILY_CHALLENGE_DESC_6 = "DAILY_CHALLENGE_DESC_6",
 	DAILY_CHALLENGE_DESC_7 = "DAILY_CHALLENGE_DESC_7",
 	DAILY_CHALLENGE_DESC_8 = "DAILY_CHALLENGE_DESC_8",
+	EQUIP_DESC_30 = "EQUIP_DESC_30",
+	EQUIP_PARTS_1 = "EQUIP_PARTS_1",
+	EQUIP_PARTS_2 = "EQUIP_PARTS_2",
+	EQUIP_PARTS_3 = "EQUIP_PARTS_3",
+	EQUIP_PARTS_4 = "EQUIP_PARTS_4",
+	EQUIP_PARTS_5 = "EQUIP_PARTS_5",
+	EQUIP_PARTS_6 = "EQUIP_PARTS_6",
+	EQUIP_HERO_DESC_1 = "EQUIP_HERO_DESC_1",
+	EQUIP_HERO_LV_1 = "EQUIP_HERO_LV_1",
+	EQUIP_HERO_LV_2 = "EQUIP_HERO_LV_2",
+	EQUIP_HERO_LV_3 = "EQUIP_HERO_LV_3",
+	EQUIP_HERO_DESC_2 = "EQUIP_HERO_DESC_2",
+	EQUIP_HERO_DESC_3 = "EQUIP_HERO_DESC_3",
+	EQUIP_HERO_DESC_4 = "EQUIP_HERO_DESC_4",
+	EQUIP_HERO_DESC_5 = "EQUIP_HERO_DESC_5",
+	EQUIP_HERO_DESC_6 = "EQUIP_HERO_DESC_6",
+	EQUIP_HERO_DESC_7 = "EQUIP_HERO_DESC_7",
+	EQUIP_HERO_DESC_8 = "EQUIP_HERO_DESC_8",
+	EQUIP_HERO_DESC_9 = "EQUIP_HERO_DESC_9",
+	EQUIP_HERO_DESC_10 = "EQUIP_HERO_DESC_10",
+	EQUIP_HERO_DESC_11 = "EQUIP_HERO_DESC_11",
+	EQUIP_HERO_DESC_12 = "EQUIP_HERO_DESC_12",
+	EQUIP_HERO_DESC_13 = "EQUIP_HERO_DESC_13",
+	EQUIP_HERO_DESC_14 = "EQUIP_HERO_DESC_14",
+	EQUIP_HERO_DESC_15 = "EQUIP_HERO_DESC_15",
+	EQUIP_HERO_DESC_16 = "EQUIP_HERO_DESC_16",
+	EQUIP_HERO_DESC_17 = "EQUIP_HERO_DESC_17",
+	EQUIP_HERO_DESC_18 = "EQUIP_HERO_DESC_18",
+	EQUIP_HERO_DESC_19 = "EQUIP_HERO_DESC_19",
+	EQUIP_HERO_DESC_20 = "EQUIP_HERO_DESC_20",
+	EQUIP_HERO_DESC_21 = "EQUIP_HERO_DESC_21",
+	EQUIP_HERO_DESC_22 = "EQUIP_HERO_DESC_22",
+	EQUIP_HERO_DESC_23 = "EQUIP_HERO_DESC_23",
+	EQUIP_HERO_DESC_24 = "EQUIP_HERO_DESC_24",
+	EQUIP_HERO_DESC_25 = "EQUIP_HERO_DESC_25",
+	EQUIP_HERO_DESC_26 = "EQUIP_HERO_DESC_26",
+	EQUIP_HERO_DESC_27 = "EQUIP_HERO_DESC_27",
+	EQUIP_HERO_DESC_28 = "EQUIP_HERO_DESC_28",
+	EQUIP_HERO_DESC_29 = "EQUIP_HERO_DESC_29",
+	EQUIP_HERO_DESC_30 = "EQUIP_HERO_DESC_30",
+	EQUIP_HERO_DESC_31 = "EQUIP_HERO_DESC_31",
+	EQUIP_HERO_DESC_32 = "EQUIP_HERO_DESC_32",
+	EQUIP_HERO_DESC_33 = "EQUIP_HERO_DESC_33",
+	EQUIP_HERO_DESC_34 = "EQUIP_HERO_DESC_34",
+	EQUIP_HERO_ACTIVATION_1 = "EQUIP_HERO_ACTIVATION_1",
+	EQUIP_HERO_ACTIVATION_2 = "EQUIP_HERO_ACTIVATION_2",
 }
 
 return LocalizationGlobalConst

lua/app/config/skill.lua

@@ -2076,8 +2076,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300018,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400018
 	},
 	[2400111]={
 		["position"]=2,
@@ -2105,8 +2104,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300019,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400019
 	},
 	[2400112]={
 		["position"]=2,
@@ -2134,8 +2132,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300020,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400020
 	},
 	[2400113]={
 		["position"]=2,
@@ -2163,8 +2160,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300021,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400021
 	},
 	[2400120]={
 		["energy"]=10,
@@ -2199,13 +2195,12 @@ local skill = {
 		["name_hit"]={
 			"suffer03"
 		},
-		["fx_self"]=300022,
 		["bullet_time"]={
 			693,
 			3000,
 			400
 		},
-		["fx_self_mirror"]=400022
+		["fx_self_mirror"]=100000
 	},
 	[2400121]={
 		["position"]=2,
@@ -3080,8 +3075,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300018,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400018
 	},
 	[2600111]={
 		["position"]=2,
@@ -3109,8 +3103,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300019,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400019
 	},
 	[2600112]={
 		["position"]=2,
@@ -3138,8 +3131,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300020,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400020
 	},
 	[2600113]={
 		["position"]=2,
@@ -3167,8 +3159,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300021,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400021
 	},
 	[2600120]={
 		["energy"]=10,
@@ -3216,13 +3207,12 @@ local skill = {
 			"suffer02",
 			"suffer03"
 		},
-		["fx_self"]=300022,
 		["bullet_time"]={
 			3102,
 			3000,
 			400
 		},
-		["fx_self_mirror"]=400022
+		["fx_self_mirror"]=100000
 	},
 	[2600121]={
 		["position"]=2,
@@ -3858,8 +3848,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300018,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400018
 	},
 	[3500111]={
 		["position"]=3,
@@ -3887,8 +3876,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300019,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400019
 	},
 	[3500112]={
 		["position"]=3,
@@ -3916,8 +3904,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300020,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400020
 	},
 	[3500113]={
 		["position"]=3,
@@ -3945,8 +3932,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300021,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400021
 	},
 	[3500120]={
 		["energy"]=10,
@@ -4008,13 +3994,12 @@ local skill = {
 			"suffer03",
 			"suffer03"
 		},
-		["fx_self"]=300022,
 		["bullet_time"]={
 			1485,
 			3000,
 			300
 		},
-		["fx_self_mirror"]=400022
+		["fx_self_mirror"]=100000
 	},
 	[3500121]={
 		["position"]=3,
@@ -4810,8 +4795,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300018,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400018
 	},
 	[4400111]={
 		["position"]=4,
@@ -4839,8 +4823,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300019,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400019
 	},
 	[4400112]={
 		["position"]=4,
@@ -4868,8 +4851,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300020,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400020
 	},
 	[4400113]={
 		["position"]=4,
@@ -4897,8 +4879,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300021,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400021
 	},
 	[4400120]={
 		["energy"]=10,
@@ -4933,13 +4914,12 @@ local skill = {
 		["name_hit"]={
 			"suffer03"
 		},
-		["fx_self"]=300022,
 		["bullet_time"]={
 			1000,
 			3000,
 			400
 		},
-		["fx_self_mirror"]=400022
+		["fx_self_mirror"]=100000
 	},
 	[4400121]={
 		["position"]=4,
@@ -5133,9 +5113,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300001,
+		["fx_self_mirror"]=100000
-		["fx_target"]=300006,
-		["fx_self_mirror"]=400001
 	},
 	[4500111]={
 		["position"]=4,
@@ -5163,9 +5141,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300002,
+		["fx_self_mirror"]=100000
-		["fx_target"]=300006,
-		["fx_self_mirror"]=400002
 	},
 	[4500112]={
 		["position"]=4,
@@ -5193,9 +5169,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300003,
+		["fx_self_mirror"]=100000
-		["fx_target"]=300006,
-		["fx_self_mirror"]=400003
 	},
 	[4500113]={
 		["position"]=4,
@@ -5223,9 +5197,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300004,
+		["fx_self_mirror"]=100000
-		["fx_target"]=300006,
-		["fx_self_mirror"]=400004
 	},
 	[4500120]={
 		["buff_id"]={
@@ -5269,14 +5241,12 @@ local skill = {
 		["name_hit"]={
 			"suffer03"
 		},
-		["fx_self"]=300005,
-		["fx_target"]=300006,
 		["bullet_time"]={
 			2211,
 			3000,
 			400
 		},
-		["fx_self_mirror"]=400005
+		["fx_self_mirror"]=100000
 	},
 	[4500121]={
 		["position"]=4,
@@ -6559,8 +6529,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300018,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400018
 	},
 	[5500211]={
 		["position"]=5,
@@ -6588,8 +6557,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300019,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400019
 	},
 	[5500212]={
 		["position"]=5,
@@ -6617,8 +6585,7 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self"]=300020,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400020
 	},
 	[5500213]={
 		["position"]=5,
@@ -6646,8 +6613,7 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self"]=300021,
+		["fx_self_mirror"]=100000
-		["fx_self_mirror"]=400021
 	},
 	[5500220]={
 		["energy"]=10,
@@ -6713,13 +6679,12 @@ local skill = {
 		["name_hit"]={
 			"suffer03"
 		},
-		["fx_self"]=300022,
 		["bullet_time"]={
 			2244,
 			3000,
 			400
 		},
-		["fx_self_mirror"]=400022
+		["fx_self_mirror"]=100000
 	},
 	[5500221]={
 		["position"]=5,
@@ -8600,6 +8565,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -8622,6 +8589,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -8644,6 +8613,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -8713,6 +8684,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -8735,6 +8708,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -8757,6 +8732,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -8811,6 +8788,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -8833,6 +8812,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -8855,6 +8836,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -8933,6 +8916,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -8955,6 +8940,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -8977,6 +8964,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9043,6 +9032,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9065,6 +9056,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9087,6 +9080,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9165,6 +9160,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9186,6 +9183,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9207,6 +9206,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9264,6 +9265,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9285,6 +9288,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9306,6 +9311,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9382,6 +9389,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9403,6 +9412,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9424,6 +9435,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9500,6 +9513,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9522,6 +9537,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9544,6 +9561,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9644,6 +9663,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9666,6 +9687,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9688,6 +9711,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9803,6 +9828,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9824,6 +9851,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9845,6 +9874,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9906,6 +9937,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -9927,6 +9960,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -9948,6 +9983,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -9977,6 +10014,8 @@ local skill = {
 		},
 		["cd"]=3,
 		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=5,
 		["sound"]=30185,
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
@@ -10037,6 +10076,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -10058,6 +10099,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -10079,6 +10122,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -10156,6 +10201,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -10177,6 +10224,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -10198,6 +10247,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -10263,6 +10314,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -10284,6 +10337,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -10305,6 +10360,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -10402,6 +10459,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -10423,6 +10482,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -10444,6 +10505,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -10555,6 +10618,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -10576,6 +10641,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -10597,6 +10664,8 @@ local skill = {
 			2,
 			0
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"
@@ -10684,6 +10753,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack01",
 		["name_hit"]={
 			"suffer01"
@@ -10705,6 +10776,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack02",
 		["name_hit"]={
 			"suffer02"
@@ -10726,6 +10799,8 @@ local skill = {
 			1,
 			140
 		},
+		["shake_time"]=100,
+		["shake_type"]=1,
 		["name_act"]="attack03",
 		["name_hit"]={
 			"suffer01"

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

@@ -682,12 +682,58 @@ local localization_global =
     ["HERO_DESC_23"] = "技能等级:{0}",
     ["BAG_DESC_1"] = "背包",
     ["DAILY_CHALLENGE_DESC_2"] = "提升难度",
-    ["DAILY_CHALLENGE_DESC_3"] = "通关主线{0}-{1}({2})",
+    ["DAILY_CHALLENGE_DESC_3"] = "通关主线{0}-{1}{2}",
     ["DAILY_CHALLENGE_DESC_4"] = "难度提升将提升未领取的任务奖励和通关奖励，是否确定？",
     ["DAILY_CHALLENGE_DESC_5"] = "降低难度后，未领取的任务奖励和通关奖励将降低，是否确定？",
     ["DAILY_CHALLENGE_DESC_6"] = "请先领取已达成的任务奖励",
     ["DAILY_CHALLENGE_DESC_7"] = "降低难度",
     ["DAILY_CHALLENGE_DESC_8"] = "已达成",
+    ["EQUIP_DESC_30"] = "穿戴",
+    ["EQUIP_PARTS_1"] = "头盔",
+    ["EQUIP_PARTS_2"] = "护臂",
+    ["EQUIP_PARTS_3"] = "胸甲",
+    ["EQUIP_PARTS_4"] = "裤子",
+    ["EQUIP_PARTS_5"] = "鞋子",
+    ["EQUIP_PARTS_6"] = "护手",
+    ["EQUIP_HERO_DESC_1"] = "没有多余装备",
+    ["EQUIP_HERO_LV_1"] = "强化共鸣{0}级",
+    ["EQUIP_HERO_LV_2"] = "品质共鸣{0}级",
+    ["EQUIP_HERO_LV_3"] = "精炼共鸣{0}级",
+    ["EQUIP_HERO_DESC_2"] = "一键穿戴",
+    ["EQUIP_HERO_DESC_3"] = "装备培养",
+    ["EQUIP_HERO_DESC_4"] = "装备共鸣",
+    ["EQUIP_HERO_DESC_5"] = "6件装备培养进度相同可激活装备共鸣",
+    ["EQUIP_HERO_DESC_6"] = "装备共鸣可提供额外属性",
+    ["EQUIP_HERO_DESC_7"] = "只有上阵英雄才可穿戴装备",
+    ["EQUIP_HERO_DESC_8"] = "装备详情",
+    ["EQUIP_HERO_DESC_9"] = "部位",
+    ["EQUIP_HERO_DESC_10"] = "评分",
+    ["EQUIP_HERO_DESC_11"] = "基础属性",
+    ["EQUIP_HERO_DESC_12"] = "附加属性",
+    ["EQUIP_HERO_DESC_13"] = "替换",
+    ["EQUIP_HERO_DESC_14"] = "养成",
+    ["EQUIP_HERO_DESC_15"] = "装备替换",
+    ["EQUIP_HERO_DESC_16"] = "交换",
+    ["EQUIP_HERO_DESC_17"] = "没有可穿戴的装备",
+    ["EQUIP_HERO_DESC_18"] = "装备养成",
+    ["EQUIP_HERO_DESC_19"] = "强化",
+    ["EQUIP_HERO_DESC_20"] = "精炼",
+    ["EQUIP_HERO_DESC_21"] = "取消全选",
+    ["EQUIP_HERO_DESC_22"] = "强化",
+    ["EQUIP_HERO_DESC_23"] = "一键强化",
+    ["EQUIP_HERO_DESC_24"] = "分解装备",
+    ["EQUIP_HERO_DESC_25"] = "成功率:{0}%(失败等级不变)",
+    ["EQUIP_HERO_DESC_26"] = "已精炼至满级",
+    ["EQUIP_HERO_DESC_27"] = "已强化至满级",
+    ["EQUIP_HERO_DESC_28"] = "分解可得",
+    ["EQUIP_HERO_DESC_29"] = "一键全选",
+    ["EQUIP_HERO_DESC_30"] = "分解",
+    ["EQUIP_HERO_DESC_31"] = "请先选择装备",
+    ["EQUIP_HERO_DESC_32"] = "没有可以强化的装备",
+    ["EQUIP_HERO_DESC_33"] = "共鸣激活",
+    ["EQUIP_HERO_DESC_34"] = "强化至<color=#00FF15>{0}</color>级可继续精炼",
+    ["EQUIP_HERO_ACTIVATION_1"] = "已激活:强化共鸣Lv{0}",
+    ["EQUIP_HERO_ACTIVATION_2"] = "已激活:精炼共鸣Lv{0}",
 }
 
 return localization_global

lua/app/config/task_daily.lua

@@ -2,7 +2,7 @@ local task_daily = {
 	[101]={
 		["task_type"]=22,
 		["number"]=1,
-		["value"]=20
+		["value"]=10
 	},
 	[102]={
 		["task_type"]=9,
@@ -12,35 +12,52 @@ local task_daily = {
 	[103]={
 		["task_type"]=15,
 		["number"]=10,
-		["value"]=20
+		["value"]=10
 	},
 	[104]={
-		["task_type"]=18,
-		["number"]=5,
-		["value"]=20
-	},
-	[105]={
 		["task_type"]=10,
 		["number"]=1,
 		["value"]=10
 	},
-	[106]={
+	[105]={
 		["task_type"]=26,
 		["number"]=60,
-		["value"]=20
+		["value"]=10
 	},
-	[107]={
+	[106]={
 		["task_type"]=12,
 		["number"]=5,
 		["value"]=10
 	},
-	[108]={
+	[107]={
 		["task_type"]=13,
 		["number"]=20,
 		["value"]=10
+	},
+	[108]={
+		["task_type"]=36,
+		["number"]=1,
+		["func_open"]="daily_challenge",
+		["value"]=10
+	},
+	[109]={
+		["task_type"]=30,
+		["number"]=2,
+		["func_open"]="arena_open",
+		["value"]=20
+	},
+	[110]={
+		["task_type"]=1,
+		["number"]=3,
+		["value"]=20
+	},
+	[111]={
+		["task_type"]=47,
+		["number"]=2,
+		["value"]=10
 	}
 }
 local config = {
-data=task_daily,count=8
+data=task_daily,count=11
 }
 return config

lua/app/config/task_daily_stage.lua

@@ -1,15 +1,54 @@
 local task_daily_stage = {
 	[101]={
-		["point"]=30,
+		["point"]=20,
 		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=18,
+ 				["id_for_nothing"]="VwA=",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			}
+		}
+	},
+	[102]={
+		["point"]=40,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[103]={
+		["point"]=60,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=5,
+ 				["id_for_nothing"]="Uw==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=600,
+				["num"]=500,
- 				["num_for_nothing"]="UAhc"
+ 				["num_for_nothing"]="Uwhc"
+			}
+		}
 	},
+	[104]={
+		["point"]=90,
+		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
@@ -17,69 +56,14 @@ local task_daily_stage = {
  				["id_for_nothing"]="VA==",
 				["num"]=20,
  				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	[102]={
-		["point"]=50,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=600,
- 				["num_for_nothing"]="UAhc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=5,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Uw==",
-				["num"]=21,
+				["num"]=2,
- 				["num_for_nothing"]="VAk="
+ 				["num_for_nothing"]="VA=="
-			}
-		}
-	},
-	[103]={
-		["point"]=80,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=600,
- 				["num_for_nothing"]="UAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=22,
- 				["num_for_nothing"]="VAo="
-			}
-		}
-	},
-	[104]={
-		["point"]=100,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=600,
- 				["num_for_nothing"]="UAhc"
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=23,
- 				["num_for_nothing"]="VAs="
 			}
 		}
 	},
@@ -89,18 +73,18 @@ local task_daily_stage = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=2,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="VA==",
-				["num"]=600,
+				["num"]=80,
- 				["num_for_nothing"]="UAhc"
+ 				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=42,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Ugo=",
-				["num"]=24,
+				["num"]=1,
- 				["num_for_nothing"]="VAw="
+ 				["num_for_nothing"]="Vw=="
 			}
 		}
 	}