自动铸造开启等级

lua/app/config/chapter_board_rune.lua

@@ -544,11 +544,11 @@ local chapter_board_rune = {
 				3
 			},
 			{
-				0,
+				2,
 				0
 			},
 			{
-				0,
+				2,
 				0
 			},
 			{
@@ -1703,7 +1703,7 @@ local chapter_board_rune = {
 				0
 			},
 			{
-				35,
+				24,
 				0
 			},
 			{
@@ -1787,7 +1787,7 @@ local chapter_board_rune = {
 				0
 			},
 			{
-				35,
+				24,
 				0
 			},
 			{

lua/app/config/chapter_dungeon_rune.lua

@@ -93,11 +93,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -213,7 +213,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -312,7 +312,7 @@ local chapter_dungeon_rune = {
 		["requirement"]={
 			{
 				2,
-				21,
+				24,
 				1
 			},
 			{
@@ -329,11 +329,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			},
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -449,7 +449,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -663,7 +663,7 @@ local chapter_dungeon_rune = {
 			},
 			{
 				2,
-				32,
+				31,
 				3
 			}
 		},
@@ -768,7 +768,7 @@ local chapter_dungeon_rune = {
 			},
 			{
 				2,
-				35,
+				24,
 				2
 			}
 		},
@@ -885,11 +885,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -1152,7 +1152,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -1268,7 +1268,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -1384,11 +1384,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -1504,11 +1504,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -1724,7 +1724,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -1824,7 +1824,7 @@ local chapter_dungeon_rune = {
 			{
 				3,
 				0,
-				5
+				8
 			},
 			{
 				2,
@@ -1945,11 +1945,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			},
 			{
 				1,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -2317,7 +2317,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -2428,7 +2428,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -2544,11 +2544,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			},
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -2769,7 +2769,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -2885,11 +2885,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3005,11 +3005,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3272,7 +3272,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3388,7 +3388,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3499,7 +3499,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3615,7 +3615,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3731,7 +3731,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3847,7 +3847,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -3958,7 +3958,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -4074,11 +4074,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -4441,7 +4441,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -4557,7 +4557,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -4673,7 +4673,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -4889,7 +4889,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -5110,7 +5110,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -5583,7 +5583,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -5914,7 +5914,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -6030,7 +6030,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -6146,7 +6146,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -6409,7 +6409,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -6520,7 +6520,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -6636,7 +6636,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -6752,7 +6752,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -6968,7 +6968,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -7079,7 +7079,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -7300,7 +7300,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -7458,11 +7458,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -7578,7 +7578,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -7689,7 +7689,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -8015,15 +8015,15 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			},
 			{
 				3,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -8244,7 +8244,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -8360,11 +8360,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -8627,11 +8627,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			},
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -8857,11 +8857,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			},
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -8977,7 +8977,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9093,7 +9093,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9209,7 +9209,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9325,7 +9325,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9441,11 +9441,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9603,7 +9603,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9719,11 +9719,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			},
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9839,7 +9839,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -9955,11 +9955,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			},
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -10075,7 +10075,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				1,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -10191,11 +10191,11 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				5,
-				200
+				300
 			},
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -10311,7 +10311,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				4,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -10427,7 +10427,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				2,
-				200
+				300
 			}
 		},
 		["first_reward"]={
@@ -10543,7 +10543,7 @@ local chapter_dungeon_rune = {
 		["weights"]={
 			{
 				3,
-				200
+				300
 			}
 		},
 		["first_reward"]={

lua/app/config/fx.lua

@@ -2007,6 +2007,62 @@ local fx = {
 		["res"]="sfx_p0036_b05",
 		["bind"]="root"
 	},
+	[300151]={
+		["res"]="sfx_p0037_b01",
+		["bind"]="root"
+	},
+	[300152]={
+		["res"]="sfx_p0037_b02",
+		["bind"]="root"
+	},
+	[300153]={
+		["res"]="sfx_p0037_b05",
+		["bind"]="root"
+	},
+	[300154]={
+		["res"]="sfx_p0038_b01",
+		["bind"]="root"
+	},
+	[300155]={
+		["res"]="sfx_p0038_b05",
+		["bind"]="root"
+	},
+	[300156]={
+		["res"]="sfx_p0039_b01",
+		["bind"]="root"
+	},
+	[300157]={
+		["res"]="sfx_p0039_b05",
+		["bind"]="root"
+	},
+	[300158]={
+		["res"]="sfx_p0040_b01",
+		["bind"]="root"
+	},
+	[300159]={
+		["res"]="sfx_p0040_b05",
+		["bind"]="root"
+	},
+	[300160]={
+		["res"]="sfx_p0041_b01",
+		["bind"]="root"
+	},
+	[300161]={
+		["res"]="sfx_p0041_b02",
+		["bind"]="root"
+	},
+	[300162]={
+		["res"]="sfx_p0041_b03",
+		["bind"]="root"
+	},
+	[300163]={
+		["res"]="sfx_p0041_b04",
+		["bind"]="root"
+	},
+	[300164]={
+		["res"]="sfx_p0041_b05",
+		["bind"]="root"
+	},
 	[400000]={
 		["res"]="sfx_p0012_b01",
 		["bind"]="root",
@@ -2763,9 +2819,79 @@ local fx = {
 		["res"]="sfx_p0036_b05",
 		["bind"]="root",
 		["flip"]=1
+	},
+	[400151]={
+		["res"]="sfx_p0037_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400152]={
+		["res"]="sfx_p0037_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400153]={
+		["res"]="sfx_p0037_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400154]={
+		["res"]="sfx_p0038_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400155]={
+		["res"]="sfx_p0038_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400156]={
+		["res"]="sfx_p0039_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400157]={
+		["res"]="sfx_p0039_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400158]={
+		["res"]="sfx_p0040_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400159]={
+		["res"]="sfx_p0040_b05",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400160]={
+		["res"]="sfx_p0041_b01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400161]={
+		["res"]="sfx_p0041_b02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400162]={
+		["res"]="sfx_p0041_b03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400163]={
+		["res"]="sfx_p0041_b04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400164]={
+		["res"]="sfx_p0041_b05",
+		["bind"]="root",
+		["flip"]=1
 	}
 }
 local config = {
-data=fx,count=649
+data=fx,count=677
 }
 return config

lua/app/config/hero.lua

@@ -427,9 +427,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0028",
+		["model_id"]="p0037",
 		["icon"]="31",
-		["item_id"]=14003,
+		["item_id"]=14004,
 		["collection_point"]=5,
 		["skin"]={
 			14004
@@ -620,7 +620,8 @@ local hero = {
 		["is_show"]=1,
 		["collection_point"]=3,
 		["skin"]={
-			23002
+			23002,
+			2300201
 		}
 	},
 	[24001]={
@@ -862,9 +863,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0031",
+		["model_id"]="p0039",
 		["icon"]="27",
-		["item_id"]=24003,
+		["item_id"]=24004,
 		["collection_point"]=5,
 		["skin"]={
 			24004
@@ -1299,9 +1300,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0027",
+		["model_id"]="p0040",
 		["icon"]="28",
-		["item_id"]=34003,
+		["item_id"]=34004,
 		["is_show"]=1,
 		["collection_point"]=5,
 		["skin"]={
@@ -1736,9 +1737,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0030",
+		["model_id"]="p0038",
 		["icon"]="29",
-		["item_id"]=44003,
+		["item_id"]=44004,
 		["collection_point"]=5,
 		["skin"]={
 			44004
@@ -2174,9 +2175,9 @@ local hero = {
 			31780000,
 			36060000
 		},
-		["model_id"]="p0029",
+		["model_id"]="p0041",
 		["icon"]="30",
-		["item_id"]=54003,
+		["item_id"]=54004,
 		["collection_point"]=5,
 		["skin"]={
 			54004

lua/app/config/item.lua

@@ -2440,9 +2440,15 @@ local item = {
 		["parameter"]=1400101,
 		["qlt"]=3,
 		["icon"]="1400101"
+	},
+	[2300201]={
+		["type"]=12,
+		["parameter"]=2300201,
+		["qlt"]=2,
+		["icon"]="2300201"
 	}
 }
 local config = {
-data=item,count=124
+data=item,count=125
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -526,6 +526,7 @@ local LocalizationGlobalConst =
 	DUNGEON_RUNE_TIP_3 = "DUNGEON_RUNE_TIP_3",
 	DUNGEON_RUNE_TIP_4 = "DUNGEON_RUNE_TIP_4",
 	DUNGEON_RUNE_TIP_5 = "DUNGEON_RUNE_TIP_5",
+	DUNGEON_RUNE_TIP_6 = "DUNGEON_RUNE_TIP_6",
 	UNFINISHED = "UNFINISHED",
 	RUNES_DESC_1 = "RUNES_DESC_1",
 	RUNES_DESC_2 = "RUNES_DESC_2",
@@ -553,6 +554,7 @@ local LocalizationGlobalConst =
 	RUNES_DESC_24 = "RUNES_DESC_24",
 	RUNES_DESC_25 = "RUNES_DESC_25",
 	RUNES_DESC_26 = "RUNES_DESC_26",
+	RUNES_DESC_27 = "RUNES_DESC_27",
 	DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1",
 	DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2",
 	DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3",

lua/app/config/skill.lua

@@ -1769,8 +1769,8 @@ local skill = {
 			53001202
 		},
 		["name_act"]="attack01",
-		["fx_self"]=300122,
+		["fx_self"]=300151,
-		["fx_self_mirror"]=400122
+		["fx_self_mirror"]=400152
 	},
 	[1400411]={
 		["position"]=1,
@@ -1795,8 +1795,8 @@ local skill = {
 			13001201
 		},
 		["name_act"]="attack02",
-		["fx_self"]=300123,
+		["fx_self"]=300152,
-		["fx_self_mirror"]=400123
+		["fx_self_mirror"]=400151
 	},
 	[1400412]={
 		["position"]=1,
@@ -1821,8 +1821,8 @@ local skill = {
 			5200113
 		},
 		["name_act"]="attack03",
-		["fx_self"]=300124,
+		["fx_self"]=300152,
-		["fx_self_mirror"]=400124
+		["fx_self_mirror"]=400151
 	},
 	[1400413]={
 		["position"]=1,
@@ -1847,8 +1847,8 @@ local skill = {
 			5200112
 		},
 		["name_act"]="attack04",
-		["fx_self"]=300125,
+		["fx_self"]=300152,
-		["fx_self_mirror"]=400125
+		["fx_self_mirror"]=400152
 	},
 	[1400420]={
 		["energy"]=10,
@@ -1880,36 +1880,12 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_red",
-				["num"]=10000,
+				["num"]=50000,
 				["ratio"]=11000,
 				["round"]=0
-			},
-			{
-				["type"]="hurt_red",
-				["num"]=12000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_red",
-				["num"]=15000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_red",
-				["num"]=22000,
-				["ratio"]=10000,
-				["round"]=0
 			}
 		},
 		["obj"]=2,
-		["effect_block"]={
-			1,
-			2,
-			3,
-			5
-		},
 		["skill_position"]={
 			1,
 			70
@@ -1919,13 +1895,8 @@ local skill = {
 		["sound"]=14003201,
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
-		["fx_self"]=300126,
+		["fx_self"]=300153,
-		["bullet_time"]={
+		["fx_self_mirror"]=400153
-			2600,
-			3000,
-			400
-		},
-		["fx_self_mirror"]=400126
 	},
 	[1400421]={
 		["position"]=1,
@@ -2070,13 +2041,8 @@ local skill = {
 		["sound"]=14003201,
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
-		["fx_self"]=300126,
+		["fx_self"]=300153,
-		["bullet_time"]={
+		["fx_self_mirror"]=400153
-			2600,
-			3000,
-			400
-		},
-		["fx_self_mirror"]=400126
 	},
 	[2200110]={
 		["position"]=2,
@@ -3718,8 +3684,8 @@ local skill = {
 			1000001
 		},
 		["name_act"]="attack01",
-		["fx_self"]=300135,
+		["fx_self"]=300156,
-		["fx_self_mirror"]=400135
+		["fx_self_mirror"]=400156
 	},
 	[2400411]={
 		["position"]=2,
@@ -3744,8 +3710,8 @@ local skill = {
 			1000002
 		},
 		["name_act"]="attack02",
-		["fx_self"]=300136,
+		["fx_self"]=300156,
-		["fx_self_mirror"]=400136
+		["fx_self_mirror"]=400156
 	},
 	[2400412]={
 		["position"]=2,
@@ -3770,8 +3736,8 @@ local skill = {
 			1000004
 		},
 		["name_act"]="attack03",
-		["fx_self"]=300137,
+		["fx_self"]=300156,
-		["fx_self_mirror"]=400137
+		["fx_self_mirror"]=400156
 	},
 	[2400413]={
 		["position"]=2,
@@ -3796,8 +3762,8 @@ local skill = {
 			1000021
 		},
 		["name_act"]="attack04",
-		["fx_self"]=300138,
+		["fx_self"]=300156,
-		["fx_self_mirror"]=400138
+		["fx_self_mirror"]=400156
 	},
 	[2400420]={
 		["energy"]=10,
@@ -3814,13 +3780,31 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=20000,
+				["num"]=10000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
 				["type"]="hurt_yellow",
-				["num"]=21600,
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_yellow",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_yellow",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="hurt_yellow",
+				["num"]=11600,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -3837,7 +3821,10 @@ local skill = {
 		["eliminate_obj"]=1,
 		["effect_block"]={
 			1,
-			3
+			2,
+			3,
+			4,
+			5
 		},
 		["skill_position"]={
 			2,
@@ -3848,13 +3835,8 @@ local skill = {
 		["sound"]=2400311,
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
-		["fx_self"]=300139,
+		["fx_self"]=300157,
-		["bullet_time"]={
+		["fx_self_mirror"]=400157
-			2400,
-			3000,
-			400
-		},
-		["fx_self_mirror"]=400139
 	},
 	[2400421]={
 		["position"]=2,
@@ -5649,8 +5631,8 @@ local skill = {
 			2200111
 		},
 		["name_act"]="attack01",
-		["fx_self"]=300117,
+		["fx_self"]=300158,
-		["fx_self_mirror"]=400117
+		["fx_self_mirror"]=400158
 	},
 	[3400411]={
 		["position"]=3,
@@ -5675,8 +5657,8 @@ local skill = {
 			2200114
 		},
 		["name_act"]="attack02",
-		["fx_self"]=300118,
+		["fx_self"]=300158,
-		["fx_self_mirror"]=400118
+		["fx_self_mirror"]=400158
 	},
 	[3400412]={
 		["position"]=3,
@@ -5701,8 +5683,8 @@ local skill = {
 			3400311
 		},
 		["name_act"]="attack03",
-		["fx_self"]=300119,
+		["fx_self"]=300158,
-		["fx_self_mirror"]=400119
+		["fx_self_mirror"]=400158
 	},
 	[3400413]={
 		["position"]=3,
@@ -5727,8 +5709,8 @@ local skill = {
 			2200112
 		},
 		["name_act"]="attack04",
-		["fx_self"]=300120,
+		["fx_self"]=300158,
-		["fx_self_mirror"]=400120
+		["fx_self_mirror"]=400158
 	},
 	[3400420]={
 		["energy"]=10,
@@ -5743,12 +5725,6 @@ local skill = {
 		["effect_type"]=1,
 		["trigger"]=1,
 		["effect"]={
-			{
-				["type"]="hurt_green",
-				["num"]=10000,
-				["ratio"]=10000,
-				["round"]=0
-			},
 			{
 				["type"]="hurt_green",
 				["num"]=15000,
@@ -5757,7 +5733,7 @@ local skill = {
 			},
 			{
 				["type"]="hurt_green",
-				["num"]=16600,
+				["num"]=26600,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -5765,8 +5741,7 @@ local skill = {
 		["obj"]=2,
 		["effect_block"]={
 			1,
-			2,
+			2
-			3
 		},
 		["skill_position"]={
 			1,
@@ -5777,13 +5752,8 @@ local skill = {
 		["sound"]=3400321,
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
-		["fx_self"]=300121,
+		["fx_self"]=300159,
-		["bullet_time"]={
+		["fx_self_mirror"]=400159
-			1900,
-			3000,
-			400
-		},
-		["fx_self_mirror"]=400121
 	},
 	[3400421]={
 		["position"]=3,
@@ -7386,8 +7356,8 @@ local skill = {
 			54001203
 		},
 		["name_act"]="attack01",
-		["fx_self"]=300132,
+		["fx_self"]=300154,
-		["fx_self_mirror"]=400132
+		["fx_self_mirror"]=400154
 	},
 	[4400411]={
 		["position"]=4,
@@ -7412,8 +7382,8 @@ local skill = {
 			13001202
 		},
 		["name_act"]="attack02",
-		["fx_self"]=300133,
+		["fx_self"]=300154,
-		["fx_self_mirror"]=400133
+		["fx_self_mirror"]=400154
 	},
 	[4400412]={
 		["position"]=4,
@@ -7438,8 +7408,8 @@ local skill = {
 			3300114
 		},
 		["name_act"]="attack03",
-		["fx_self"]=300133,
+		["fx_self"]=300154,
-		["fx_self_mirror"]=400133
+		["fx_self_mirror"]=400154
 	},
 	[4400413]={
 		["position"]=4,
@@ -7464,8 +7434,8 @@ local skill = {
 			4400311
 		},
 		["name_act"]="attack04",
-		["fx_self"]=300133,
+		["fx_self"]=300154,
-		["fx_self_mirror"]=400133
+		["fx_self_mirror"]=400154
 	},
 	[4400420]={
 		["energy"]=10,
@@ -7488,19 +7458,13 @@ local skill = {
 			},
 			{
 				["type"]="hurt_blue",
-				["num"]=10000,
+				["num"]=15000,
 				["ratio"]=10000,
 				["round"]=0
 			},
 			{
 				["type"]="hurt_blue",
-				["num"]=10000,
+				["num"]=15000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_blue",
-				["num"]=20000,
 				["ratio"]=10000,
 				["round"]=0
 			},
@@ -7515,8 +7479,7 @@ local skill = {
 		["effect_block"]={
 			1,
 			2,
-			3,
+			4
-			5
 		},
 		["skill_position"]={
 			2,
@@ -7527,13 +7490,8 @@ local skill = {
 		["sound"]=4400314,
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
-		["fx_self"]=300134,
+		["fx_self"]=300155,
-		["bullet_time"]={
+		["fx_self_mirror"]=400155
-			2100,
-			3000,
-			400
-		},
-		["fx_self_mirror"]=400134
 	},
 	[4400421]={
 		["position"]=4,
@@ -9169,8 +9127,8 @@ local skill = {
 			5400311
 		},
 		["name_act"]="attack01",
-		["fx_self"]=300127,
+		["fx_self"]=300160,
-		["fx_self_mirror"]=400127
+		["fx_self_mirror"]=400160
 	},
 	[5400411]={
 		["position"]=5,
@@ -9195,8 +9153,8 @@ local skill = {
 			5400312
 		},
 		["name_act"]="attack02",
-		["fx_self"]=300128,
+		["fx_self"]=300161,
-		["fx_self_mirror"]=400128
+		["fx_self_mirror"]=400161
 	},
 	[5400412]={
 		["position"]=5,
@@ -9221,8 +9179,8 @@ local skill = {
 			5400313
 		},
 		["name_act"]="attack03",
-		["fx_self"]=300129,
+		["fx_self"]=300162,
-		["fx_self_mirror"]=400129
+		["fx_self_mirror"]=400162
 	},
 	[5400413]={
 		["position"]=5,
@@ -9247,8 +9205,8 @@ local skill = {
 			5400314
 		},
 		["name_act"]="attack04",
-		["fx_self"]=300130,
+		["fx_self"]=300163,
-		["fx_self_mirror"]=400130
+		["fx_self_mirror"]=400163
 	},
 	[5400420]={
 		["energy"]=10,
@@ -9268,13 +9226,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_purple",
-				["num"]=25000,
+				["num"]=50000,
-				["ratio"]=10000,
-				["round"]=0
-			},
-			{
-				["type"]="hurt_purple",
-				["num"]=25000,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -9289,13 +9241,8 @@ local skill = {
 		["sound"]=5400315,
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
-		["fx_self"]=300131,
+		["fx_self"]=300164,
-		["bullet_time"]={
+		["fx_self_mirror"]=400164
-			1366,
-			3000,
-			400
-		},
-		["fx_self_mirror"]=400131
 	},
 	[5400421]={
 		["position"]=5,

lua/app/config/skin.lua

@@ -88,7 +88,7 @@ local skin = {
 		["hero_id"]=14003
 	},
 	[14004]={
-		["model_id"]="p0028",
+		["model_id"]="p0037",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=14004
@@ -111,6 +111,32 @@ local skin = {
 		["skin_point"]=0,
 		["hero_id"]=23002
 	},
+	[2300201]={
+		["model_id"]="p0042",
+		["qlt"]=2,
+		["bonus"]={
+			{
+				["type"]="atk_yellow",
+				["num"]=300000
+			},
+			{
+				["type"]="attr_hp_yellow",
+				["num"]=1000000
+			}
+		},
+		["icon"]="7_1",
+		["got"]=1,
+		["skin_point"]=5,
+		["hero_id"]=23002,
+		["item_id"]=2300201,
+		["skill_show"]={
+			23002011,
+			23002012,
+			23002013,
+			23002014,
+			23002015
+		}
+	},
 	[24001]={
 		["model_id"]="p0007",
 		["qlt"]=1,
@@ -130,7 +156,7 @@ local skin = {
 		["hero_id"]=24003
 	},
 	[24004]={
-		["model_id"]="p0031",
+		["model_id"]="p0039",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=24004
@@ -198,7 +224,7 @@ local skin = {
 		["hero_id"]=34003
 	},
 	[34004]={
-		["model_id"]="p0027",
+		["model_id"]="p0040",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=34004
@@ -240,7 +266,7 @@ local skin = {
 		["hero_id"]=44003
 	},
 	[44004]={
-		["model_id"]="p0030",
+		["model_id"]="p0038",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=44004
@@ -334,13 +360,13 @@ local skin = {
 		["hero_id"]=54003
 	},
 	[54004]={
-		["model_id"]="p0029",
+		["model_id"]="p0041",
 		["qlt"]=1,
 		["skin_point"]=0,
 		["hero_id"]=54004
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/config/skin_skill.lua

@@ -376,9 +376,84 @@ local skin_skill = {
 			200
 		},
 		["fx_self_mirror"]=400150
+	},
+	[23002011]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000001
+		},
+		["name_act"]="attack01",
+		["fx_self"]=300050,
+		["fx_self_mirror"]=400000
+	},
+	[23002012]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=2,
+		["sound_hit"]={
+			1000002
+		},
+		["name_act"]="attack02",
+		["fx_self"]=300051,
+		["fx_self_mirror"]=400001
+	},
+	[23002013]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000003
+		},
+		["name_act"]="attack03",
+		["fx_self"]=300052,
+		["fx_self_mirror"]=400002
+	},
+	[23002014]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000004
+		},
+		["name_act"]="attack04",
+		["fx_self"]=300053,
+		["fx_self_mirror"]=400003
+	},
+	[23002015]={
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=200,
+		["shake_type"]=5,
+		["sound_hit"]={
+			2300220
+		},
+		["name_act"]="skill01",
+		["fx_self"]=300054,
+		["bullet_time"]={
+			800,
+			3000,
+			400
+		},
+		["fx_self_mirror"]=400004
 	}
 }
 local config = {
-data=skin_skill,count=25
+data=skin_skill,count=30
 }
 return config

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

@@ -523,9 +523,10 @@ local localization_global =
     ["DUNGEON_RUNE_QUEST_4"] = "击杀{0}个小怪",
     ["DUNGEON_RUNE_TIP_1"] = "塔中密室循环结算后，可在此领取奖励。",
     ["DUNGEON_RUNE_TIP_2"] = "还不能放弃……",
-    ["DUNGEON_RUNE_TIP_3"] = "观看广告即刻复活！",
+    ["DUNGEON_RUNE_TIP_3"] = "回合数用完，观看广告获得额外回合！",
     ["DUNGEON_RUNE_TIP_4"] = "血量回复至50%",
     ["DUNGEON_RUNE_TIP_5"] = "回合数+5！",
+    ["DUNGEON_RUNE_TIP_6"] = "生命值为0，观看广告即刻复活！",
     ["UNFINISHED"] = "未完成",
     ["RUNES_DESC_1"] = "符文铸台:{0}级",
     ["RUNES_DESC_2"] = "符文套装",
@@ -553,13 +554,14 @@ local localization_global =
     ["RUNES_DESC_24"] = "请先激活英雄",
     ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文",
     ["RUNES_DESC_26"] = "Lv{0}",
+    ["RUNES_DESC_27"] = "符文铸台{0}级后开启",
     ["DUNGEON_RUNE_DESC_1"] = "目标",
     ["DUNGEON_RUNE_DESC_2"] = "再次挑战",
     ["DUNGEON_RUNE_DESC_3"] = "通关获得",
     ["DUNGEON_RUNE_DESC_4"] = "扫荡获得",
     ["DUNGEON_RUNE_DESC_5"] = "通关后可扫荡",
     ["DUNGEON_RUNE_DESC_6"] = "战绩",
-    ["DUNGEON_RUNE_DESC_7"] = "狠心拒绝",
+    ["DUNGEON_RUNE_DESC_7"] = "放弃机会",
     ["DUNGEON_RUNE_DESC_8"] = "本赛季",
     ["DUNGEON_RUNE_DESC_9"] = "上赛季",
     ["DUNGEON_RUNE_DESC_10"] = "最高：{0}",

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

@@ -35,6 +35,9 @@ local skin = {
 	[23002]={
 		["value"]="初始"
 	},
+	[2300201]={
+		["value"]="Z丫"
+	},
 	[24001]={
 		["value"]="初始"
 	},
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 
+	},
+	[2300201]={
+
 	},
 	[24001]={
 
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Initial"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Initial"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Inicial"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Inicial"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 
+	},
+	[2300201]={
+
 	},
 	[24001]={
 
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Awal"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Awal"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="デフォルト"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="デフォルト"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="초기"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="초기"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Inicial"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Inicial"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 
+	},
+	[2300201]={
+
 	},
 	[24001]={
 
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="เริ่มต้น"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="เริ่มต้น"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="Ban Đầu"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="Ban Đầu"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

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

@@ -34,6 +34,9 @@ local skin = {
 	},
 	[23002]={
 		["value"]="初始"
+	},
+	[2300201]={
+
 	},
 	[24001]={
 		["value"]="初始"
@@ -121,6 +124,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=40
+data=skin,count=41
 }
 return config

lua/app/ui/hero/runes_info_comp.lua

@@ -31,7 +31,6 @@ function RunesInfoComp:init()
     end
 
     self.mask:setActive(false)
-    self.spineAuto:playAnim("idle", true, true)
     self.txSuit:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_2))
     self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_5))
     self.txAuto:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_4))
@@ -47,6 +46,10 @@ function RunesInfoComp:init()
         UIManager:showUI("app/ui/runes/runes_suit_ui", self.heroEntity)
     end)
     self.btnAuto:addClickListener(function()
+        if not DataManager.RunesData:canAutoMake() then
+            GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_27, DataManager.RunesData:getAutoMakeOpenLevel()))
+            return
+        end
         if self.autoSid == nil then
             local params ={
                 content = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_21),
@@ -89,6 +92,11 @@ function RunesInfoComp:refresh()
         -- self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX))
     end
 
+    if DataManager.RunesData:canAutoMake() then
+        self.spineAuto:playAnim("idle", true, true)
+    else
+        self.spineAuto:playAnim("idle2", true, true)
+    end
     self.txNum:setText(DataManager.RunesData:getMaterialCount())
     self.txCost:setText(GFunc.getRewardNum(self.runesEntity:getMaterialCost()))
     self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_1, DataManager.RunesData:getLevel()))

lua/app/userdata/runes/runes_data.lua

@@ -153,6 +153,17 @@ function RunesData:canAutoMake()
     return cfg.auto and cfg.auto == 1
 end
 
+-- 获取自动铸造的开启等级
+function RunesData:getAutoMakeOpenLevel()
+    for level, data in ipairs(self:getLevelConfig()) do
+        if data.auto and data.auto == 1 then
+            return level
+        end
+    end
+
+    return nil
+end
+
 -- 符文栏是否解锁
 function RunesData:isUnlock(index)
     local level = self:getLevel()