更表

lua/app/config/activity.lua

@@ -43,9 +43,29 @@ local activity = {
 		["act_type"]=6,
 		["start_time"]="2023-10-31 00:00:00",
 		["end_time"]="2023-11-09 00:00:00"
+	},
+	[1006]={
+		["act_type"]=3,
+		["start_time"]="2023-11-8 00:00:00",
+		["end_time"]="2023-11-16 00:00:00"
+	},
+	[1106]={
+		["act_type"]=5,
+		["start_time"]="2023-11-15 00:00:00",
+		["end_time"]="2023-11-24 00:00:00"
+	},
+	[1206]={
+		["act_type"]=2,
+		["start_time"]="2023-11-23 00:00:00",
+		["end_time"]="2023-12-01 00:00:00"
+	},
+	[1306]={
+		["act_type"]=6,
+		["start_time"]="2023-11-30 00:00:00",
+		["end_time"]="2023-12-09 00:00:00"
 	}
 }
 local config = {
-data=activity,count=9
+data=activity,count=13
 }
 return config

lua/app/config/activity_boss_rush_rank.lua

@@ -523,9 +523,184 @@ local activity_boss_rush_rank = {
  				["num_for_nothing"]="VAg="
 			}
 		}
+	},
+	[301]={
+		["activity"]=1206,
+		["ranking"]={
+			1,
+			1
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		}
+	},
+	[302]={
+		["activity"]=1206,
+		["ranking"]={
+			2,
+			2
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=80,
+ 				["num_for_nothing"]="Xgg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[303]={
+		["activity"]=1206,
+		["ranking"]={
+			3,
+			3
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=70,
+ 				["num_for_nothing"]="UQg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[304]={
+		["activity"]=1206,
+		["ranking"]={
+			4,
+			10
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[305]={
+		["activity"]=1206,
+		["ranking"]={
+			11,
+			50
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=40,
+ 				["num_for_nothing"]="Ugg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[306]={
+		["activity"]=1206,
+		["ranking"]={
+			51,
+			500
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=30,
+ 				["num_for_nothing"]="VQg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[307]={
+		["activity"]=1206,
+		["ranking"]={
+			501,
+			99999999
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=52,
+ 				["id_for_nothing"]="Uwo=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
 	}
 }
 local config = {
-data=activity_boss_rush_rank,count=21
+data=activity_boss_rush_rank,count=28
 }
 return config

lua/app/config/activity_exchange.lua

@@ -538,9 +538,189 @@ local activity_exchange = {
  			["num_for_nothing"]="Uw=="
 		},
 		["limit"]=999
+	},
+	[401]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=34002,
+ 			["id_for_nothing"]="VQxcA2c=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=300,
+ 			["num_for_nothing"]="VQhc"
+		},
+		["limit"]=10
+	},
+	[402]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14001,
+ 			["id_for_nothing"]="VwxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		},
+		["limit"]=10
+	},
+	[403]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=24003,
+ 			["id_for_nothing"]="VAxcA2Y=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		},
+		["limit"]=10
+	},
+	[404]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=44001,
+ 			["id_for_nothing"]="UgxcA2Q=",
+			["num"]=3,
+ 			["num_for_nothing"]="VQ=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		},
+		["limit"]=10
+	},
+	[405]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=15,
+ 			["id_for_nothing"]="Vw0=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=240,
+ 			["num_for_nothing"]="VAxc"
+		},
+		["limit"]=3
+	},
+	[406]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=14,
+ 			["id_for_nothing"]="Vww=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		},
+		["limit"]=3
+	},
+	[407]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=15,
+ 			["num_for_nothing"]="Vw0="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["limit"]=10
+	},
+	[408]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=800,
+ 			["num_for_nothing"]="Xghc"
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["limit"]=999
+	},
+	[409]={
+		["activity"]=1206,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=13,
+ 			["id_for_nothing"]="Vws=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=52,
+ 			["id_for_nothing"]="Uwo=",
+			["num"]=5,
+ 			["num_for_nothing"]="Uw=="
+		},
+		["limit"]=999
 	}
 }
 local config = {
-data=activity_exchange,count=27
+data=activity_exchange,count=36
 }
 return config

lua/app/config/activity_rank.lua

@@ -598,9 +598,434 @@ local activity_rank = {
  				["num_for_nothing"]="VwhcA2U="
 			}
 		}
+	},
+	[501]={
+		["act_id"]=1006,
+		["ranking"]={
+			1,
+			1
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1200,
+ 				["num_for_nothing"]="VwpcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		}
+	},
+	[502]={
+		["act_id"]=1006,
+		["ranking"]={
+			2,
+			2
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[503]={
+		["act_id"]=1006,
+		["ranking"]={
+			3,
+			3
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=800,
+ 				["num_for_nothing"]="Xghc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[504]={
+		["act_id"]=1006,
+		["ranking"]={
+			4,
+			10
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[505]={
+		["act_id"]=1006,
+		["ranking"]={
+			11,
+			50
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=400,
+ 				["num_for_nothing"]="Ughc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
+			}
+		}
+	},
+	[506]={
+		["act_id"]=1006,
+		["ranking"]={
+			51,
+			500
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[507]={
+		["act_id"]=1006,
+		["ranking"]={
+			501,
+			99999999
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
+	},
+	[601]={
+		["act_id"]=1106,
+		["ranking"]={
+			1,
+			1
+		},
+		["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"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[602]={
+		["act_id"]=1106,
+		["ranking"]={
+			2,
+			2
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[603]={
+		["act_id"]=1106,
+		["ranking"]={
+			3,
+			3
+		},
+		["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"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[604]={
+		["act_id"]=1106,
+		["ranking"]={
+			4,
+			10
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[605]={
+		["act_id"]=1106,
+		["ranking"]={
+			11,
+			99999999
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=30,
+ 				["num_for_nothing"]="VQg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		}
+	},
+	[701]={
+		["act_id"]=1306,
+		["ranking"]={
+			1,
+			1
+		},
+		["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"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
+			}
+		}
+	},
+	[702]={
+		["act_id"]=1306,
+		["ranking"]={
+			2,
+			2
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		}
+	},
+	[703]={
+		["act_id"]=1306,
+		["ranking"]={
+			3,
+			3
+		},
+		["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"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
+			}
+		}
+	},
+	[704]={
+		["act_id"]=1306,
+		["ranking"]={
+			4,
+			10
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	[705]={
+		["act_id"]=1306,
+		["ranking"]={
+			11,
+			99999999
+		},
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=30,
+ 				["num_for_nothing"]="VQg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			}
+		}
 	}
 }
 local config = {
-data=activity_rank,count=24
+data=activity_rank,count=41
 }
 return config

lua/app/config/arena_time.lua

@@ -22,9 +22,15 @@ local arena_time = {
 		["start_time"]="2023-10-16 00:00:00",
 		["end_time"]="2023-11-15 00:00:00",
 		["ui_banner"]="ui_arena_bounty_banner_2"
+	},
+	[5]={
+		["season"]=5,
+		["start_time"]="2023-11-15 00:00:00",
+		["end_time"]="2023-12-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_3"
 	}
 }
 local config = {
-data=arena_time,count=4
+data=arena_time,count=5
 }
 return config

lua/app/config/avatar.lua

@@ -160,6 +160,10 @@ local avatar = {
 		["iconId"]="18_1",
 		["item"]=3400101
 	},
+	[3400102]={
+		["iconId"]="18_2",
+		["item"]=3400102
+	},
 	[5300101]={
 		["iconId"]="10_1",
 		["item"]=5300101
@@ -190,6 +194,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

lua/app/config/bounty_time.lua

@@ -18,9 +18,14 @@ local bounty_time = {
 		["season"]=4,
 		["start_time"]="2023-10-1 00:00:00",
 		["end_time"]="2023-11-1 00:00:00"
+	},
+	[5]={
+		["season"]=5,
+		["start_time"]="2023-11-1 00:00:00",
+		["end_time"]="2023-12-1 00:00:00"
 	}
 }
 local config = {
-data=bounty_time,count=4
+data=bounty_time,count=5
 }
 return config

lua/app/config/hero.lua

@@ -1121,7 +1121,8 @@ local hero = {
 		["collection_point"]=5,
 		["skin"]={
 			34001,
-			3400101
+			3400101,
+			3400102
 		}
 	},
 	[34002]={

lua/app/config/item.lua

@@ -2503,6 +2503,12 @@ local item = {
 		["qlt"]=4,
 		["icon"]="3400101"
 	},
+	[3400102]={
+		["type"]=12,
+		["parameter"]=3400102,
+		["qlt"]=3,
+		["icon"]="3400102"
+	},
 	[5300101]={
 		["type"]=12,
 		["parameter"]=5300101,
@@ -2547,6 +2553,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=132
+data=item,count=133
 }
 return config

lua/app/config/runes_suit.lua

@@ -214,7 +214,7 @@ local runes_suit = {
 				["num"]=800
 			},
 			{
-				["type"]="attr_all_hurtp_red",
+				["type"]="attr_crit_red",
 				["num"]=1500
 			}
 		},
@@ -224,7 +224,7 @@ local runes_suit = {
 				["num"]=800
 			},
 			{
-				["type"]="attr_all_hurtp_yellow",
+				["type"]="attr_crit_yellow",
 				["num"]=1500
 			}
 		},
@@ -234,7 +234,7 @@ local runes_suit = {
 				["num"]=800
 			},
 			{
-				["type"]="attr_all_hurtp_green",
+				["type"]="attr_crit_green",
 				["num"]=1500
 			}
 		},
@@ -244,7 +244,7 @@ local runes_suit = {
 				["num"]=800
 			},
 			{
-				["type"]="attr_all_hurtp_blue",
+				["type"]="attr_crit_blue",
 				["num"]=1500
 			}
 		},
@@ -254,7 +254,7 @@ local runes_suit = {
 				["num"]=800
 			},
 			{
-				["type"]="attr_all_hurtp_purple",
+				["type"]="attr_crit_purple",
 				["num"]=1500
 			}
 		}

lua/app/config/skin.lua

@@ -237,6 +237,32 @@ local skin = {
 			34001015
 		}
 	},
+	[3400102]={
+		["model_id"]="p0046",
+		["qlt"]=3,
+		["bonus"]={
+			{
+				["type"]="attr_skill_hurtp_green",
+				["num"]=1000
+			},
+			{
+				["type"]="attr_hpp_green",
+				["num"]=1000
+			}
+		},
+		["icon"]="18_2",
+		["got"]=1,
+		["skin_point"]=10,
+		["hero_id"]=34001,
+		["item_id"]=3400102,
+		["skill_show"]={
+			34002011,
+			34002012,
+			34002013,
+			34002014,
+			34002015
+		}
+	},
 	[34002]={
 		["model_id"]="p0024",
 		["qlt"]=1,
@@ -445,6 +471,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/skin_skill.lua

@@ -669,9 +669,85 @@ local skin_skill = {
 			400
 		},
 		["fx_self_mirror"]=400178
+	},
+	[34002011]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			340010111
+		},
+		["name_act"]="attack01",
+		["fx_self"]=300145,
+		["fx_self_mirror"]=400145
+	},
+	[34002012]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			340010112
+		},
+		["name_act"]="attack02",
+		["fx_self"]=300145,
+		["fx_self_mirror"]=400145
+	},
+	[34002013]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			340010113
+		},
+		["name_act"]="attack03",
+		["fx_self"]=300145,
+		["fx_self_mirror"]=400145
+	},
+	[34002014]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			340010113
+		},
+		["name_act"]="attack04",
+		["fx_self"]=300145,
+		["fx_self_mirror"]=400145
+	},
+	[34002015]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound"]=340010114,
+		["sound_delay"]=0.0,
+		["name_act"]="skill01",
+		["fx_self"]=300146,
+		["bullet_time"]={
+			2100,
+			3000,
+			400
+		},
+		["fx_bg"]=300149,
+		["fx_self_mirror"]=400146,
+		["fx_bg_mirror"]=400149
 	}
 }
 local config = {
-data=skin_skill,count=45
+data=skin_skill,count=50
 }
 return config

lua/app/config/strings/cn/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="激活木兰骄阳晨露皮肤获得。"
 	},
+	[3400102]={
+		["desc"]="暗精灵女王"
+	},
 	[5300101]={
 		["desc"]="激活魔女琪琪小红帽皮肤获得。"
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="骄阳晨露",
 		["desc"]="花木兰的新衣装。"
 	},
+	[3400102]={
+		["name"]="暗精灵女王",
+		["desc"]="暗精灵女王"
+	},
 	[5300101]={
 		["name"]="小红帽",
 		["desc"]="魔女琪琪的新衣装。"
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/cn/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="骄阳晨露"
 	},
+	[3400102]={
+		["value"]="暗精灵女王"
+	},
 	[34002]={
 		["value"]="初始"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/de/avatar.lua

@@ -115,6 +115,9 @@ local avatar = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[5300101]={
 
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -358,6 +358,9 @@ local item = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[5300101]={
 
@@ -376,6 +379,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/de/skin.lua

@@ -67,6 +67,9 @@ local skin = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[34002]={
 
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/en/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="Obtained after activating Radiant Morning Dew."
 	},
+	[3400102]={
+		["desc"]="Dark Elf Queen"
+	},
 	[5300101]={
 		["desc"]="Obtained after activating Little Red Riding Hood."
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="Radiant Morning Dew",
 		["desc"]="Mulan's new outfit."
 	},
+	[3400102]={
+		["name"]="Dark Elf Queen",
+		["desc"]="Dark Elf Queen"
+	},
 	[5300101]={
 		["name"]="Little Red Riding Hood",
 		["desc"]="Witch Kiki's new outfit."
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/en/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="Radiant Morning Dew"
 	},
+	[3400102]={
+		["value"]="Dark Elf Queen"
+	},
 	[34002]={
 		["value"]="Initial"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/es/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="Se obtiene tras activar Sol y Rocío."
 	},
+	[3400102]={
+		["desc"]="Reina de Elfo Oscuro"
+	},
 	[5300101]={
 		["desc"]="Se obtiene tras activar Caperucita Roja."
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

lua/app/config/strings/es/item.lua

@@ -479,6 +479,10 @@ local item = {
 		["name"]="Sol y Rocío",
 		["desc"]="Traje nuevo de Mulán."
 	},
+	[3400102]={
+		["name"]="Reina de Elfo Oscuro",
+		["desc"]="Reina de Elfo Oscuro"
+	},
 	[5300101]={
 		["name"]="Caperucita Roja",
 		["desc"]="Traje nuevo de Bruja Kiki."
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/es/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="Sol y Rocío"
 	},
+	[3400102]={
+		["value"]="Reina de Elfo Oscuro"
+	},
 	[34002]={
 		["value"]="Inicial"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/fr/avatar.lua

@@ -115,6 +115,9 @@ local avatar = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[5300101]={
 
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -358,6 +358,9 @@ local item = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[5300101]={
 
@@ -376,6 +379,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/fr/skin.lua

@@ -67,6 +67,9 @@ local skin = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[34002]={
 
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/id/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="Dapat setelah lolos Embun Matahari Pagi"
 	},
+	[3400102]={
+		["desc"]="Ratu Elf Gelap"
+	},
 	[5300101]={
 		["desc"]="Dapat setelah lolos Tudung Merah"
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="Embun Matahari Pagi",
 		["desc"]="Outfit baru Mulan."
 	},
+	[3400102]={
+		["name"]="Ratu Elf Gelap",
+		["desc"]="Ratu Elf Gelap"
+	},
 	[5300101]={
 		["name"]="Tudung Merah",
 		["desc"]="Outfit baru Penyihir Kiki."
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/id/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="Embun Matahari Pagi"
 	},
+	[3400102]={
+		["value"]="Ratu Elf Gelap"
+	},
 	[34002]={
 		["value"]="Awal"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/ja/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="輝く朝露をアクティブ化後獲得できる。"
 	},
+	[3400102]={
+		["desc"]="ダークエルフクイーン"
+	},
 	[5300101]={
 		["desc"]="赤ずきんをアクティブ化後獲得できる。"
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="輝く朝露",
 		["desc"]="ムーランの新スキン。"
 	},
+	[3400102]={
+		["name"]="ダークエルフクイーン",
+		["desc"]="ダークエルフクイーン"
+	},
 	[5300101]={
 		["name"]="赤ずきん",
 		["desc"]="魔女キキの新スキン。"
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/ja/skin.lua

@@ -66,7 +66,10 @@ local skin = {
 		["value"]="デフォルト"
 	},
 	[3400101]={
-		["value"]="輝く朝露"
+		["value"]="輝く朝ダークエルフクイーン露"
+	},
+	[3400102]={
+		["value"]="ダークエルフクイーン"
 	},
 	[34002]={
 		["value"]="デフォルト"
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/ko/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="반짝이는 아침 이슬(를) 활성화한 후, 획득할 수 있습니다."
 	},
+	[3400102]={
+		["desc"]="다크 엘프 퀸"
+	},
 	[5300101]={
 		["desc"]="빨간 망토(를) 활성화한 후, 획득할 수 있습니다."
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="반짝이는 아침 이슬",
 		["desc"]="뮬란의 새 옷"
 	},
+	[3400102]={
+		["name"]="다크 엘프 퀸",
+		["desc"]="다크 엘프 퀸"
+	},
 	[5300101]={
 		["name"]="빨간 망토",
 		["desc"]="마녀 키키의 새 옷"
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/ko/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="반짝이는 아침 이슬"
 	},
+	[3400102]={
+		["value"]="다크 엘프 퀸"
+	},
 	[34002]={
 		["value"]="초기"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/pt/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="Ativar Sol e Orvalho para obter."
 	},
+	[3400102]={
+		["desc"]="Rainha dos Elfos Noturnos"
+	},
 	[5300101]={
 		["desc"]="Ativar Chapeuzinho Vermelho para obter."
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="Sol e Orvalho",
 		["desc"]="A nova roupa de Mulan."
 	},
+	[3400102]={
+		["name"]="Rainha dos Elfos Noturnos",
+		["desc"]="Rainha dos Elfos Noturnos"
+	},
 	[5300101]={
 		["name"]="Chapeuzinho Vermelho",
 		["desc"]="A nova roupa da Feiticeira Kiki."
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/pt/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="Sol e Orvalho"
 	},
+	[3400102]={
+		["value"]="Rainha dos Elfos Noturnos"
+	},
 	[34002]={
 		["value"]="Inicial"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/ru/avatar.lua

@@ -115,6 +115,9 @@ local avatar = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[5300101]={
 
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -358,6 +358,9 @@ local item = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[5300101]={
 
@@ -376,6 +379,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/ru/skin.lua

@@ -67,6 +67,9 @@ local skin = {
 	},
 	[3400101]={
 
+	},
+	[3400102]={
+
 	},
 	[34002]={
 
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/th/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="หลังจากการเปิดใช้งานน้ำค้างรุ่งสางจะได้รับ"
 	},
+	[3400102]={
+		["desc"]="ราชินีเอลฟ์มืด"
+	},
 	[5300101]={
 		["desc"]="หลังจากการเปิดใช้งานหนูน้อยหมวกแดงจะได้รับ"
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="น้ำค้างรุ่งสาง",
 		["desc"]="ชุดใหม่ของมู่หลาน"
 	},
+	[3400102]={
+		["name"]="ราชินีเอลฟ์มืด",
+		["desc"]="ราชินีเอลฟ์มืด"
+	},
 	[5300101]={
 		["name"]="หนูน้อยหมวกแดง",
 		["desc"]="ชุดใหม่ของแม่มดกีกี้"
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/th/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="น้ำค้างรุ่งสาง"
 	},
+	[3400102]={
+		["value"]="ราชินีเอลฟ์มืด"
+	},
 	[34002]={
 		["value"]="เริ่มต้น"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/vi/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="Kích hoạt Ánh Nắng Sương Sớm nhận được."
 	},
+	[3400102]={
+		["desc"]="Nữ Hoàng Dark Elf"
+	},
 	[5300101]={
 		["desc"]="Kích hoạt Cô bé quàng khăn đỏ nhận được."
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="Ánh Nắng Sương Sớm",
 		["desc"]="Quần áo mới của Mộc Lan."
 	},
+	[3400102]={
+		["name"]="Nữ Hoàng Dark Elf",
+		["desc"]="Nữ Hoàng Dark Elf"
+	},
 	[5300101]={
 		["name"]="Cô bé quàng khăn đỏ",
 		["desc"]="Quần áo mới của Phù Thủy Kiki."
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/vi/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="Ánh Nắng Sương Sớm"
 	},
+	[3400102]={
+		["value"]="Nữ Hoàng Dark Elf"
+	},
 	[34002]={
 		["value"]="Ban Đầu"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config

lua/app/config/strings/zh/avatar.lua

@@ -116,6 +116,9 @@ local avatar = {
 	[3400101]={
 		["desc"]="啟動木蘭驕陽晨露皮膚後獲得。"
 	},
+	[3400102]={
+		["desc"]="暗精靈女王"
+	},
 	[5300101]={
 		["desc"]="啟動魔女琪琪小紅帽皮膚後獲得。"
 	},
@@ -139,6 +142,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=46
+data=avatar,count=47
 }
 return config

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

@@ -479,6 +479,10 @@ local item = {
 		["name"]="驕陽晨露",
 		["desc"]="花木蘭的新服裝。"
 	},
+	[3400102]={
+		["name"]="暗精靈女王",
+		["desc"]="暗精靈女王"
+	},
 	[5300101]={
 		["name"]="小紅帽",
 		["desc"]="魔女琪琪的新服裝。"
@@ -501,6 +505,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=125
+data=item,count=126
 }
 return config

lua/app/config/strings/zh/skin.lua

@@ -68,6 +68,9 @@ local skin = {
 	[3400101]={
 		["value"]="驕陽晨露"
 	},
+	[3400102]={
+		["value"]="暗精靈女王"
+	},
 	[34002]={
 		["value"]="初始"
 	},
@@ -133,6 +136,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=44
+data=skin,count=45
 }
 return config