Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919

lua/app/common/event_manager.lua

@@ -53,6 +53,8 @@ EventManager.CUSTOM_EVENT = {
 	EQUIP_UPGRADE_SUCCESS = "EQUIP_UPGRADE_SUCCESS",
 	EQUIP_UPSECTION_SUCCESS = "EQUIP_UPSECTION_SUCCESS",
 	HERO_UPGRADE_SUCCESS = "HERO_UPGRADE_SUCCESS",
+	-- 符文
+	RUNE_QUENCHING_SUCCESS = "RUNE_QUENCHING_SUCCESS",
 	GO_DUNGEON_UI = "GO_DUNGEON_UI",
 	-- 皮肤
 	SKIN_SELECT = "SKIN_SELECT",

lua/app/config/activity_pvp_wingift.lua

@@ -5,18 +5,18 @@ local activity_pvp_wingift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=1500,
- 				["num_for_nothing"]="Vw1cAw=="
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=3000,
+ 				["num_for_nothing"]="VQhcAw=="
 			}
 		}
 	},
@@ -26,18 +26,18 @@ local activity_pvp_wingift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
 				["num"]=20,
  				["num_for_nothing"]="VAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=4000,
+ 				["num_for_nothing"]="UghcAw=="
 			}
 		}
 	},
@@ -47,18 +47,18 @@ local activity_pvp_wingift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=10,
- 				["id_for_nothing"]="Vwg=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=1500,
- 				["num_for_nothing"]="Vw1cAw=="
+				["num"]=5000,
+ 				["num_for_nothing"]="UwhcAw=="
 			}
 		}
 	},
@@ -68,18 +68,18 @@ local activity_pvp_wingift = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=11,
- 				["id_for_nothing"]="Vwk=",
+				["id"]=6,
+ 				["id_for_nothing"]="UA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=8000,
+ 				["num_for_nothing"]="XghcAw=="
 			}
 		}
 	}

lua/app/config/activity_rank.lua

@@ -9,10 +9,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=100,
- 				["num_for_nothing"]="Vwhc"
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1200,
+ 				["num_for_nothing"]="VwpcAw=="
 			},
 			{
 				["type"]=1,
@@ -34,10 +34,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=80,
- 				["num_for_nothing"]="Xgg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
 			},
 			{
 				["type"]=1,
@@ -59,10 +59,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=70,
- 				["num_for_nothing"]="UQg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=800,
+ 				["num_for_nothing"]="Xghc"
 			},
 			{
 				["type"]=1,
@@ -84,10 +84,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
 			},
 			{
 				["type"]=1,
@@ -109,10 +109,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=40,
- 				["num_for_nothing"]="Ugg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=400,
+ 				["num_for_nothing"]="Ughc"
 			},
 			{
 				["type"]=1,
@@ -134,10 +134,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
 			},
 			{
 				["type"]=1,
@@ -159,10 +159,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
 			},
 			{
 				["type"]=1,
@@ -184,10 +184,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=100,
- 				["num_for_nothing"]="Vwhc"
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1200,
+ 				["num_for_nothing"]="VwpcAw=="
 			},
 			{
 				["type"]=1,
@@ -209,10 +209,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=80,
- 				["num_for_nothing"]="Xgg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
 			},
 			{
 				["type"]=1,
@@ -234,10 +234,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=70,
- 				["num_for_nothing"]="UQg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=800,
+ 				["num_for_nothing"]="Xghc"
 			},
 			{
 				["type"]=1,
@@ -259,10 +259,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
 			},
 			{
 				["type"]=1,
@@ -284,10 +284,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=40,
- 				["num_for_nothing"]="Ugg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=400,
+ 				["num_for_nothing"]="Ughc"
 			},
 			{
 				["type"]=1,
@@ -309,10 +309,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
 			},
 			{
 				["type"]=1,
@@ -334,10 +334,10 @@ local activity_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=52,
- 				["id_for_nothing"]="Uwo=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
 			},
 			{
 				["type"]=1,

lua/app/config/avatar_frame.lua

@@ -30,9 +30,13 @@ local avatar_frame = {
 	[29]={
 		["iconId"]="avatar_frame_7",
 		["item"]=54
+	},
+	[30]={
+		["iconId"]="avatar_frame_8",
+		["item"]=57
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/fx.lua

@@ -1401,6 +1401,66 @@ local fx = {
 		["res"]="sfx_m20048_b05",
 		["bind"]="root"
 	},
+	[200187]={
+		["res"]="sfx_m20049_b01",
+		["bind"]="root"
+	},
+	[200188]={
+		["res"]="sfx_m20049_b02",
+		["bind"]="root"
+	},
+	[200189]={
+		["res"]="sfx_m20049_b03",
+		["bind"]="root"
+	},
+	[200190]={
+		["res"]="sfx_m20049_b04",
+		["bind"]="root"
+	},
+	[200191]={
+		["res"]="sfx_m20050_b01",
+		["bind"]="root"
+	},
+	[200192]={
+		["res"]="sfx_m20050_b02",
+		["bind"]="root"
+	},
+	[200193]={
+		["res"]="sfx_m20050_b03",
+		["bind"]="root"
+	},
+	[200194]={
+		["res"]="sfx_m20050_b04",
+		["bind"]="root"
+	},
+	[200195]={
+		["res"]="sfx_m20050_b05",
+		["bind"]="root"
+	},
+	[200196]={
+		["res"]="sfx_m20051_b01",
+		["bind"]="root"
+	},
+	[200197]={
+		["res"]="sfx_m20051_b04",
+		["bind"]="root"
+	},
+	[200198]={
+		["res"]="sfx_m20052_b04",
+		["bind"]="root"
+	},
+	[200199]={
+		["res"]="sfx_m20052_b05",
+		["bind"]="root"
+	},
+	[200200]={
+		["res"]="sfx_m20052_b06",
+		["bind"]="root"
+	},
+	[200201]={
+		["res"]="sfx_m20052_b07",
+		["bind"]="root"
+	},
 	[300000]={
 		["res"]="sfx_p0001_b01",
 		["bind"]="root"
@@ -2892,6 +2952,6 @@ local fx = {
 	}
 }
 local config = {
-data=fx,count=677
+data=fx,count=692
 }
 return config

lua/app/config/item.lua

@@ -1590,6 +1590,11 @@ local item = {
 		["qlt"]=4,
 		["icon"]="56"
 	},
+	[57]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="57"
+	},
 	[1001]={
 		["type"]=2,
 		["qlt"]=1,
@@ -2466,6 +2471,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=128
+data=item,count=129
 }
 return config

lua/app/config/monster_base.lua

@@ -625,12 +625,12 @@ local monster_base = {
 		["model_ui"]=1.0
 	},
 	[20050]={
-		["model_id"]="m20051",
+		["model_id"]="m20050",
 		["body"]=1,
 		["model_ui"]=1.0
 	},
 	[20051]={
-		["model_id"]="m20053",
+		["model_id"]="m20051",
 		["body"]=1,
 		["model_ui"]=1.0
 	},
@@ -640,32 +640,32 @@ local monster_base = {
 		["model_ui"]=1.0
 	},
 	[20053]={
-		["model_id"]="m20056",
+		["model_id"]="m20053",
 		["body"]=1,
 		["model_ui"]=1.0
 	},
 	[20054]={
-		["model_id"]="m20057",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20055]={
-		["model_id"]="m20058",
-		["body"]=1,
-		["model_ui"]=1.0
-	},
-	[20056]={
 		["model_id"]="m20054",
 		["body"]=1,
 		["model_ui"]=1.0
 	},
-	[20057]={
+	[20055]={
 		["model_id"]="m20055",
 		["body"]=1,
 		["model_ui"]=1.0
 	},
+	[20056]={
+		["model_id"]="m20056",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20057]={
+		["model_id"]="m20057",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
 	[20058]={
-		["model_id"]="m20050",
+		["model_id"]="m20058",
 		["body"]=1,
 		["model_ui"]=1.0
 	},

lua/app/config/monster_dungeon_rune.lua

@@ -826,7 +826,7 @@ local monster_dungeon_rune = {
 	},
 	[6408]={
 		["none"]="黑山羊幼崽",
-		["monster_base"]=20050,
+		["monster_base"]=20051,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -845,7 +845,7 @@ local monster_dungeon_rune = {
 	},
 	[6508]={
 		["none"]="莎布·尼古拉斯",
-		["monster_base"]=20051,
+		["monster_base"]=20053,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -881,7 +881,7 @@ local monster_dungeon_rune = {
 	},
 	[6708]={
 		["none"]="神秘的兄弟神",
-		["monster_base"]=20053,
+		["monster_base"]=20056,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -900,7 +900,7 @@ local monster_dungeon_rune = {
 	},
 	[6808]={
 		["none"]="兰·提戈斯",
-		["monster_base"]=20054,
+		["monster_base"]=20057,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -920,7 +920,7 @@ local monster_dungeon_rune = {
 	},
 	[6908]={
 		["none"]="克希拉",
-		["monster_base"]=20055,
+		["monster_base"]=20058,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=0,
@@ -946,7 +946,7 @@ local monster_dungeon_rune = {
 	},
 	[7008]={
 		["none"]="依德·雅",
-		["monster_base"]=20056,
+		["monster_base"]=20054,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,
@@ -968,7 +968,7 @@ local monster_dungeon_rune = {
 	},
 	[7108]={
 		["none"]="旧日支配者",
-		["monster_base"]=20057,
+		["monster_base"]=20055,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=0,
@@ -989,7 +989,7 @@ local monster_dungeon_rune = {
 	},
 	[7208]={
 		["none"]="阿撒托斯",
-		["monster_base"]=20058,
+		["monster_base"]=20050,
 		["hp"]=1463200000,
 		["atk"]=1000000,
 		["atk_times"]=4,

lua/app/config/runes_level.lua

@@ -3,14 +3,14 @@ local runes_level = {
 		["weight_1"]=7950,
 		["weight_2"]=2000,
 		["weight_3"]=50,
-		["grid"]=1
+		["grid"]=2
 	},
 	[2]={
 		["weight_1"]=6620,
 		["weight_2"]=3200,
 		["weight_3"]=150,
 		["weight_4"]=30,
-		["grid"]=2,
+		["grid"]=3,
 		["cost"]=100
 	},
 	[3]={
@@ -19,7 +19,7 @@ local runes_level = {
 		["weight_3"]=480,
 		["weight_4"]=66,
 		["weight_5"]=20,
-		["grid"]=3,
+		["grid"]=4,
 		["cost"]=1000
 	},
 	[4]={
@@ -29,7 +29,7 @@ local runes_level = {
 		["weight_4"]=112,
 		["weight_5"]=45,
 		["weight_6"]=8,
-		["grid"]=4,
+		["grid"]=5,
 		["cost"]=3000
 	},
 	[5]={
@@ -40,7 +40,7 @@ local runes_level = {
 		["weight_5"]=88,
 		["weight_6"]=18,
 		["weight_7"]=2,
-		["grid"]=5,
+		["grid"]=6,
 		["auto"]=1,
 		["cost"]=8000
 	},

lua/app/config/skill.lua

@@ -9288,7 +9288,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="immune",
-				["num"]=0,
+				["num"]=1,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -9316,7 +9316,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="immune",
-				["num"]=0,
+				["num"]=1,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -23929,7 +23929,8 @@ local skill = {
 		["sound_hit"]={
 			1000011
 		},
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200187
 	},
 	[30166]={
 		["effect_type"]=1,
@@ -23952,7 +23953,8 @@ local skill = {
 		["sound_hit"]={
 			1000012
 		},
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200188
 	},
 	[30167]={
 		["effect_type"]=1,
@@ -23975,7 +23977,8 @@ local skill = {
 		["sound_hit"]={
 			1000013
 		},
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200189
 	},
 	[30168]={
 		["buff_condition"]={
@@ -24086,7 +24089,13 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200190,
+		["bullet_time"]={
+			2066,
+			3000,
+			400
+		}
 	},
 	[30170]={
 		["effect_type"]=1,
@@ -24121,7 +24130,8 @@ local skill = {
 		["sound_hit"]={
 			1000011
 		},
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200196
 	},
 	[30171]={
 		["effect_type"]=1,
@@ -24156,7 +24166,8 @@ local skill = {
 		["sound_hit"]={
 			1000012
 		},
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200196
 	},
 	[30172]={
 		["effect_type"]=1,
@@ -24191,7 +24202,8 @@ local skill = {
 		["sound_hit"]={
 			1000013
 		},
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200196
 	},
 	[30173]={
 		["effect_type"]=1,
@@ -24216,7 +24228,13 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200197,
+		["bullet_time"]={
+			600,
+			3000,
+			400
+		}
 	},
 	[30174]={
 		["effect_type"]=1,
@@ -24330,7 +24348,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			966,
+			3000,
+			400
+		}
 	},
 	[30178]={
 		["effect_type"]=1,
@@ -24357,7 +24380,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill02"
+		["name_act"]="skill02",
+		["bullet_time"]={
+			966,
+			3000,
+			400
+		}
 	},
 	[30179]={
 		["effect_type"]=1,
@@ -24434,7 +24462,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt",
-				["num"]=100000,
+				["num"]=200000,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -24447,7 +24475,13 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200198,
+		["bullet_time"]={
+			833,
+			3000,
+			400
+		}
 	},
 	[30183]={
 		["effect_type"]=1,
@@ -24463,12 +24497,16 @@ local skill = {
 		["obj"]=2,
 		["cd"]=4,
 		["cd_start"]=1,
-		["shake_time"]=200,
-		["shake_type"]=6,
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200199,
+		["bullet_time"]={
+			833,
+			3000,
+			400
+		}
 	},
 	[30184]={
 		["effect_type"]=1,
@@ -24483,13 +24521,17 @@ local skill = {
 		},
 		["obj"]=2,
 		["cd"]=4,
-		["cd_start"]=2,
-		["shake_time"]=200,
-		["shake_type"]=6,
+		["cd_start"]=3,
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200200,
+		["bullet_time"]={
+			833,
+			3000,
+			400
+		}
 	},
 	[30185]={
 		["skill_type"]=3,
@@ -24501,13 +24543,17 @@ local skill = {
 		["trigger"]=1,
 		["obj"]=2,
 		["cd"]=4,
-		["cd_start"]=3,
-		["shake_time"]=200,
-		["shake_type"]=6,
+		["cd_start"]=2,
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200201,
+		["bullet_time"]={
+			833,
+			3000,
+			400
+		}
 	},
 	[30186]={
 		["effect_type"]=1,
@@ -24616,7 +24662,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			933,
+			3000,
+			400
+		}
 	},
 	[30191]={
 		["effect_type"]=1,
@@ -24731,7 +24782,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			1700,
+			3000,
+			400
+		}
 	},
 	[30196]={
 		["effect_type"]=1,
@@ -24923,7 +24979,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			400,
+			3000,
+			400
+		}
 	},
 	[30206]={
 		["effect_type"]=1,
@@ -24950,7 +25011,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			400,
+			3000,
+			400
+		}
 	},
 	[30207]={
 		["effect_type"]=1,
@@ -24977,7 +25043,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			400,
+			3000,
+			400
+		}
 	},
 	[30208]={
 		["effect_type"]=1,
@@ -25084,7 +25155,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			933,
+			3000,
+			400
+		}
 	},
 	[30213]={
 		["effect_type"]=1,
@@ -25109,7 +25185,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			933,
+			3000,
+			400
+		}
 	},
 	[30214]={
 		["effect_type"]=1,
@@ -25117,7 +25198,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="immune",
-				["num"]=0,
+				["num"]=1,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -25134,7 +25215,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			933,
+			3000,
+			400
+		}
 	},
 	[30215]={
 		["effect_type"]=1,
@@ -25247,7 +25333,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["bullet_time"]={
+			1033,
+			3000,
+			400
+		}
 	},
 	[30220]={
 		["skill_type"]=9,
@@ -25259,7 +25350,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="immune",
-				["num"]=0,
+				["num"]=1,
 				["ratio"]=10000,
 				["round"]=2
 			}
@@ -25276,7 +25367,12 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill02"
+		["name_act"]="skill02",
+		["bullet_time"]={
+			966,
+			3000,
+			400
+		}
 	},
 	[30221]={
 		["effect_type"]=1,
@@ -25299,7 +25395,8 @@ local skill = {
 		["sound_hit"]={
 			1000011
 		},
-		["name_act"]="attack01"
+		["name_act"]="attack01",
+		["fx_self"]=200191
 	},
 	[30222]={
 		["effect_type"]=1,
@@ -25322,7 +25419,8 @@ local skill = {
 		["sound_hit"]={
 			1000012
 		},
-		["name_act"]="attack02"
+		["name_act"]="attack02",
+		["fx_self"]=200192
 	},
 	[30223]={
 		["effect_type"]=1,
@@ -25345,7 +25443,8 @@ local skill = {
 		["sound_hit"]={
 			1000013
 		},
-		["name_act"]="attack03"
+		["name_act"]="attack03",
+		["fx_self"]=200193
 	},
 	[30224]={
 		["effect_type"]=2,
@@ -25389,7 +25488,13 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill02"
+		["name_act"]="skill02",
+		["fx_self"]=200195,
+		["bullet_time"]={
+			1100,
+			3000,
+			400
+		}
 	},
 	[30226]={
 		["skill_type"]=3,
@@ -25411,7 +25516,13 @@ local skill = {
 		},
 		["cd"]=6,
 		["cd_start"]=0,
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200194,
+		["bullet_time"]={
+			2066,
+			3000,
+			400
+		}
 	},
 	[30227]={
 		["skill_type"]=3,
@@ -25433,7 +25544,13 @@ local skill = {
 		},
 		["cd"]=6,
 		["cd_start"]=1,
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200194,
+		["bullet_time"]={
+			2066,
+			3000,
+			400
+		}
 	},
 	[30228]={
 		["skill_type"]=3,
@@ -25455,7 +25572,13 @@ local skill = {
 		},
 		["cd"]=6,
 		["cd_start"]=3,
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200194,
+		["bullet_time"]={
+			2066,
+			3000,
+			400
+		}
 	},
 	[30229]={
 		["skill_type"]=3,
@@ -25477,7 +25600,13 @@ local skill = {
 		},
 		["cd"]=6,
 		["cd_start"]=4,
-		["name_act"]="skill01"
+		["name_act"]="skill01",
+		["fx_self"]=200194,
+		["bullet_time"]={
+			2066,
+			3000,
+			400
+		}
 	},
 	[30230]={
 		["effect_type"]=1,
@@ -25508,7 +25637,13 @@ local skill = {
 		["sound_hit"]={
 			10018
 		},
-		["name_act"]="skill02"
+		["name_act"]="skill02",
+		["fx_self"]=200195,
+		["bullet_time"]={
+			1100,
+			3000,
+			400
+		}
 	},
 	[40001]={
 		["effect_type"]=1,
@@ -30462,7 +30597,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="immune",
-				["num"]=0,
+				["num"]=1,
 				["ratio"]=10000,
 				["round"]=2
 			},

lua/app/config/strings/cn/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="S3竞技场黄金头像，实力的证明。"
+	},
+	[30]={
+		["desc"]="圆月庆典头像框。"
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

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

@@ -513,9 +513,9 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "阶段{0}解锁",
     ["NOT_POP_TODAY"] = "今日不再提醒",
     ["ACT_BOSS_RUSH_DESC_34"] = "退出将按照当前波次结算，是否退出？",
-    ["DUNGEON_RUNE_TITLE"] = "塔中密室",
-    ["DUNGEON_RUNE_DESC"] = "挑战极限，获取符文！",
-    ["DUNGEON_RUNE_HELP"] = "1. 每天将重置10枚【金羽毛】和10枚【银羽毛】。/n2.挑战未通关层将需要消耗1枚【金羽毛】，通关后可获得1次通关奖励。/n3. 每10层为首领层，首领层通关后可消耗【银羽毛】扫荡获得【符文精粹】。",
+    ["DUNGEON_RUNE_TITLE"] = "符文之塔",
+    ["DUNGEON_RUNE_DESC"] = "挑战神秘之塔，收集符文精粹。",
+    ["DUNGEON_RUNE_HELP"] = "1. 每天将重置10枚【金羽毛】和10枚【银羽毛】。\n2.挑战未通关层将需要消耗1枚【金羽毛】，通关后可获得1次通关奖励。\n3. 每10层为首领层，首领层通关后可消耗【银羽毛】扫荡获得【符文精粹】。",
     ["DUNGEON_RUNE_MIN"] = "历史通关最小回合数：{0}",
     ["DUNGEON_RUNE_QUEST_1"] = "{0}回合内完成目标",
     ["DUNGEON_RUNE_QUEST_2"] = "消除{0}个{1}",
@@ -535,7 +535,7 @@ local localization_global =
     ["RUNES_DESC_5"] = "淬炼",
     ["RUNES_DESC_6"] = "符文",
     ["RUNES_DESC_7"] = "符文铸台等级",
-    ["RUNES_DESC_8"] = "1.消耗符文精粹提升符文铸台等级。\n2.符文铸台等级提升将解锁付文栏，有概率淬炼出高品质符文。\n3.所有英雄符文铸台等级互通。\n4.同一种属性，最多只会出现2条。",
+    ["RUNES_DESC_8"] = "1.消耗符文精粹提升符文铸台等级。\n2.符文铸台等级提升将解锁付文栏，有概率淬炼出高品质符文。\n3.所有英雄符文铸台等级共享。\n4.同一种属性，最多只会出现2条。",
     ["RUNES_DESC_9"] = "符文套装效果",
     ["RUNES_DESC_10"] = "生命套装",
     ["RUNES_DESC_11"] = "攻击套装",
@@ -554,7 +554,7 @@ local localization_global =
     ["RUNES_DESC_24"] = "请先激活英雄",
     ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文",
     ["RUNES_DESC_26"] = "Lv{0}",
-    ["RUNES_DESC_27"] = "符文铸台{0}级后开启",
+    ["RUNES_DESC_27"] = "符文铸台{0}级解锁",
     ["RUNES_DESC_28"] = "您有S级以上的属性未锁定，是否要继续淬炼？",
     ["RUNES_DESC_29"] = "停止",
     ["RUNES_DESC_30"] = "自动淬炼中...",
@@ -572,18 +572,18 @@ local localization_global =
     ["ACTIVITY_MOON_DESC_1"] = "圆月庆典",
     ["ACTIVITY_MOON_DESC_2"] = "自选礼包",
     ["ACTIVITY_MOON_DESC_3"] = "新英雄",
-    ["ACTIVITY_MOON_DESC_4"] = "英雄自选礼包",
+    ["ACTIVITY_MOON_DESC_4"] = "英雄自选礼包！",
     ["ACTIVITY_MOON_DESC_5"] = "新英雄-女武神",
     ["ACTIVITY_MOON_DESC_6"] = "请先购买上一礼包",
     ["ACTIVITY_MOON_DESC_7"] = "英雄自选",
-    ["ACTIVITY_MOON_DESC_8"] = "可自选已激活的英雄",
+    ["ACTIVITY_MOON_DESC_8"] = "可选择已激活的英雄",
     ["ACTIVITY_MOON_DESC_9"] = "圆月庆典皮肤，限时登场！",
     ["ACTIVITY_MOON_DESC_10"] = "{0}皮肤礼包",
     ["ACTIVITY_MOON_DESC_11"] = "所有任务均已完成！",
     ["SEIZED_DESC_4"] = "我们检测到您正在使用非法客户端，您将无法进行游戏，请前往正规应用商店下载。",
-    ["ACT_PVP_DESC_1"] = "是否消耗{0}钻石进入酒馆",
+    ["ACT_PVP_DESC_1"] = "是否消耗{0}钻石进入酒馆？",
     ["ACT_PVP_DESC_2"] = "进入",
-    ["ACT_PVP_DESC_3"] = "胜场 {0}/{1}  输场{2}/{3}",
+    ["ACT_PVP_DESC_3"] = "胜：{0}/{1}  败：{2}/{3}",
     ["ACT_PVP_DESC_4"] = "酒馆基金",
     ["ACT_PVP_DESC_5"] = "每日累胜奖励",
     ["ACT_PVP_DESC_6"] = "梦魔酒馆",
@@ -594,16 +594,16 @@ local localization_global =
     ["ACT_PVP_DESC_11"] = "下轮待选英雄",
     ["ACT_PVP_DESC_12"] = "选择",
     ["ACT_PVP_DESC_13"] = "是否消耗{0}钻石刷新",
-    ["ACT_PVP_DESC_14"] = "总胜场数",
+    ["ACT_PVP_DESC_14"] = "累计胜场",
     ["ACT_PVP_DESC_15"] = "酒馆积分",
     ["ACT_PVP_DESC_16"] = "欢迎入股酒馆基金，在酒馆挑战对手，累计积分可领取奖励分红哟~",
     ["ACT_PVP_DESC_17"] = "累计胜场",
     ["ACT_PVP_DESC_18"] = "1.活动期间在酒馆中的所有胜场都将累计记录用于排名。\n2.活动一共七天，第八天时可领取排名奖励。\n3.奖励请及时领取，过期将无法补偿。",
-    ["ACT_PVP_DESC_19"] = "胜:{0}",
-    ["ACT_PVP_DESC_20"] = "负:{0}",
-    ["ACT_PVP_DESC_21"] = "帮助文本1",
-    ["ACT_PVP_DESC_22"] = "帮助文本2",
-    ["ACT_PVP_DESC_23"] = "帮助文本3",
+    ["ACT_PVP_DESC_19"] = "胜：{0}",
+    ["ACT_PVP_DESC_20"] = "败：{0}",
+    ["ACT_PVP_DESC_21"] = "1.酒馆每日有1次免费进入机会，进入后先随机选取5名英雄构筑自己的队伍。所有英雄由酒馆提供，不继承你的属性，但可以使用你的皮肤。",
+    ["ACT_PVP_DESC_22"] = "2.构筑好自己的队伍后，您将匹配跟自己本次胜场数相同的对手，每次胜利后英雄将提升1次等级。所有品质的英雄初始都为6级。",
+    ["ACT_PVP_DESC_23"] = "3.累计胜利10次或失败2次都将退出酒馆，需要重新进入。今日内的胜场累计可领取额外累胜奖励。",
     ["ACT_PVP_TALK_DESC_1"] = "嗨~今天想来一局吗？",
     ["ACT_PVP_TALK_DESC_2"] = "强者，每天可以领取累胜奖励！",
     ["ACT_PVP_TALK_DESC_3"] = "嗯，这听起来很有趣，我们开始吧！",

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

@@ -219,6 +219,10 @@ local item = {
 		["name"]="圆月",
 		["desc"]="圆月庆典用的任务积分。"
 	},
+	[57]={
+		["name"]="圆月庆典头像框",
+		["desc"]="圆月庆典头像框"
+	},
 	[1001]={
 		["name"]="暗淡陨铁",
 		["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。"
@@ -486,6 +490,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/de/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

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

@@ -163,6 +163,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 
@@ -367,6 +370,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/en/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="S3 Gold Arena Avatar Frame. Proof of your prowess."
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/en/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Stage {0} Unlocked",
     ["NOT_POP_TODAY"] = "Don't remind me today",
     ["ACT_BOSS_RUSH_DESC_34"] = "When you quit, the battle will be settled according to the current wave, do you quit?",
+    ["DUNGEON_RUNE_TITLE"] = "Rune Tower",
+    ["DUNGEON_RUNE_DESC"] = "Challenge the Mysterious Tower and collect Rune Essence.",
+    ["DUNGEON_RUNE_HELP"] = "1. 10 [Gold Feather] and 10 [Silver Feather] will be reset daily. \n2.Challenging an uncleared floor will consume 1 [Gold Feather], and after clearing, you can receive a clear reward. \n3. Every 10 floors sees a Boss floor, after which you can use [Silver Feather] to Raid and obtain [Rune Essence].",
+    ["DUNGEON_RUNE_QUEST_1"] = "Complete the objective within {0} turns.",
+    ["DUNGEON_RUNE_QUEST_2"] = "Clear {0} {1}",
+    ["DUNGEON_RUNE_QUEST_3"] = "Clear {0} of this obstacle",
+    ["DUNGEON_RUNE_QUEST_4"] = "Defeat {0} Minions",
+    ["DUNGEON_RUNE_TIP_2"] = "Can't give up yet...",
+    ["DUNGEON_RUNE_TIP_3"] = "No turns left. Watch an ad for extra turns!",
+    ["DUNGEON_RUNE_TIP_4"] = "HP recovers to 50%",
+    ["DUNGEON_RUNE_TIP_5"] = "+5 turns!",
+    ["DUNGEON_RUNE_TIP_6"] = "HP is 0. Watch an ad to resurrect now!",
+    ["UNFINISHED"] = "Unfinished",
+    ["RUNES_DESC_1"] = "Rune Forge: Level {0}",
+    ["RUNES_DESC_2"] = "Rune Set",
+    ["RUNES_DESC_3"] = "Unlocks at Rune Forge Level {0}",
+    ["RUNES_DESC_4"] = "Quick Refine",
+    ["RUNES_DESC_5"] = "Refine",
+    ["RUNES_DESC_6"] = "Rune",
+    ["RUNES_DESC_7"] = "Rune Forge Level",
+    ["RUNES_DESC_8"] = "1. Use Rune Essences to upgrade Rune Forge.\n2. Upgrading Rune Forge unlocks rune slots and a chance to refine high-quality runes. \n3. All hero Rune Forge levels are shared. \n4. The same stat limit is 2.",
+    ["RUNES_DESC_9"] = "Rune Set Effect",
+    ["RUNES_DESC_10"] = "HP Set",
+    ["RUNES_DESC_11"] = "ATK Set",
+    ["RUNES_DESC_12"] = "DMG Bonus Set",
+    ["RUNES_DESC_13"] = "CRIT Rate Set",
+    ["RUNES_DESC_14"] = "CRIT DMG Set",
+    ["RUNES_DESC_15"] = "Lv1: 2-Piece Set: {0}",
+    ["RUNES_DESC_16"] = "Lv2: 4-Piece Set: {0}",
+    ["RUNES_DESC_17"] = "Daily Rune Pack",
+    ["RUNES_DESC_18"] = "Insufficient enhancement materials",
+    ["RUNES_DESC_19"] = "Insufficient Rune Essences, Onion can do nothing.",
+    ["RUNES_DESC_20"] = "Obtained in Rune Tower",
+    ["RUNES_DESC_21"] = "Quick Refine: Only stops when getting S and SS runes or running out of Rune Essences. Start?",
+    ["RUNES_DESC_22"] = "Rune Stats",
+    ["RUNES_DESC_23"] = "No set effects",
+    ["RUNES_DESC_24"] = "Please activate hero first",
+    ["RUNES_DESC_25"] = "Keep at least 1 unlocked rune in refinement",
+    ["RUNES_DESC_26"] = "Lv{0}",
+    ["RUNES_DESC_27"] = "Unlocks at Rune Forge Level {0}",
+    ["DUNGEON_RUNE_DESC_1"] = "Objective",
+    ["DUNGEON_RUNE_DESC_2"] = "Retry",
+    ["DUNGEON_RUNE_DESC_3"] = "Clear Reward",
+    ["DUNGEON_RUNE_DESC_4"] = "Raid Reward",
+    ["DUNGEON_RUNE_DESC_5"] = "Clear to unlock Raid",
+    ["DUNGEON_RUNE_DESC_6"] = "Record",
+    ["DUNGEON_RUNE_DESC_7"] = "Give Up",
+    ["DUNGEON_RUNE_DESC_8"] = "This Season",
+    ["DUNGEON_RUNE_DESC_9"] = "Last Season",
+    ["DUNGEON_RUNE_DESC_10"] = "Highest: {0}",
+    ["DUNGEON_RUNE_DESC_11"] = "Turns: {0}",
+    ["ACTIVITY_MOON_DESC_2"] = "Selection Pack",
+    ["ACTIVITY_MOON_DESC_3"] = "New Hero",
+    ["ACTIVITY_MOON_DESC_4"] = "Hero Selection Pack!",
+    ["ACTIVITY_MOON_DESC_7"] = "Hero Selection",
+    ["ACTIVITY_MOON_DESC_8"] = "You can choose activated hero",
+    ["ACTIVITY_MOON_DESC_9"] = "Limited-Time Round Moon Festival Skins!",
+    ["ACTIVITY_MOON_DESC_11"] = "All quests are completed!",
     ["SEIZED_DESC_4"] = "We have detected that you are using an illegal client. You cannot continue playing the game. Please download the game from an authorized app store.",
+    ["ACT_PVP_DESC_2"] = "Enter",
+    ["ACT_PVP_DESC_3"] = "Wins: {0}/{1} Losses: {2}/{3}",
+    ["ACT_PVP_DESC_4"] = "Tavern Fund",
+    ["ACT_PVP_DESC_5"] = "Daily Wins Rewards",
+    ["ACT_PVP_DESC_6"] = "Nightmare Tavern",
+    ["ACT_PVP_DESC_7"] = "{0} Wins",
+    ["ACT_PVP_DESC_8"] = "Select {0} Heroes",
+    ["ACT_PVP_DESC_10"] = "Free Refresh",
+    ["ACT_PVP_DESC_11"] = "Hero to be Selected",
+    ["ACT_PVP_DESC_14"] = "Wins",
+    ["ACT_PVP_DESC_15"] = "Tavern Points",
+    ["ACT_PVP_DESC_16"] = "Welcome to invest in the Tavern Fund. Challenge opponents in the tavern to claim bonus rewards based on accumulated points~",
+    ["ACT_PVP_DESC_17"] = "Wins",
+    ["ACT_PVP_DESC_18"] = "1. During the event, all Tavern wins will be cumulatively recorded for ranking. \n2. The event lasts for a total of 7 days, and rewards can be claimed on the 8th day.\n3. Please claim rewards on time; they cannot be compensated if they expire.",
+    ["ACT_PVP_DESC_19"] = "Wins: {0}",
+    ["ACT_PVP_DESC_20"] = "Losses: {0}",
+    ["ACT_PVP_DESC_21"] = "1. Tavern offers 1 free entry per day. After entering, randomly select 5 heroes to build your own team. All heroes are provided by the tavern. They do not inherit your stats but can use your skins.",
+    ["ACT_PVP_DESC_22"] = "2. After building your team, you will be matched with opponents who have the same number of wins as you for this session. Each victory will level up the hero by 1. All heroes start at level 6, regardless of their quality.",
+    ["ACT_PVP_DESC_23"] = "3. Accumulate 10 wins or 2 losses to exit the tavern. You'll need to re-enter. Extra wins rewards can be claimed for victories on the given day.",
+    ["ACT_PVP_TALK_DESC_1"] = "Hi~ Want a game today?",
+    ["ACT_PVP_TALK_DESC_2"] = "Mighty players can claim cumulative win rewards every day!",
+    ["ACT_PVP_TALK_DESC_3"] = "Well, that sounds fun! Let's get started!",
+    ["ACT_PVP_TALK_DESC_4"] = "I'm ready anytime, ready to beat them?",
+    ["ACT_PVP_TALK_DESC_5"] = "Please have a seat, relax, and let me take care of you.",
+    ["ACT_PVP_TALK_DESC_6"] = "Awesome! It's surprising to see 10x win again!",
+    ["ACT_PVP_TALK_DESC_7"] = "What a formidable warrior. Hope to see you again, 10x winner!",
+    ["ACT_PVP_TALK_DESC_8"] = "Defeated? Don't get down~ Try again!",
+    ["ACT_PVP_TALK_DESC_9"] = "It's okay to fail. Nightmare will help win in the next game.",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="Dim Meteorite",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/es/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="Marco de avatar de oro Temporada S3, prueba de fuerza."
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/es/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Desbloqueo de la etapa {0}",
     ["NOT_POP_TODAY"] = "No más notas por hoy",
     ["ACT_BOSS_RUSH_DESC_34"] = "¿Después de la salida, la batalla se liquidará de acuerdo con la ola actual, ¿ se retirará?",
+    ["DUNGEON_RUNE_TITLE"] = "Torre de Runas",
+    ["DUNGEON_RUNE_DESC"] = "Desafía la misteriosa torre y colecta la Esencia Rúnica.",
+    ["DUNGEON_RUNE_HELP"] = "1. Los números de [Plumas de Oro] y [Plumas de Plata] se restablecerán a 10 todos los días. \n2. Desafiar un piso no completado cuesta 1 [Plumas de Oro], y tras completarlo, obtendrás 1 recompensa. \n3. En cada 10 pisos hay un piso de Boss, y tras completarlo, puedes consumir [Pluma de Plata] para barrer y obtener [Esencia Rúnica].",
+    ["DUNGEON_RUNE_QUEST_1"] = "Completa el objetivo en {0} rondas",
+    ["DUNGEON_RUNE_QUEST_2"] = "Elimina {0} {1}",
+    ["DUNGEON_RUNE_QUEST_3"] = "Eliminar {0} de este obstáculo",
+    ["DUNGEON_RUNE_QUEST_4"] = "Mata {0} monstruos",
+    ["DUNGEON_RUNE_TIP_2"] = "No desistas...",
+    ["DUNGEON_RUNE_TIP_3"] = "Rondas agotadas. ¡Ver anuncios para ganar rondas extra!",
+    ["DUNGEON_RUNE_TIP_4"] = "HP restaurado al 50%",
+    ["DUNGEON_RUNE_TIP_5"] = "¡+5 rondas!",
+    ["DUNGEON_RUNE_TIP_6"] = "Estás con 0 HP. ¡Ver anuncios para resucitar!",
+    ["UNFINISHED"] = "Incompleto",
+    ["RUNES_DESC_1"] = "Forja de Runas: Nv. {0}",
+    ["RUNES_DESC_2"] = "Conjunto de Runas",
+    ["RUNES_DESC_3"] = "Desbloqueada la Forja de Runas Nv. {0}",
+    ["RUNES_DESC_4"] = "Auto-forjar",
+    ["RUNES_DESC_5"] = "Forjar",
+    ["RUNES_DESC_6"] = "Runa",
+    ["RUNES_DESC_7"] = "Nivel de Forja de Runas",
+    ["RUNES_DESC_8"] = "1. Consume Esencia Rúnica para aumentar el nivel de Forja de Runas. \n2. Al aumentar el nivel de Forja de Runas, se desbloqueará la columna de runas y hay chance de forjar runas de alta calidad. \n3. Todos los niveles de Forja de Runas de héroes son compartidos. \n4. Cada atributo solo aparece como máximo 2 veces.",
+    ["RUNES_DESC_9"] = "Efecto del conjunto de runas",
+    ["RUNES_DESC_10"] = "Conjunto de Vida",
+    ["RUNES_DESC_11"] = "Conjunto de Ataque",
+    ["RUNES_DESC_12"] = "Conjunto de bonus de daño",
+    ["RUNES_DESC_13"] = "Conjunto de golpe crítico",
+    ["RUNES_DESC_14"] = "Conjunto de daño crítico",
+    ["RUNES_DESC_15"] = "Nv.1 – 2 pzs: {0}",
+    ["RUNES_DESC_16"] = "Nv.2 – 4 pzs: {0}",
+    ["RUNES_DESC_17"] = "Paquete Diario de Runas",
+    ["RUNES_DESC_18"] = "Materials insuficientes para reforzar",
+    ["RUNES_DESC_19"] = "Esencia Rúnica insuficiente. Cabeza de Cebolla no puede hacer nada.",
+    ["RUNES_DESC_20"] = "Obtenido en Torre de Runas",
+    ["RUNES_DESC_21"] = "Auto-forjar solo termina cuando aparezcan las runas S y SS o cuando la Esencia Rúnica sea insuficiente. ¿Quieres iniciar?",
+    ["RUNES_DESC_22"] = "Atributos de Runa",
+    ["RUNES_DESC_23"] = "Sin efecto de conjunto",
+    ["RUNES_DESC_24"] = "Activa primero al héroe",
+    ["RUNES_DESC_25"] = "Mantén al menos 1 runa desbloqueada para forjar.",
+    ["RUNES_DESC_26"] = "Nv.{0}",
+    ["RUNES_DESC_27"] = "Desbloqueada la Forja de Runas Nv. {0}",
+    ["DUNGEON_RUNE_DESC_1"] = "Objetivo",
+    ["DUNGEON_RUNE_DESC_2"] = "Desafía de nuevo",
+    ["DUNGEON_RUNE_DESC_3"] = "Recompensas por completar",
+    ["DUNGEON_RUNE_DESC_4"] = "Recompensas de barrido",
+    ["DUNGEON_RUNE_DESC_5"] = "Completa la fase para barrer",
+    ["DUNGEON_RUNE_DESC_6"] = "Récord",
+    ["DUNGEON_RUNE_DESC_7"] = "Renunciar a la oportunidad",
+    ["DUNGEON_RUNE_DESC_8"] = "Temporada atual",
+    ["DUNGEON_RUNE_DESC_9"] = "Temporada anterior",
+    ["DUNGEON_RUNE_DESC_10"] = "Mejor récord: {0}",
+    ["DUNGEON_RUNE_DESC_11"] = "Número de rondas: {0}",
+    ["ACTIVITY_MOON_DESC_2"] = "Paquete de Selección",
+    ["ACTIVITY_MOON_DESC_3"] = "Nuevo Héroe",
+    ["ACTIVITY_MOON_DESC_4"] = "Paquete de Selección de Héroe",
+    ["ACTIVITY_MOON_DESC_7"] = "Selección de Héroe",
+    ["ACTIVITY_MOON_DESC_8"] = "Puedes seleccionar héroes activados",
+    ["ACTIVITY_MOON_DESC_9"] = "Skin de Celebración de Luna Llena, ¡disponible por tiempo limitado!",
+    ["ACTIVITY_MOON_DESC_11"] = "¡Todas las misiones completadas!",
     ["SEIZED_DESC_4"] = "Hemos detectado que estás utilizando un cliente ilegal, que no te permitirá seguir jugando. Por favor descarga la aplicación correcta en la tienda oficial de aplicaciones.",
+    ["ACT_PVP_DESC_2"] = "Entrar",
+    ["ACT_PVP_DESC_3"] = "Vitorias: {0}/{1} Derrotas: {2}/{3}",
+    ["ACT_PVP_DESC_4"] = "Fondo de Taberna",
+    ["ACT_PVP_DESC_5"] = "Recompensa diaria de Victorias",
+    ["ACT_PVP_DESC_6"] = "Taberna Íncubo",
+    ["ACT_PVP_DESC_7"] = "{0} vitorias",
+    ["ACT_PVP_DESC_8"] = "Elige {0} héroe",
+    ["ACT_PVP_DESC_10"] = "Actualizar Gratis",
+    ["ACT_PVP_DESC_11"] = "Héroes a elegir para la siguiente ronda",
+    ["ACT_PVP_DESC_14"] = "Victorias acumuladas",
+    ["ACT_PVP_DESC_15"] = "Puntos de Taberna",
+    ["ACT_PVP_DESC_16"] = "Bienvenido al Fondo de Taberna. Desafía oponentes en la Taberna, acumula puntos y colecta puntos extra!",
+    ["ACT_PVP_DESC_17"] = "Victorias acumuladas",
+    ["ACT_PVP_DESC_18"] = "1. Todas las victorias en la taberna durante el evento serán acumuladas para la clasificación. \n2. El evento dura siete días y puedes recibir recompensas de clasificación el octavo día. \n3. Colecta las recompensas a tiempo antes de que caduquen.",
+    ["ACT_PVP_DESC_19"] = "Vitorias: {0}",
+    ["ACT_PVP_DESC_20"] = "Derrotas: {0}",
+    ["ACT_PVP_DESC_21"] = "1. La Taberna ofrece 1 entrada gratuita al día. Al entrar, primero elige 5 héroes aleatorios para formar tu equipo. Todos los héroes son proporcionados por la taberna y no comparten tus atributos, pero pueden usar tus skins.",
+    ["ACT_PVP_DESC_22"] = "2. Tras formar tu equipo, serás emparejado con un oponente con el mismo número de victorias. El héroe sube 1 nivel tras cada victoria. El nivel inicial de héroes de todas las cualidades es el nivel 6.",
+    ["ACT_PVP_DESC_23"] = "3. Acumulando 10 victorias o 2 derrotas, saldrás de la taberna y necesitarás volver a entrar. Recibirás recompensas adicionales por victorias acumuladas durante el día.",
+    ["ACT_PVP_TALK_DESC_1"] = "Oye, ¿quieres jugar un partido hoy?",
+    ["ACT_PVP_TALK_DESC_2"] = "¡Los jugadores fuertes pueden recibir recompensas de ganador acumulativas todos los días!",
+    ["ACT_PVP_TALK_DESC_3"] = "Suena divertido. ¡Empecemos!",
+    ["ACT_PVP_TALK_DESC_4"] = "Estoy preparado. ¿Tú estás listo para vencerlos?",
+    ["ACT_PVP_TALK_DESC_5"] = "Siéntate, relájate y déjame cuidar de ti.",
+    ["ACT_PVP_TALK_DESC_6"] = "¡Eres increíble! Hace tiempo que no vemos a un ganador de 10 victorias en nuestra taberna.",
+    ["ACT_PVP_TALK_DESC_7"] = "¡Qué genial eres! Vuelve pronto, ganador de 10 victorias.",
+    ["ACT_PVP_TALK_DESC_8"] = "¿Derrotado? No te desanimes y desafía de nuevo.",
+    ["ACT_PVP_TALK_DESC_9"] = "No importa ser derrotado. Con mi Íncubo ganarás la próxima vez.",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="Meteorito Opaco",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/fr/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

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

@@ -163,6 +163,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 
@@ -367,6 +370,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/id/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="Bingkai Avatar Emas S3. Bukti kekuatan!"
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/id/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} membuka kunci",
     ["NOT_POP_TODAY"] = "Jangan ingatkan lagi hari ini",
     ["ACT_BOSS_RUSH_DESC_34"] = "Setelah keluar, pertempuran akan diselesaikan menurut gelombang saat ini. Apakah Anda ingin keluar?",
+    ["DUNGEON_RUNE_TITLE"] = "Menara Rune",
+    ["DUNGEON_RUNE_DESC"] = "Tantang menara misteri dan kumpulkan esensi rune.",
+    ["DUNGEON_RUNE_HELP"] = "1. 10 [Bulu Emas] dan 10 [Bulu Perak] akan direset setiap hari. \n2. Tantang lantai yang belum diselesaikan akan mengonsumsi 1 [Bulu Emas], dan dapat menerima hadiah setelah menyelesaikannya. \n3. Setiap 10 lantai terdapat lantai Boss, setelah itu kamu bisa menggunakan [Bulu Perak] untuk melakukan Raid dan mendapatkan [Esensi Rune].",
+    ["DUNGEON_RUNE_QUEST_1"] = "Selesaikan target dalam {0} giliran.",
+    ["DUNGEON_RUNE_QUEST_2"] = "Hapus {0} {1}",
+    ["DUNGEON_RUNE_QUEST_3"] = "Hapus {0} rintangan ini",
+    ["DUNGEON_RUNE_QUEST_4"] = "Kalahkan {0} Minion",
+    ["DUNGEON_RUNE_TIP_2"] = "Belum bisa menyerah...",
+    ["DUNGEON_RUNE_TIP_3"] = "Tidak ada sisa giliran. Tonton iklan untuk giliran ekstra!",
+    ["DUNGEON_RUNE_TIP_4"] = "Pulihkan 50% HP",
+    ["DUNGEON_RUNE_TIP_5"] = "+5 giliran!",
+    ["DUNGEON_RUNE_TIP_6"] = "HP 0. Tonton iklan untuk bangkit sekarang!",
+    ["UNFINISHED"] = "Belum selesai",
+    ["RUNES_DESC_1"] = "Rune Forge: Level {0}",
+    ["RUNES_DESC_2"] = "Set Rune",
+    ["RUNES_DESC_3"] = "Buka di Rune Forge Level {0}",
+    ["RUNES_DESC_4"] = "Refine Cepat",
+    ["RUNES_DESC_5"] = "Refine",
+    ["RUNES_DESC_6"] = "Rune",
+    ["RUNES_DESC_7"] = "Level Rune Forge",
+    ["RUNES_DESC_8"] = "1. Gunakan Esensi Rune untuk mengupgrade Rune Forge.\n2. Upgrade Rune Forge akan membuka slot rune dan peluang untuk menyempurnakan rune berkualitas tinggi. \n3. Semua level hero Rune Forge dibagikan. \n4. Batas stat yang sama adalah 2.",
+    ["RUNES_DESC_9"] = "Efek Set Rune",
+    ["RUNES_DESC_10"] = "Set HP",
+    ["RUNES_DESC_11"] = "Set ATK",
+    ["RUNES_DESC_12"] = "Set Bonus DMG",
+    ["RUNES_DESC_13"] = "Set Crit Rate",
+    ["RUNES_DESC_14"] = "Set Crit DMG",
+    ["RUNES_DESC_15"] = "Lv1: 2 Set: {0}",
+    ["RUNES_DESC_16"] = "Lv2: 4 Set: {0}",
+    ["RUNES_DESC_17"] = "Pack Rune Harian",
+    ["RUNES_DESC_18"] = "Material booster tidak mencukupi",
+    ["RUNES_DESC_19"] = "Esensi Rune tidak mencukupi, Kepala Bawang tidak dapat melakukan apa-apa.",
+    ["RUNES_DESC_20"] = "Dapatkan di Menara Rune",
+    ["RUNES_DESC_21"] = "Refine Cepat: Hanya berhenti ketika mendapatkan Rune S dan SS atau kehabisan Esensi Rune. Mulai?",
+    ["RUNES_DESC_22"] = "Stat Rune",
+    ["RUNES_DESC_23"] = "Tidak ada efek set",
+    ["RUNES_DESC_24"] = "Harap aktifkan hero terlebih dahulu",
+    ["RUNES_DESC_25"] = "Simpan setidaknya 1 rune yang terbuka dalam refine.",
+    ["RUNES_DESC_26"] = "Lv{0}",
+    ["RUNES_DESC_27"] = "Buka di Rune Forge Level {0}",
+    ["DUNGEON_RUNE_DESC_1"] = "Target",
+    ["DUNGEON_RUNE_DESC_2"] = "Ulangi",
+    ["DUNGEON_RUNE_DESC_3"] = "Hadiah Lolos",
+    ["DUNGEON_RUNE_DESC_4"] = "Hadiah Raid",
+    ["DUNGEON_RUNE_DESC_5"] = "Selesaikan untuk membuka Raid",
+    ["DUNGEON_RUNE_DESC_6"] = "Log",
+    ["DUNGEON_RUNE_DESC_7"] = "Menyerah",
+    ["DUNGEON_RUNE_DESC_8"] = "Musim Ini",
+    ["DUNGEON_RUNE_DESC_9"] = "Musim Terakhir",
+    ["DUNGEON_RUNE_DESC_10"] = "Tertinggi: {0}",
+    ["DUNGEON_RUNE_DESC_11"] = "Giliran: {0}",
+    ["ACTIVITY_MOON_DESC_2"] = "Pack Pilihan",
+    ["ACTIVITY_MOON_DESC_3"] = "Hero Baru",
+    ["ACTIVITY_MOON_DESC_4"] = "Pack Pilihan Hero!",
+    ["ACTIVITY_MOON_DESC_7"] = "Pilihan Hero",
+    ["ACTIVITY_MOON_DESC_8"] = "Bisa memilih hero yang aktif",
+    ["ACTIVITY_MOON_DESC_9"] = "Skin Festival Lunar Waktu Terbatas!",
+    ["ACTIVITY_MOON_DESC_11"] = "Semua quest selesai!",
     ["SEIZED_DESC_4"] = "Anda terdeteksi telah menggunakan platform tidak resmi, sehingga Anda tidak akan dapat memainkan game ini. Harap kunjungi aplikasi resmi untuk mengunduh. Terima kasih.",
+    ["ACT_PVP_DESC_2"] = "Masuk",
+    ["ACT_PVP_DESC_3"] = "Menang: {0}/{1} Kalah: {2}/{3}",
+    ["ACT_PVP_DESC_4"] = "Dana Tavern",
+    ["ACT_PVP_DESC_5"] = "Hadiah Kemenangan Harian",
+    ["ACT_PVP_DESC_6"] = "Nightmare Tavern",
+    ["ACT_PVP_DESC_7"] = "{0} menang",
+    ["ACT_PVP_DESC_8"] = "Pilih {0} Hero",
+    ["ACT_PVP_DESC_10"] = "Refresh Gratis",
+    ["ACT_PVP_DESC_11"] = "Hero untuk Dipilih",
+    ["ACT_PVP_DESC_14"] = "Menang",
+    ["ACT_PVP_DESC_15"] = "Poin Tavern",
+    ["ACT_PVP_DESC_16"] = "Selamat datang untuk berinvestasi di Dana Tavern. Tantang lawan di tavern untuk mengklaim hadiah bonus berdasarkan poin yang terkumpul.",
+    ["ACT_PVP_DESC_17"] = "Menang",
+    ["ACT_PVP_DESC_18"] = "1. Semua kemenangan Tavern akan dicatat secara kumulatif untuk peringkat selama event berlangsung. \n2. Event berlangsung selama total 7 hari, dan hadiah dapat diklaim pada hari ke-8.\n3. Harap klaim hadiah tepat waktu; hadiah tidak dapat dikompensasikan setelah kedaluwarsa.",
+    ["ACT_PVP_DESC_19"] = "Menang: {0}",
+    ["ACT_PVP_DESC_20"] = "Kalah: {0}",
+    ["ACT_PVP_DESC_21"] = "1. Tavern menawarkan 1 entri gratis per hari. Setelah masuk, pilih 5 hero secara acak untuk membangun tim sendiri. Semua hero disediakan oleh Tavern. Mereka tidak mewarisi statistikmu tetapi dapat menggunakan skin.",
+    ["ACT_PVP_DESC_22"] = "2. Setelah membangun tim, kamu akan dipertemukan dengan lawan yang memiliki jumlah kemenangan yang sama denganmu untuk sesi ini. Setiap kemenangan akan menaikkan level hero sebesar 1. Semua hero dimulai dari level 6, terlepas dari kualitasnya.",
+    ["ACT_PVP_DESC_23"] = "3. Kumpulkan 10 kemenangan atau 2 kekalahan untuk keluar dari Tavern. Kamu harus masuk kembali. Hadiah kemenangan ekstra dapat diklaim untuk kemenangan pada hari tertentu.",
+    ["ACT_PVP_TALK_DESC_1"] = "Hai! Mau main game hari ini?",
+    ["ACT_PVP_TALK_DESC_2"] = "Pemain yang hebat dapat klaim hadiah kemenangan kumulatif setiap hari!",
+    ["ACT_PVP_TALK_DESC_3"] = "Kedengarannya menyenangkan! Mari kita mulai!",
+    ["ACT_PVP_TALK_DESC_4"] = "Aku siap kapan saja, siap untuk mengalahkan mereka?",
+    ["ACT_PVP_TALK_DESC_5"] = "Silakan duduk, berisitirahat, dan biarkanku melayanimu.",
+    ["ACT_PVP_TALK_DESC_6"] = "Luar biasa! Mengejutkan melihat 10x kemenangan lagi!",
+    ["ACT_PVP_TALK_DESC_7"] = "Sungguh seorang pejuang yang tangguh. Semoga kita bisa bertemu lagi, pemenang ke-10!",
+    ["ACT_PVP_TALK_DESC_8"] = "Kalah? Jangan menyerah. Coba lagi!",
+    ["ACT_PVP_TALK_DESC_9"] = "Tidak apa-apa untuk gagal. Nightmare akan membantu menang di pertandingan berikutnya.",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="Chondrite",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/ja/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="S3闘技場ゴールドフレーム。実力の証。"
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/ja/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "フェーズ{0}ロック解除",
     ["NOT_POP_TODAY"] = "今日は見ない",
     ["ACT_BOSS_RUSH_DESC_34"] = "撤退後は、現在の波次決済に従って戦いますが、撤退しますか？",
+    ["DUNGEON_RUNE_TITLE"] = "ルーンの塔",
+    ["DUNGEON_RUNE_DESC"] = "神秘の塔に挑戦し、ルーンエッセンスを集めよう。",
+    ["DUNGEON_RUNE_HELP"] = "",
+    ["DUNGEON_RUNE_QUEST_1"] = "{0}ターン以内に目標を達成する",
+    ["DUNGEON_RUNE_QUEST_2"] = "{1}を{0}個消す",
+    ["DUNGEON_RUNE_QUEST_3"] = "この障害物を{0}個消す",
+    ["DUNGEON_RUNE_QUEST_4"] = "モンスターを{0}匹撃破する",
+    ["DUNGEON_RUNE_TIP_2"] = "まだ諦められない……",
+    ["DUNGEON_RUNE_TIP_3"] = "ターン数が足りません。CMを視聴して、追加ターンをゲットしよう！",
+    ["DUNGEON_RUNE_TIP_4"] = "HPが50％まで回復する",
+    ["DUNGEON_RUNE_TIP_5"] = "ターン数が+5！",
+    ["DUNGEON_RUNE_TIP_6"] = "HPが0になりました。CMを視聴して復活しよう！",
+    ["UNFINISHED"] = "未達成",
+    ["RUNES_DESC_1"] = "ルーン合成台:Lv{0}",
+    ["RUNES_DESC_2"] = "ルーンセット",
+    ["RUNES_DESC_3"] = "ルーン合成台Lv{0}解放",
+    ["RUNES_DESC_4"] = "クイック精製",
+    ["RUNES_DESC_5"] = "精製",
+    ["RUNES_DESC_6"] = "ルーン",
+    ["RUNES_DESC_7"] = "ルーン合成台レベル",
+    ["RUNES_DESC_8"] = "",
+    ["RUNES_DESC_9"] = "ルーンのセット効果",
+    ["RUNES_DESC_10"] = "生命セット",
+    ["RUNES_DESC_11"] = "攻撃セット",
+    ["RUNES_DESC_12"] = "ダメージ強化セット",
+    ["RUNES_DESC_13"] = "クリティカルセット",
+    ["RUNES_DESC_14"] = "クリティカルダメージセット",
+    ["RUNES_DESC_15"] = "Lv1:2セット:{0}",
+    ["RUNES_DESC_16"] = "Lv2:4セット:{0}",
+    ["RUNES_DESC_17"] = "ルーンデイリーパック",
+    ["RUNES_DESC_18"] = "強化材料不足",
+    ["RUNES_DESC_19"] = "ルーンエッセンスが足りず、タマネギにはどうすることもできないよ",
+    ["RUNES_DESC_20"] = "ルーンの塔で獲得する",
+    ["RUNES_DESC_21"] = "クイック精製、S及びSSのルーンが現れた時、またはルーンエッセンスが足りない時のみ停止しますが、開始しますか？",
+    ["RUNES_DESC_22"] = "ルーンステータス",
+    ["RUNES_DESC_23"] = "セット効果がありません",
+    ["RUNES_DESC_24"] = "まずはヒーローを解放してください",
+    ["RUNES_DESC_25"] = "",
+    ["RUNES_DESC_26"] = "Lv{0}",
+    ["RUNES_DESC_27"] = "ルーン合成台Lv{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_8"] = "今シーズン",
+    ["DUNGEON_RUNE_DESC_9"] = "前シーズン",
+    ["DUNGEON_RUNE_DESC_10"] = "最大：{0}",
+    ["DUNGEON_RUNE_DESC_11"] = "ターン数：{0}",
+    ["ACTIVITY_MOON_DESC_2"] = "選択パック",
+    ["ACTIVITY_MOON_DESC_3"] = "新ヒーロー",
+    ["ACTIVITY_MOON_DESC_4"] = "ヒーロー選択パック！",
+    ["ACTIVITY_MOON_DESC_7"] = "ヒーロー選択",
+    ["ACTIVITY_MOON_DESC_8"] = "解放済のヒーローを選択できる",
+    ["ACTIVITY_MOON_DESC_9"] = "満月イベントスキン、期間限定登場！",
+    ["ACTIVITY_MOON_DESC_11"] = "すべてのミッションが完了しました！",
     ["SEIZED_DESC_4"] = "不正なクライアントを使用していることが判明したため、引き続きプレイできません。アプリストアにてゲームをダウンロードしてください。",
+    ["ACT_PVP_DESC_2"] = "入る",
+    ["ACT_PVP_DESC_3"] = "勝：{0}/{1} 敗：{2}/{3}",
+    ["ACT_PVP_DESC_4"] = "酒場ファンド",
+    ["ACT_PVP_DESC_5"] = "デイリー累計勝利報酬",
+    ["ACT_PVP_DESC_6"] = "夢魔酒場",
+    ["ACT_PVP_DESC_7"] = "{0}勝",
+    ["ACT_PVP_DESC_8"] = "{0}ヒーローを選択してください",
+    ["ACT_PVP_DESC_10"] = "無料更新",
+    ["ACT_PVP_DESC_11"] = "次のラウンドで選ばれるヒーロー",
+    ["ACT_PVP_DESC_14"] = "累計勝利数",
+    ["ACT_PVP_DESC_15"] = "酒場ポイント",
+    ["ACT_PVP_DESC_16"] = "",
+    ["ACT_PVP_DESC_17"] = "累計勝利数",
+    ["ACT_PVP_DESC_18"] = "",
+    ["ACT_PVP_DESC_19"] = "勝：{0}",
+    ["ACT_PVP_DESC_20"] = "敗：{0}",
+    ["ACT_PVP_DESC_21"] = "",
+    ["ACT_PVP_DESC_22"] = "",
+    ["ACT_PVP_DESC_23"] = "",
+    ["ACT_PVP_TALK_DESC_1"] = "こんにちは~今日はいかが？",
+    ["ACT_PVP_TALK_DESC_2"] = "強者は、毎日累計勝利報酬を獲得できる！",
+    ["ACT_PVP_TALK_DESC_3"] = "面白そう！始めよう！",
+    ["ACT_PVP_TALK_DESC_4"] = "私はいつでも準備ができている。彼らを倒す準備はもうできた？",
+    ["ACT_PVP_TALK_DESC_5"] = "座って、リラックスして、私に任せてください。",
+    ["ACT_PVP_TALK_DESC_6"] = "すごいね！10勝なんてしばらくうちの酒場にはなかった！",
+    ["ACT_PVP_TALK_DESC_7"] = "",
+    ["ACT_PVP_TALK_DESC_8"] = "負けた？ドンマイ~また来てね！",
+    ["ACT_PVP_TALK_DESC_9"] = "",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="薄暗い隕石",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/ko/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="S3 아레나 골드 아이콘 프레임, 검증받은 실력입니다."
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/ko/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "{0}단계 잠금 해제",
     ["NOT_POP_TODAY"] = "오늘 더 이상 알림 받지 않음",
     ["ACT_BOSS_RUSH_DESC_34"] = "퇴장 후, 현재 라운드 결산에 따라 전투, 퇴장하시겠습니까?",
+    ["DUNGEON_RUNE_TITLE"] = "룬의 탑",
+    ["DUNGEON_RUNE_DESC"] = "룬의 탑에 도전하여 룬 정수를 모아보세요.",
+    ["DUNGEON_RUNE_HELP"] = "1. 매일 [황금 깃털] 10개와 [은 깃털] 10개가 초기화됩니다. \n2.클리어하지 않은 층에 도전할 때 [황금 깃털] 1개가 소모되며 클리어 후 해당 층의 클리어 보상을 1번 획득합니다. \n3. 매 10층마다 보스층이 있습니다. 보스층 클리어 후 [은 깃털]을 소모하여 해당 층을 소탕할 수 있으며, [룬 정수]를 획득합니다.",
+    ["DUNGEON_RUNE_QUEST_1"] = "{0}턴 내에 목표 완료하기",
+    ["DUNGEON_RUNE_QUEST_2"] = "{1}을(를) {0}개 소멸하기",
+    ["DUNGEON_RUNE_QUEST_3"] = "다음 장애물 {0}개 제거하기",
+    ["DUNGEON_RUNE_QUEST_4"] = "미니언 {0}마리 처치하기",
+    ["DUNGEON_RUNE_TIP_2"] = "아직 포기할 수 없습니다...",
+    ["DUNGEON_RUNE_TIP_3"] = "턴 횟수를 전부 사용했습니다. 광고를 시청하여 추가 턴을 얻어보세요!",
+    ["DUNGEON_RUNE_TIP_4"] = "HP가 50%로 회복됩니다.",
+    ["DUNGEON_RUNE_TIP_5"] = "턴 횟수 +5!",
+    ["DUNGEON_RUNE_TIP_6"] = "HP가 0입니다. 광고를 보고 즉시 부활해 보세요!",
+    ["UNFINISHED"] = "미완성",
+    ["RUNES_DESC_1"] = "룬 주조대: 레벨 {0}",
+    ["RUNES_DESC_2"] = "룬 세트",
+    ["RUNES_DESC_3"] = "룬 주조대 {0}레벨에 잠금 해제",
+    ["RUNES_DESC_4"] = "원클릭 다듬기",
+    ["RUNES_DESC_5"] = "다듬기",
+    ["RUNES_DESC_6"] = "룬",
+    ["RUNES_DESC_7"] = "룬 주조대 레벨",
+    ["RUNES_DESC_8"] = "1. 룬 정수를 소모하면 룬 주조대 레벨을 올릴 수 있습니다. \n2. 룬 주조대 레벨을 올리면 룬 슬롯을 해제할 수 있으며 일정 확률로 높은 품질의 룬을 다듬어 낼 수 있습니다. \n3. 모든 영웅의 룬 주조대 레벨은 공유됩니다. \n4. 같은 속성은 최대 2개까지만 나타날 수 있습니다.",
+    ["RUNES_DESC_9"] = "룬 세트 효과",
+    ["RUNES_DESC_10"] = "HP 세트",
+    ["RUNES_DESC_11"] = "공격 세트",
+    ["RUNES_DESC_12"] = "대미지 보너스 세트",
+    ["RUNES_DESC_13"] = "치명타 세트",
+    ["RUNES_DESC_14"] = "치명타 대미지 세트",
+    ["RUNES_DESC_15"] = "Lv1: 2종 세트: {0}",
+    ["RUNES_DESC_16"] = "Lv2: 4종 세트: {0}",
+    ["RUNES_DESC_17"] = "데일리 룬 패키지",
+    ["RUNES_DESC_18"] = "강화 재료가 부족합니다.",
+    ["RUNES_DESC_19"] = "룬 정수가 부족합니다. 양파 헤드도 도와줄 수 없네요.",
+    ["RUNES_DESC_20"] = "룬의 탑에서 획득합니다.",
+    ["RUNES_DESC_21"] = "원클릭 다듬기, S 또는 SS 룬이나 룬 정수가 나타날 경우에만 중지됩니다. 시작하시겠습니까?",
+    ["RUNES_DESC_22"] = "룬 속성",
+    ["RUNES_DESC_23"] = "세트 효과가 없습니다.",
+    ["RUNES_DESC_24"] = "먼저 영웅을 활성화해 주세요.",
+    ["RUNES_DESC_25"] = "룬 다듬기에서 잠긴 룬을 최소 하나 남기기",
+    ["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_8"] = "이번 시즌",
+    ["DUNGEON_RUNE_DESC_9"] = "지난 시즌",
+    ["DUNGEON_RUNE_DESC_10"] = "최고: {0}",
+    ["DUNGEON_RUNE_DESC_11"] = "턴 횟수: {0}",
+    ["ACTIVITY_MOON_DESC_2"] = "커스텀 패키지",
+    ["ACTIVITY_MOON_DESC_3"] = "신규 영웅",
+    ["ACTIVITY_MOON_DESC_4"] = "영웅 커스텀 패키지!",
+    ["ACTIVITY_MOON_DESC_7"] = "영웅 커스텀",
+    ["ACTIVITY_MOON_DESC_8"] = "활성화된 영웅을 선택할 수 있습니다.",
+    ["ACTIVITY_MOON_DESC_9"] = "보름달 축제 스킨, 한정 출시!",
+    ["ACTIVITY_MOON_DESC_11"] = "모든 미션을 전부 완료했습니다!",
     ["SEIZED_DESC_4"] = "불법 클라이언트 사용이 감지되었습니다. 게임을 진행할 수 없으며 스토어에 가서 공식 게임 어플을 다운 받아 주세요.",
+    ["ACT_PVP_DESC_2"] = "입장",
+    ["ACT_PVP_DESC_3"] = "승리: {0}/{1} 패배: {2}/{3}",
+    ["ACT_PVP_DESC_4"] = "주점 펀드",
+    ["ACT_PVP_DESC_5"] = "데일리 누적 승리 보상",
+    ["ACT_PVP_DESC_6"] = "인큐버스 주점",
+    ["ACT_PVP_DESC_7"] = "{0}승",
+    ["ACT_PVP_DESC_8"] = "{0} 영웅을 선택해 주세요.",
+    ["ACT_PVP_DESC_10"] = "무료 리셋",
+    ["ACT_PVP_DESC_11"] = "다음 턴에 선정될 영웅",
+    ["ACT_PVP_DESC_14"] = "누적 승리",
+    ["ACT_PVP_DESC_15"] = "주점 포인트",
+    ["ACT_PVP_DESC_16"] = "주점 펀드에 가입하신 것을 환영합니다. 주점에서 상대에게 도전하여 포인트를 쌓으면 배당금 보상을 받을 수 있습니다~",
+    ["ACT_PVP_DESC_17"] = "누적 승리",
+    ["ACT_PVP_DESC_18"] = "1. 이벤트 기간 주점에서 거둔 모든 승리는 누적되어 순위 결정에 사용됩니다. \n2. 이벤트는 총 7일간 진행되며 8일째에 랭킹 보상을 받을 수 있습니다. \n3. 마감일 내에 보상을 받아주세요. 만료된 보상은 재발급되지 않습니다.",
+    ["ACT_PVP_DESC_19"] = "승리: {0}",
+    ["ACT_PVP_DESC_20"] = "패배: {0}",
+    ["ACT_PVP_DESC_21"] = "1. 주점은 매일 한 번 무료로 입장할 수 있습니다. 입장하면 무작위로 선택된 5명의 영웅으로 나만의 팀을 구성하게 됩니다. 모든 영웅은 주점에서 제공하며  당신의 속성을 상속받지 않지만 스킨은 사용할 수 있습니다.",
+    ["ACT_PVP_DESC_22"] = "2. 나만의 팀을 구성한 후, 같은 승수를 기록한 상대와 매칭되며 승리할 때마다 영웅이 한 번씩 업그레이드됩니다. 모든 영웅의 초기 레벨은 레벨 6에서 시작합니다.",
+    ["ACT_PVP_DESC_23"] = "3. 누적 10번 승리하거나 2번 실패하면 주점에서 나가게 되며 다시 입장해야 합니다. 하루 동안 누적된 승리 횟수로 추가 보상을 받을 수 있습니다.",
+    ["ACT_PVP_TALK_DESC_1"] = "안녕하세요~ 오늘 게임할래요?",
+    ["ACT_PVP_TALK_DESC_2"] = "강한 자는 매일 누적 승리 보상을 받을 수 있답니다.",
+    ["ACT_PVP_TALK_DESC_3"] = "음, 꽤 재밌어 보이네요. 그럼 시작하죠!",
+    ["ACT_PVP_TALK_DESC_4"] = "전 언제든 준비되어 있어요. 이길 준비가 되어 있나요?",
+    ["ACT_PVP_TALK_DESC_5"] = "편히 앉아 휴식을 취하세요. 제가 당신을 보살펴 드릴게요.",
+    ["ACT_PVP_TALK_DESC_6"] = "정말 대단하시네요. 주점에서 마지막으로 10연승을 기록한 것이 언제인지 기억도 나지 않네요!",
+    ["ACT_PVP_TALK_DESC_7"] = "당신은 정말 강력한 워리어시네요. 꼭 다시 놀러 오세요, 10연승의 마스터님!",
+    ["ACT_PVP_TALK_DESC_8"] = "패배하셨나요? 실망하지 마시고 또 놀러 오세요!",
+    ["ACT_PVP_TALK_DESC_9"] = "실패해도 괜찮아요. 다음번엔 인큐버스와 함께 플레이하면 반드시 승리할 거예요.",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="알렌데 운석",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/pt/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="Moldura de avatar de ouro da Arena S3, uma testemunha do poder."
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/pt/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} desbloqueando",
     ["NOT_POP_TODAY"] = "Não me notifique por hoje.",
     ["ACT_BOSS_RUSH_DESC_34"] = "Depois de sair, a batalha será resolvida de acordo com a onda actual. Você quer sair?",
+    ["DUNGEON_RUNE_TITLE"] = "Torre das Runas",
+    ["DUNGEON_RUNE_DESC"] = "Desafie a torre misteriosa e colete as Essências Rúnicas.",
+    ["DUNGEON_RUNE_HELP"] = "1. Os números de [Pena de Ouro] e [Penas de Prata] são redefinidos a 10 respectivamente. \n2. Desafiar 1 andar não concluído custa 1 [Pena de Ouro], e após a conclusão, você receberá 1 recompensa. \n3. De 10 em 10 andares, se encontra um desafio de chefão. Após a conclusão desse andar, pode consumir [Penas de Prata] para fazer raide e obter [Essências Rúnicas].",
+    ["DUNGEON_RUNE_QUEST_1"] = "Conclua o objetivo em {0} rodadas.",
+    ["DUNGEON_RUNE_QUEST_2"] = "Remova {1} x {0}.",
+    ["DUNGEON_RUNE_QUEST_3"] = "Remova {0} deste obstáculo.",
+    ["DUNGEON_RUNE_QUEST_4"] = "Mate {0} lacaios.",
+    ["DUNGEON_RUNE_TIP_2"] = "Não desista...",
+    ["DUNGEON_RUNE_TIP_3"] = "Turnos esgotados. Assista a anúncios para obter turnos extras!",
+    ["DUNGEON_RUNE_TIP_4"] = "Restaura 50% de HP",
+    ["DUNGEON_RUNE_TIP_5"] = "Número de rodadas +5!",
+    ["DUNGEON_RUNE_TIP_6"] = "Está com 0 de Vida. Assista a anúncios para ressuscitar!",
+    ["UNFINISHED"] = "Incompleto",
+    ["RUNES_DESC_1"] = "Forja de Runas: Nv.{0}",
+    ["RUNES_DESC_2"] = "Conjunto de Runas",
+    ["RUNES_DESC_3"] = "Desbloqueada com a Forja de Runas Nv.{0}",
+    ["RUNES_DESC_4"] = "Auto-forjar",
+    ["RUNES_DESC_5"] = "Forjar",
+    ["RUNES_DESC_6"] = "Runa",
+    ["RUNES_DESC_7"] = "Nível da Forja de Runas",
+    ["RUNES_DESC_8"] = "1. Use a Essência Rúnica para aumentar o nível da Forja de Runas. \n2. Após o aprimoramento da Forja de Runas, desbloqueará a barra de runas, fornecendo probabilidade de forjar runas avançadas. \n3. Todos os heróis compartilham o nível da Forja de Runas. \n4. O mesmo atributo só aparece até 2 vezes.",
+    ["RUNES_DESC_9"] = "Efeitos do conjunto de runas",
+    ["RUNES_DESC_10"] = "Conjunto de Vida",
+    ["RUNES_DESC_11"] = "Conjunto de Ataque",
+    ["RUNES_DESC_12"] = "Conjunto de Dano Aumentado",
+    ["RUNES_DESC_13"] = "Conjunto de Acerto Crítico",
+    ["RUNES_DESC_14"] = "Conjunto de Dano Crítico",
+    ["RUNES_DESC_15"] = "Nv.1 – 2 peças: {0}",
+    ["RUNES_DESC_16"] = "Nv.2 – 4 peças: {0}",
+    ["RUNES_DESC_17"] = "Pacote Diário de Runas",
+    ["RUNES_DESC_18"] = "Materiais insuficientes para reforço",
+    ["RUNES_DESC_19"] = "Essência de Runa insuficiente. A Cabeça de Cebola não consegue fazer nada.",
+    ["RUNES_DESC_20"] = "Obtida na Torre das Runas.",
+    ["RUNES_DESC_21"] = "Auto-forjar só termina quando aparecerem runas S e SS ou quando as Essências Rúnicas estiverem esgotadas. Deseja iniciar?",
+    ["RUNES_DESC_22"] = "Atributos da Runa",
+    ["RUNES_DESC_23"] = "Sem efeito de conjunto.",
+    ["RUNES_DESC_24"] = "Ative um herói primeiro.",
+    ["RUNES_DESC_25"] = "É preciso manter pelo menos 1 runa não bloqueada para forjar.",
+    ["RUNES_DESC_26"] = "Nv.{0}",
+    ["RUNES_DESC_27"] = "Desbloqueada com a Forja de Runas Nv.{0}",
+    ["DUNGEON_RUNE_DESC_1"] = "Objetivo",
+    ["DUNGEON_RUNE_DESC_2"] = "Desafiar novamente",
+    ["DUNGEON_RUNE_DESC_3"] = "Recompensas de conclusão",
+    ["DUNGEON_RUNE_DESC_4"] = "Recompensas de raide",
+    ["DUNGEON_RUNE_DESC_5"] = "O raide é disponível após conclusão",
+    ["DUNGEON_RUNE_DESC_6"] = "Recordes",
+    ["DUNGEON_RUNE_DESC_7"] = "Desistir da chance",
+    ["DUNGEON_RUNE_DESC_8"] = "Temporada atual",
+    ["DUNGEON_RUNE_DESC_9"] = "Temporada anterior",
+    ["DUNGEON_RUNE_DESC_10"] = "Melhor recorde: {0}",
+    ["DUNGEON_RUNE_DESC_11"] = "Número de turnos: {0}",
+    ["ACTIVITY_MOON_DESC_2"] = "Pacote de Seleção",
+    ["ACTIVITY_MOON_DESC_3"] = "Novo Herói",
+    ["ACTIVITY_MOON_DESC_4"] = "Pacote de seleção de heróis!",
+    ["ACTIVITY_MOON_DESC_7"] = "Seleção de Heróis",
+    ["ACTIVITY_MOON_DESC_8"] = "Pode escolher heróis já ativados.",
+    ["ACTIVITY_MOON_DESC_9"] = "Skin do Festival da Lua Cheia disponível por tempo limitado!",
+    ["ACTIVITY_MOON_DESC_11"] = "Todas as missões foram concluídas!",
     ["SEIZED_DESC_4"] = "Detectamos que está operando um programa não oficial e, por isso, você não pode continuar jogando. Por favor, vá até a uma loja de aplicativos oficial para baixar nosso jogo.",
+    ["ACT_PVP_DESC_2"] = "Entrar",
+    ["ACT_PVP_DESC_3"] = "Vitórias: {0}/{1} Derrotas: {2}/{3}",
+    ["ACT_PVP_DESC_4"] = "Fundo da Taverna",
+    ["ACT_PVP_DESC_5"] = "Recompensas pelas Vitórias do Dia",
+    ["ACT_PVP_DESC_6"] = "Taverna do Íncubo",
+    ["ACT_PVP_DESC_7"] = "{0} vitórias",
+    ["ACT_PVP_DESC_8"] = "Escolha um herói {0}.",
+    ["ACT_PVP_DESC_10"] = "Atualizar Grátis",
+    ["ACT_PVP_DESC_11"] = "Heróis a serem escolhidos na próxima rodada",
+    ["ACT_PVP_DESC_14"] = "Vitórias acumuladas",
+    ["ACT_PVP_DESC_15"] = "Pontos da Taverna",
+    ["ACT_PVP_DESC_16"] = "Bem-vindo(a) ao Fundo da Taverna. Desafie seus oponentes na Taverna, acumule pontos e colete recompensas de dividendos!",
+    ["ACT_PVP_DESC_17"] = "Vitórias acumuladas",
+    ["ACT_PVP_DESC_18"] = "1. Todas as vitórias na Taverna durante o evento serão acumuladas para a classificação. \n2. O evento dura sete dias, e as recompensas de classificação podem ser coletadas no oitavo dia. \n3. Não se esqueça de coletar suas recompensas a tempo, pois não as poderá coletar depois da expiração.",
+    ["ACT_PVP_DESC_19"] = "Vitórias: {0}",
+    ["ACT_PVP_DESC_20"] = "Derrotas: {0}",
+    ["ACT_PVP_DESC_21"] = "1. A Taverna oferece 1 chance gratuita de entrada por dia. Após entrar, você precisa selecionar 5 heróis aleatórios para construir sua equipe. Todos os heróis são fornecidos pela Taverna e, mesmo não compartilhando seus atributos, podem usar suas skins.",
+    ["ACT_PVP_DESC_22"] = "2. Após construir sua equipe, você será pareado(a) com um oponente com o mesmo número de vitórias nesta rodada. A cada vitória, seus heróis sobem de 1 nível. O nível inicial de todos os heróis de todas as qualidades é de 6.",
+    ["ACT_PVP_DESC_23"] = "3. Você sairá da Taverna depois de acumular 10 vitórias ou 2 derrotas. Você precisará entrar novamente. Você pode coletar recompensas extras pelas vitórias acumuladas por hoje.",
+    ["ACT_PVP_TALK_DESC_1"] = "Oi! Quer jogar uma rodada hoje?",
+    ["ACT_PVP_TALK_DESC_2"] = "Aventureiro(a), você pode coletar recompensas acumulando vitórias todos os dias!",
+    ["ACT_PVP_TALK_DESC_3"] = "Hum, interessante. Vamos começar!",
+    ["ACT_PVP_TALK_DESC_4"] = "Estou pronto. Você está preparado(a) para derrotá-los?",
+    ["ACT_PVP_TALK_DESC_5"] = "Sente-se, relaxe e deixe-me cuidar de você.",
+    ["ACT_PVP_TALK_DESC_6"] = "Incrível! Não se via um(a) vencedor(a) de 10 partidas aqui na nossa taverna há muito tempo!",
+    ["ACT_PVP_TALK_DESC_7"] = "Admiro sua conquista! Volte sempre, vencedor(a) de 10 partidas!",
+    ["ACT_PVP_TALK_DESC_8"] = "Foi derrotado(a)? Não desanime e desafie de novo!",
+    ["ACT_PVP_TALK_DESC_9"] = "Umas derrotas não importam. Quando eu Íncubo apareço no campo, você vencerá.",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="Ferro Meteórico Opaco",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/ru/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

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

@@ -163,6 +163,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 
@@ -367,6 +370,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/th/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="กรอบรูปทองของอารีน่า S3 พิสูจน์ความแข็งแกร่ง"
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/th/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "ขั้นตอนที่ {0} ปลดล็อค",
     ["NOT_POP_TODAY"] = "วันนี้ไม่เตือนอีก",
     ["ACT_BOSS_RUSH_DESC_34"] = "เมื่อออกแล้วจะชำระค่าต่อสู้ตามคลื่นปัจจุบัน จะออกหรือไม่",
+    ["DUNGEON_RUNE_TITLE"] = "หอรูน",
+    ["DUNGEON_RUNE_DESC"] = "ท้าทายหอคอยลึกลับเพื่อรวบรวมแก่นรูน",
+    ["DUNGEON_RUNE_HELP"] = "1. [ขนทอง]x10 และ [ขนเงิน]x10 จะถูกรีเซ็ตทุกวัน\n2. ท้าทายด่านที่ยังไม่ผ่านจะใช้ [ขนทอง]x1 หลังจากผ่านด่านจะได้รับรางวัลผ่านด่าน 1 ครั้ง\n3. ทุก ๆ 10 ชั้นจะเป็นชั้นบอส หลังจากผ่านด่านชั้นบอสแล้ว สามารถใช้ [ขนเงิน] เพื่อกวาดและรับ [แก่นรูน]",
+    ["DUNGEON_RUNE_QUEST_1"] = "บรรลุเป้าหมายภายใน {0} รอบ",
+    ["DUNGEON_RUNE_QUEST_2"] = "กำจัด{1}x{0}",
+    ["DUNGEON_RUNE_QUEST_3"] = "กำจัดสิ่งกีดขวาง {0} อัน",
+    ["DUNGEON_RUNE_QUEST_4"] = "สังหารมอนน้อย {0} ตัว",
+    ["DUNGEON_RUNE_TIP_2"] = "ยังยอมแพ้ไม่ได้…",
+    ["DUNGEON_RUNE_TIP_3"] = "เมื่อจำนวนรอบหมด ดูโฆษณาจะได้รับรอบเพิ่มเติม!",
+    ["DUNGEON_RUNE_TIP_4"] = "HP ฟื้นคืนถึง 50%",
+    ["DUNGEON_RUNE_TIP_5"] = "จำนวนรอบ +5!",
+    ["DUNGEON_RUNE_TIP_6"] = "หากค่า H Pเป็น 0 คุณจะฟื้นคืนชีพทันทีหลังจากดูโฆษณา!",
+    ["UNFINISHED"] = "ยังไม่บรรลุ",
+    ["RUNES_DESC_1"] = "แท่นหล่อรูน: Lv.{0}",
+    ["RUNES_DESC_2"] = "เซ็ทรูน",
+    ["RUNES_DESC_3"] = "แท่นหล่อรูน Lv.{0} จะปลดล็อค",
+    ["RUNES_DESC_4"] = "หล่อทั้งหมด",
+    ["RUNES_DESC_5"] = "หล่อ",
+    ["RUNES_DESC_6"] = "รูน",
+    ["RUNES_DESC_7"] = "เลเวลแท่นหล่อรูน",
+    ["RUNES_DESC_8"] = "1. ใช้แก่นรูนเพื่ออัปเลเวลของแท่นหล่อรูน\n2. การอัปเลเวลของแท่นหล่อรูนจะปลดล็อกช่องรูน และมีโอกาสที่จะหล่อรูนคุณภาพสูง\n3. ฮีโร่ทั้งหมดจะแชร์เลเวลแท่นหล่อรูนด้วยกัน\n4. สเตตัสเดียวกันสามารถปรากฏได้สูงสุด 2 ครั้งเท่านั้น",
+    ["RUNES_DESC_9"] = "เอฟเฟกต์เซ็ทรูน",
+    ["RUNES_DESC_10"] = "เซ็ท HP",
+    ["RUNES_DESC_11"] = "เซ็ทโจมตี",
+    ["RUNES_DESC_12"] = "เซ็ทเพิ่มดาเมจ",
+    ["RUNES_DESC_13"] = "เซ็ท Crit",
+    ["RUNES_DESC_14"] = "เซ็ทระเบิดดาเมจ",
+    ["RUNES_DESC_15"] = "Lv1: เซ็ท 2 ชิ้น: {0}",
+    ["RUNES_DESC_16"] = "Lv2: เซ็ท 4 ชิ้น: {0}",
+    ["RUNES_DESC_17"] = "แพ็ครูนรายวัน",
+    ["RUNES_DESC_18"] = "วัสดุตีบวกไม่พอ",
+    ["RUNES_DESC_19"] = "แก่นรูนไม่พอ และหัวหอมก็ไม่สามารถทำอะไรได้บ้าง",
+    ["RUNES_DESC_20"] = "ได้รับจากหอรูน",
+    ["RUNES_DESC_21"] = "หล่อทั้งหมด และจะหยุดเมื่อรูน S และ SS ปรากฏขึ้นหรือแก่นรูนไม่เพียงพอ เริ่มต้นหรือไม่?",
+    ["RUNES_DESC_22"] = "สเตตัสรูน",
+    ["RUNES_DESC_23"] = "ไม่มีเอฟเฟกต์เช็ท",
+    ["RUNES_DESC_24"] = "กรุณาเปิดใช้งานฮีโร่ก่อน",
+    ["RUNES_DESC_25"] = "การหล่อรูนต้องรักษารูนที่ปลดล็อคไว้อย่างน้อย 1 อัน",
+    ["RUNES_DESC_26"] = "Lv{0}",
+    ["RUNES_DESC_27"] = "แท่นหล่อรูน Lv.{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_8"] = "ซีซั่นนี้",
+    ["DUNGEON_RUNE_DESC_9"] = "ซีซั่นที่แล้ว",
+    ["DUNGEON_RUNE_DESC_10"] = "สูงสุด: {0}",
+    ["DUNGEON_RUNE_DESC_11"] = "จำนวนรอบ: {0}",
+    ["ACTIVITY_MOON_DESC_2"] = "แพ็คเลือกเอง",
+    ["ACTIVITY_MOON_DESC_3"] = "ฮีโร่ใหม่",
+    ["ACTIVITY_MOON_DESC_4"] = "แพ็คเลือกฮีโร่!",
+    ["ACTIVITY_MOON_DESC_7"] = "เลือกฮีโร่",
+    ["ACTIVITY_MOON_DESC_8"] = "สามารถเลือกฮีโร่ที่เปิดใช้งานได้",
+    ["ACTIVITY_MOON_DESC_9"] = "สกินงานฉลองพระจันทร์เต็มดวง เปิดตัวอย่างจำกัดเวลา!",
+    ["ACTIVITY_MOON_DESC_11"] = "บรรลุภารกิจทั้งหมดแล้ว!",
     ["SEIZED_DESC_4"] = "เราตรวจพบว่าคุณกำลังใช้ไคลเอนต์ที่ผิดกฎหมาย คุณจะไม่สามารถเล่นเกมได้ โปรดไปที่ App Store อย่างเป็นทางการเพื่อดาวน์โหลด",
+    ["ACT_PVP_DESC_2"] = "เข้า",
+    ["ACT_PVP_DESC_3"] = "ชนะ: {0}/{1} แพ้: {2}/{3}",
+    ["ACT_PVP_DESC_4"] = "กองทุนโรงเตี๊ยม",
+    ["ACT_PVP_DESC_5"] = "รางวัลสะสมชนะรายวัน",
+    ["ACT_PVP_DESC_6"] = "โรงเตี๊ยมฝันร้าย",
+    ["ACT_PVP_DESC_7"] = "ชนะ{0}",
+    ["ACT_PVP_DESC_8"] = "โปรดเลือก{0}ฮีโร่",
+    ["ACT_PVP_DESC_10"] = "รีเฟรชฟรี",
+    ["ACT_PVP_DESC_11"] = "ฮีโร่ที่จะเลือกในรอบต่อไป",
+    ["ACT_PVP_DESC_14"] = "รอบชนะที่สะสม",
+    ["ACT_PVP_DESC_15"] = "คะแนนโรงเตี๊ยม",
+    ["ACT_PVP_DESC_16"] = "ยินดีต้อนรับลงทุนกองทุนโรงเตี๊ยม ท้าทายคู่ต่อสู้ของคุณในโรงเตี๊ยม สะสมคะแนนสามารถรับเงินปันผลได้นะ~",
+    ["ACT_PVP_DESC_17"] = "รอบชนะที่สะสม",
+    ["ACT_PVP_DESC_18"] = "1. รอบชนะทั้งหมดในโรงเตี๊ยมระหว่างกิจกรรมจะถูกสะสมและใช้สำหรับการจัดอันดับ\n2. กิจกรรมมีระยะเวลา 7 วัน และคุณสามารถรับรางวัลอันดับได้ในวันที่ 8\n3. โปรดรับรางวัลให้ทันเวลา หากหมดอายุจะไม่ได้รับการชดเชย",
+    ["ACT_PVP_DESC_19"] = "ชนะ: {0}",
+    ["ACT_PVP_DESC_20"] = "แพ้: {0}",
+    ["ACT_PVP_DESC_21"] = "1. มีโอกาสเข้าโรงเตี๊ยมฟรีหนึ่งครั้งทุกวัน หลังจากเข้แล้ว จะสุ่มเลือกฮีโร่ 5 ตัวเพื่อสร้างทีมของคุณเอง ฮีโร่ทั้งหมดจะได้รับจากโรงเตี๊ยมและไม่ได้รับสเตตัสของคุณ แต่สามารถใช้สกินของคุณได้",
+    ["ACT_PVP_DESC_22"] = "2. หลังจากสร้างทีมของคุณเองแล้ว คุณจะจับคู่คู่ต่อสู้ด้วยจำนวนชัยชนะเท่ากับคุณในครั้งนี้ หลังจากชัยชนะแต่ละครั้ง ฮีโร่จะอัป 1 เลเวล ฮีโร่คุณภาพทั้งหมดเริ่มต้นที่ Lv.6",
+    ["ACT_PVP_DESC_23"] = "3. สะสมชนะ 10 ครั้งหรือล้มเหลว 2 ครั้งก็จะออกจากโรงเตี๊ยมและต้องกลับเข้าไปใหม่ ชัยชนะที่สะสมภายในวันนี้สามารถใช้เพื่อรับรางวัลสะสมชนะเพิ่มเติมได้",
+    ["ACT_PVP_TALK_DESC_1"] = "Hi~ วันนี้อยากเล่นสักรอบไหม?",
+    ["ACT_PVP_TALK_DESC_2"] = "ผู้ที่แข็งแกร่งสามารถรับรางวัลสะสมชนะได้ทุกวัน!",
+    ["ACT_PVP_TALK_DESC_3"] = "อื่ม ฟังดูน่าสนุก มาเริ่มกันเลย!",
+    ["ACT_PVP_TALK_DESC_4"] = "ฉันพร้อมเสมอ พร้อมที่จะเอาชนะพวกเขาหรือยัง?",
+    ["ACT_PVP_TALK_DESC_5"] = "กรุณานั่งลง ผ่อนคลาย และให้ฉันดูแลคุณ",
+    ["ACT_PVP_TALK_DESC_6"] = "คุณเก่งจังเลบ ชนะ 10 ครั้งอย่างต่อเนื่องไม่ได้ปรากฏตัวในโรงเตี๊ยมของเรามานานแล้ว!",
+    ["ACT_PVP_TALK_DESC_7"] = "ฝันร้ายวันนี้ฉันได้พบกับผู้แข็งแกร่งแล้ว ท่านที่ชนะ 10 ครั้ง ยินดีต้อนรับกลับมา!",
+    ["ACT_PVP_TALK_DESC_8"] = "พ่ายแพ้เหรอ? อย่าท้อนะ~ มาเล่นอีกสิ!",
+    ["ACT_PVP_TALK_DESC_9"] = "แพ็ก็ไม่เป็นไร ครั้งหน้าฉันจะชนะอย่างแน่นอน",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="อุกกาบาตทื่อ",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/vi/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="Khung Avatar Vàng Đấu Trường S3, biểu tượng thực lực."
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/vi/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "Giai đoạn {0} Mở khóa",
     ["NOT_POP_TODAY"] = "Hôm nay không nhắc lại",
     ["ACT_BOSS_RUSH_DESC_34"] = "Sau khi rút lui, sẽ dựa theo sóng hiện tại thanh toán chiến đấu, có rút lui hay không?",
+    ["DUNGEON_RUNE_TITLE"] = "Tháp Phù Văn",
+    ["DUNGEON_RUNE_DESC"] = "Khiêu chiến Tháp Thần Bí, thu thập Tinh Túy Phù Văn.",
+    ["DUNGEON_RUNE_HELP"] = "1. Mỗi ngày sẽ reset 10 [Lông Vũ Vàng] và 10 [Lông Vũ Bạc].\n2.Khiêu chiến tầng chưa vượt ải cần tiêu hao 1 [Lông Vũ Vàng], sau khi vượt ải được nhận 1 lần quà vượt ải.\n3.Cứ 10 tầng là tầng BOSS, sau khi vượt ải tầng BOSS được tiêu hao [Lông Vũ Bạc] để càn quét nhận [Tinh Túy Phù Văn].",
+    ["DUNGEON_RUNE_QUEST_1"] = "Trong {0} hiệp hoàn thành mục tiêu",
+    ["DUNGEON_RUNE_QUEST_2"] = "Loại bỏ {0} {1}",
+    ["DUNGEON_RUNE_QUEST_3"] = "Loại bỏ {0} chướng ngại vật này",
+    ["DUNGEON_RUNE_QUEST_4"] = "Diệt {0} Quái",
+    ["DUNGEON_RUNE_TIP_2"] = "Chưa thể từ bỏ...",
+    ["DUNGEON_RUNE_TIP_3"] = "Hết số hiệp, xem quảng cáo để nhận thêm hiệp nhé!",
+    ["DUNGEON_RUNE_TIP_4"] = "HP hồi đến 50%",
+    ["DUNGEON_RUNE_TIP_5"] = "Số hiệp +5!",
+    ["DUNGEON_RUNE_TIP_6"] = "HP còn 0, xem quảng cáo để hồi sinh!",
+    ["UNFINISHED"] = "Chưa hoàn thành",
+    ["RUNES_DESC_1"] = "Đài Đúc Phù Văn: Lv{0}",
+    ["RUNES_DESC_2"] = "Bộ Phù Văn",
+    ["RUNES_DESC_3"] = "Đài Đúc Phù Văn Lv{0} mở khóa",
+    ["RUNES_DESC_4"] = "Tôi Luyện Nhanh",
+    ["RUNES_DESC_5"] = "Tôi Luyện",
+    ["RUNES_DESC_6"] = "Phù Văn",
+    ["RUNES_DESC_7"] = "Cấp Đài Đúc Phù Văn",
+    ["RUNES_DESC_8"] = "1.Tiêu hao Tinh Túy Phù Văn tăng cấp Đài Đúc Phù Văn.\n2.Cấp Đài Đúc Phù Văn sẽ mở khóa ô Phù Văn, có TL tôi luyện ra Phù Văn phẩm cao.\n3.Tất cả Anh Hùng dùng chung cấp Đài Đúc Phù Văn.\n4.Cùng 1 loại thuộc tính, tối đa chỉ xuất hiện 2 thuộc tính.",
+    ["RUNES_DESC_9"] = "HQ Bộ Phù Văn",
+    ["RUNES_DESC_10"] = "Bộ HP",
+    ["RUNES_DESC_11"] = "Bộ Công",
+    ["RUNES_DESC_12"] = "Bộ Tăng ST",
+    ["RUNES_DESC_13"] = "Bộ Bạo",
+    ["RUNES_DESC_14"] = "Bộ ST Bạo",
+    ["RUNES_DESC_15"] = "Lv1: 2 bộ: {0}",
+    ["RUNES_DESC_16"] = "Lv2: 4 Bộ: {0}",
+    ["RUNES_DESC_17"] = "Quà Phù Văn Ngày",
+    ["RUNES_DESC_18"] = "Thiếu VL cường hóa",
+    ["RUNES_DESC_19"] = "Thiếu Tinh Hoa Phù Văn, hết cách rồi",
+    ["RUNES_DESC_20"] = "Nhận từ Tháp Phù Văn",
+    ["RUNES_DESC_21"] = "Tôi Luyện Nhanh, chỉ dừng lại khi xuất hiện Phù Văn S và SS hoặc khi thiếu Tinh Túy Phù Văn, xác định bắt đầu chứ?",
+    ["RUNES_DESC_22"] = "Thuộc tính Phù Văn",
+    ["RUNES_DESC_23"] = "Không có HQ Bộ",
+    ["RUNES_DESC_24"] = "Hãy kích hoạt Anh Hùng trước",
+    ["RUNES_DESC_25"] = "Tôi Luyện Phù Văn ít nhất phải giữ lại 1 Phù Văn chưa khóa",
+    ["RUNES_DESC_26"] = "Lv{0}",
+    ["RUNES_DESC_27"] = "Đài Đúc Phù Văn Lv{0} mở khóa",
+    ["DUNGEON_RUNE_DESC_1"] = "Mục tiêu",
+    ["DUNGEON_RUNE_DESC_2"] = "Khiêu chiến lại",
+    ["DUNGEON_RUNE_DESC_3"] = "Vượt ải nhận được",
+    ["DUNGEON_RUNE_DESC_4"] = "Càn quét nhận được",
+    ["DUNGEON_RUNE_DESC_5"] = "Vượt ải xong được càn quét",
+    ["DUNGEON_RUNE_DESC_6"] = "Chiến tích",
+    ["DUNGEON_RUNE_DESC_7"] = "Từ bỏ cơ hội",
+    ["DUNGEON_RUNE_DESC_8"] = "Mùa giải",
+    ["DUNGEON_RUNE_DESC_9"] = "Mùa giải trước",
+    ["DUNGEON_RUNE_DESC_10"] = "Cao nhất: {0}",
+    ["DUNGEON_RUNE_DESC_11"] = "Số hiệp: {0}",
+    ["ACTIVITY_MOON_DESC_2"] = "Quà Chọn",
+    ["ACTIVITY_MOON_DESC_3"] = "Anh Hùng mới",
+    ["ACTIVITY_MOON_DESC_4"] = "Quà Chọn Anh Hùng!",
+    ["ACTIVITY_MOON_DESC_7"] = "Tùy Chọn Anh Hùng",
+    ["ACTIVITY_MOON_DESC_8"] = "Có thể chọn Anh Hùng đã kích hoạt",
+    ["ACTIVITY_MOON_DESC_9"] = "Skin Tiệc Trăng Tròn, ra mắt hạn giờ!",
+    ["ACTIVITY_MOON_DESC_11"] = "Mọi nhiệm vụ đã hoàn thành!",
     ["SEIZED_DESC_4"] = "Chúng tôi phát hiện bạn đang sử dụng client không hợp lệ, không thể vào game được, hãy đến Cửa Hàng ứng dụng chính thống tải về",
+    ["ACT_PVP_DESC_2"] = "Vào",
+    ["ACT_PVP_DESC_3"] = "Thắng: {0}/{1} Thua: {2}/{3}",
+    ["ACT_PVP_DESC_4"] = "Quỹ Quán Rượu",
+    ["ACT_PVP_DESC_5"] = "Quà Tích Lũy Thắng Ngày",
+    ["ACT_PVP_DESC_6"] = "Quán Rượu Incubus",
+    ["ACT_PVP_DESC_7"] = "{0} thắng",
+    ["ACT_PVP_DESC_8"] = "Hãy chọn Anh Hùng {0}",
+    ["ACT_PVP_DESC_10"] = "Làm mới miễn phí",
+    ["ACT_PVP_DESC_11"] = "Anh Hùng đợi chọn ở vòng sau",
+    ["ACT_PVP_DESC_14"] = "Trận thắng tích lũy",
+    ["ACT_PVP_DESC_15"] = "Điểm Quán Rượu",
+    ["ACT_PVP_DESC_16"] = "Chào mừng tham gia Quỹ Quán Rượu, thách đấu đối thủ trong Quán Rượu, tích lũy điểm và nhận hoa hồng nhé!",
+    ["ACT_PVP_DESC_17"] = "Trận thắng tích lũy",
+    ["ACT_PVP_DESC_18"] = "1.Trong sự kiện, tất cả trận thắng trong Quán Rượu đều sẽ được ghi nhận và dùng để XH.\n2.Sự kiện tổng 7 ngày, ngày thứ 8 được nhận quà XH.\n3.Hãy nhận quà kịp thời, hết hạn sẽ không thể nhận bù.",
+    ["ACT_PVP_DESC_19"] = "Thắng: {0}",
+    ["ACT_PVP_DESC_20"] = "Thua: {0}",
+    ["ACT_PVP_DESC_21"] = "1.Quán Rượu mỗi ngày có 1 lượt vào miễn phí, sau khi vào chon ngẫu nhiên 5 Anh Hùng để xây dựng đội của mình. Tất cả Anh Hùng do Quán Rượu cung cấp, không kế thừa thuộc tính của bạn, nhưng có thể dùng Skin của bạn.",
+    ["ACT_PVP_DESC_22"] = "2.Sau khi xây dựng xong đội của mình, bạn sẽ được bắt cặp đối thủ có số trận thắng bằng với bạn, mỗi lần thắng sẽ tăng 1 lần cấp độ cho Anh Hùng. Anh Hùng của mọi phẩm chất ban đầu đều là Lv6.",
+    ["ACT_PVP_DESC_23"] = "3.Tích lũy thắng 10 lần hoặc thua 2 lần đều sẽ rời Quán Rượu, cần vào lại từ đầu. Trận thắng tích lũy trong ngày được nhận thêm quà chiến thắng tích lũy.",
+    ["ACT_PVP_TALK_DESC_1"] = "Xin chào, hôm nay muốn chơi 1 trận không?",
+    ["ACT_PVP_TALK_DESC_2"] = "Kẻ mạnh được nhận quà chiến thắng tích lũy mỗi ngày!",
+    ["ACT_PVP_TALK_DESC_3"] = "Uhm, nghe thú vị đấy, chúng ta bắt đầu nào!",
+    ["ACT_PVP_TALK_DESC_4"] = "Ta luôn sẵn sàng, đã sẵn sàng hạ gục chúng chưa?",
+    ["ACT_PVP_TALK_DESC_5"] = "Hãy ngồi lại và thư giãn, để ta chăm sóc bạn.",
+    ["ACT_PVP_TALK_DESC_6"] = "Bạn thật lợi hại, thắng liên tiếp 10 ván đã lâu không xuất hiện trong quán rượu của chúng tôi rồi!",
+    ["ACT_PVP_TALK_DESC_7"] = "Incubus ta hôm nay xem như gặp được người lợi hại rồi, vị đại nhân thắng 10 ván liên tiếp, hoan nghênh lần sau quay lại nhé!",
+    ["ACT_PVP_TALK_DESC_8"] = "Bị hạ gục rồi? Đừng nản, thử thêm lần nữa!",
+    ["ACT_PVP_TALK_DESC_9"] = "Thua rồi không sao cả, lần sau dùng Incubus ta ra trận chắc chắn sẽ thắng.",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="Thiên Thạch Ảm Đạm",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/config/strings/zh/avatar_frame.lua

@@ -19,9 +19,12 @@ local avatar_frame = {
 	},
 	[29]={
 		["desc"]="S3競技場黃金頭像框，實力的證明。"
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=7
+data=avatar_frame,count=8
 }
 return config

lua/app/config/strings/zh/global.lua

@@ -512,7 +512,93 @@ local localization_global =
     ["ACT_BOSS_RUSH_DESC_33"] = "階段{0}解鎖",
     ["NOT_POP_TODAY"] = "今日不再提醒",
     ["ACT_BOSS_RUSH_DESC_34"] = "退出後，將按照當前波次結算戰鬥，是否退出？",
+    ["DUNGEON_RUNE_TITLE"] = "符文之塔",
+    ["DUNGEON_RUNE_DESC"] = "挑戰神秘之塔，收集符文精粹。",
+    ["DUNGEON_RUNE_HELP"] = "1. 每天將重置10枚【金羽毛】和10枚【銀羽毛】。 \n2.挑戰未通關層數需要使用1枚【金羽毛】，通關後可獲得1次通關獎勵。 \n3. 每10層為首領層，首領層通關後可使用【銀羽毛】掃蕩獲得【符文精粹】。",
+    ["DUNGEON_RUNE_QUEST_1"] = "{0}回合內完成目標",
+    ["DUNGEON_RUNE_QUEST_2"] = "消除{0}個{1}",
+    ["DUNGEON_RUNE_QUEST_3"] = "消除{0}個此障礙物",
+    ["DUNGEON_RUNE_QUEST_4"] = "擊殺{0}個小怪",
+    ["DUNGEON_RUNE_TIP_2"] = "還不能放棄……",
+    ["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"] = "符文套裝",
+    ["RUNES_DESC_3"] = "符文鑄台{0}級解鎖",
+    ["RUNES_DESC_4"] = "一鍵淬鍊",
+    ["RUNES_DESC_5"] = "淬鍊",
+    ["RUNES_DESC_6"] = "符文",
+    ["RUNES_DESC_7"] = "符文鑄台等級",
+    ["RUNES_DESC_8"] = "1.使用符文精粹提高符文鑄台等級。 \n2.符文鑄台等級提高將解鎖符文欄，有機率淬煉出高品質符文。 \n3.所有英雄符文鑄台等級共享。 \n4.同一種屬性，最多只會出現2條。",
+    ["RUNES_DESC_9"] = "符文套裝效果",
+    ["RUNES_DESC_10"] = "生命套裝",
+    ["RUNES_DESC_11"] = "攻擊套裝",
+    ["RUNES_DESC_12"] = "增傷套裝",
+    ["RUNES_DESC_13"] = "暴擊套裝",
+    ["RUNES_DESC_14"] = "爆傷套裝",
+    ["RUNES_DESC_15"] = "Lv1:2件套:{0}",
+    ["RUNES_DESC_16"] = "Lv2:4件套:{0}",
+    ["RUNES_DESC_17"] = "符文每日禮包",
+    ["RUNES_DESC_18"] = "強化材料不足",
+    ["RUNES_DESC_19"] = "符文精華不足，洋蔥頭也沒辦法",
+    ["RUNES_DESC_20"] = "符文之塔獲得",
+    ["RUNES_DESC_21"] = "一鍵淬鍊，只有在出現S和SS符文或符文精粹不足時會停止，是否開始？",
+    ["RUNES_DESC_22"] = "符文屬性",
+    ["RUNES_DESC_23"] = "無套裝效果",
+    ["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_8"] = "本賽季",
+    ["DUNGEON_RUNE_DESC_9"] = "上賽季",
+    ["DUNGEON_RUNE_DESC_10"] = "最高：{0}",
+    ["DUNGEON_RUNE_DESC_11"] = "回合數：{0}",
+    ["ACTIVITY_MOON_DESC_2"] = "自選禮包",
+    ["ACTIVITY_MOON_DESC_3"] = "新英雄",
+    ["ACTIVITY_MOON_DESC_4"] = "英雄自選禮包！",
+    ["ACTIVITY_MOON_DESC_7"] = "英雄自選",
+    ["ACTIVITY_MOON_DESC_8"] = "可選擇已啟用的英雄",
+    ["ACTIVITY_MOON_DESC_9"] = "圓月慶典造型，限時登場！",
+    ["ACTIVITY_MOON_DESC_11"] = "所有任務均已完成！",
     ["SEIZED_DESC_4"] = "我們檢測到您正在使用非法客戶端，您將無法進行遊戲，請前往正規應用商店下載。",
+    ["ACT_PVP_DESC_2"] = "進入",
+    ["ACT_PVP_DESC_3"] = "勝：{0}/{1} 敗：{2}/{3}",
+    ["ACT_PVP_DESC_4"] = "酒館基金",
+    ["ACT_PVP_DESC_5"] = "每日連勝獎勵",
+    ["ACT_PVP_DESC_6"] = "夢魔酒館",
+    ["ACT_PVP_DESC_7"] = "{0}勝",
+    ["ACT_PVP_DESC_8"] = "請選擇{0}英雄",
+    ["ACT_PVP_DESC_10"] = "免費刷新",
+    ["ACT_PVP_DESC_11"] = "下輪待選英雄",
+    ["ACT_PVP_DESC_14"] = "累積勝場",
+    ["ACT_PVP_DESC_15"] = "酒館積分",
+    ["ACT_PVP_DESC_16"] = "歡迎入股酒館基金，在酒館挑戰對手，累積積分可領取獎勵分紅喲~",
+    ["ACT_PVP_DESC_17"] = "累積勝場",
+    ["ACT_PVP_DESC_18"] = "1.活動期間在酒館中的所有勝場都將累積記錄用於排名。 \n2.活動一共七天，第八天時可領取排名獎勵。 \n3.獎勵請及時領取，過期將無法補發。",
+    ["ACT_PVP_DESC_19"] = "勝：{0}",
+    ["ACT_PVP_DESC_20"] = "敗：{0}",
+    ["ACT_PVP_DESC_21"] = "1.酒館每日有1次免費進入機會，進入後先隨機選取5名英雄組成自己的隊伍。所有英雄由酒館提供，不繼承你的屬性，但可以使用你的造型。",
+    ["ACT_PVP_DESC_22"] = "2.組建好自己的隊伍後，您將匹配跟自己本次勝場數相同的對手，每次勝利後英雄將提高1次等級。所有品質的英雄起始都為6級。",
+    ["ACT_PVP_DESC_23"] = "3.累積勝利10次或失敗2次都將退出酒館，需要重新進入。今日內的勝場累積可領取額外連勝獎勵。",
+    ["ACT_PVP_TALK_DESC_1"] = "嗨~今天想來一局嗎？",
+    ["ACT_PVP_TALK_DESC_2"] = "強者，每天可以領取連勝獎勵！",
+    ["ACT_PVP_TALK_DESC_3"] = "嗯，這聽起來很有趣，我們開始吧！",
+    ["ACT_PVP_TALK_DESC_4"] = "我隨時奉陪，準備好要打敗他們了嗎？",
+    ["ACT_PVP_TALK_DESC_5"] = "請坐下來，放鬆心情，讓我來照顧您。",
+    ["ACT_PVP_TALK_DESC_6"] = "您真厲害，10勝好久沒在我們酒館出現過了！",
+    ["ACT_PVP_TALK_DESC_7"] = "夢魔我今日可算見著厲害的人了，10勝的大人歡迎再來！",
+    ["ACT_PVP_TALK_DESC_8"] = "被打敗啦？別灰心~再來呀！",
+    ["ACT_PVP_TALK_DESC_9"] = "失敗了沒關係，下次用我夢魔出場一定贏。",
 }
 
 return localization_global

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

@@ -214,6 +214,9 @@ local item = {
 	},
 	[56]={
 
+	},
+	[57]={
+
 	},
 	[1001]={
 		["name"]="暗淡隕鐵",
@@ -482,6 +485,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=122
+data=item,count=123
 }
 return config

lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua

@@ -7,7 +7,6 @@ function FullMoonTaskCell:init()
     self.txDesc = uiMap["full_moon_task_cell.tx_desc"]
     self.imgProg = uiMap["full_moon_task_cell.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
     self.txProg = uiMap["full_moon_task_cell.prog.tx_prog"]
-    self.txRewardName = uiMap["full_moon_task_cell.tx_reward_name"]
     self.imgRewardIcon = uiMap["full_moon_task_cell.icon_reward"]
     self.txNum = uiMap["full_moon_task_cell.tx_num"]
     self.finish = uiMap["full_moon_task_cell.finish"]
@@ -30,7 +29,6 @@ function FullMoonTaskCell:refresh(id)
     self.txDesc:setText(GFunc.getTaskDesc(taskType, total))
     self.imgProg.value = cur / total
     self.txProg:setText(cur .. "/" .. total)
-    self.txRewardName:setText(GFunc.getRewardName(reward.type, reward.id))
     self.imgRewardIcon:setSprite(GFunc.getRewardIconRes(reward.type, reward.id))
     self.txNum:setText(GFunc.getRewardNum(reward))
     self.txFinish:setText(I18N:getGlobalText(I18N.GlobalConst.STR_COMPLETED))

lua/app/ui/activity/full_moon/full_moon_task_comp.lua

@@ -21,7 +21,7 @@ function FullMoonTaskComp:init()
         end
     end
     if heroId and skinId then
-        self.txSkin:setText(DataManager.HeroData:getHeroById(heroId):getName() .. "-" .. DataManager.SkinData:getName(skinId) .. "(" .. I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_9) .. ")")
+        self.txSkin:setText(DataManager.HeroData:getHeroById(heroId):getName() .. "-" .. DataManager.SkinData:getName(skinId))
 
         self.spineSkin:getSkeletonGraphic().enabled = false
         self.spineSkin:loadAssetAsync(DataManager.SkinData:getModelId(skinId), function()

lua/app/ui/activity/full_moon/full_moon_ui.lua

@@ -115,9 +115,9 @@ function FullMoonUI:onRefresh()
 	if self.actCountdownSid then
 		self.txCountdown:unscheduleGlobal(self.actCountdownSid)
 	end
-    self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime()))
+    self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FullMoonData:getEndRemainTime()))
 	self.actCountdownSid = self.txCountdown:scheduleGlobal(function()
-        self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime()))
+        self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FullMoonData:getEndRemainTime()))
 	end, 1)
 
     if self.panelType == GConst.FullMoonConst.PANEL_TYPE.TASK then

lua/app/ui/hero/hero_detail_ui.lua

@@ -149,6 +149,16 @@ function HeroDetailUI:onLoadRootComplete()
         self:refreshShow()
     end)
 
+    self:addEventListener(EventManager.CUSTOM_EVENT.RUNE_QUENCHING_SUCCESS, function(tempCount)
+        if DataManager.RunesData:hasRedPoint(tempCount) then
+            self.btnRunes:addRedPoint(-55, 0, 0.6)
+        else
+            self.btnRunes:removeRedPoint()
+        end
+    end)
+    self:bind(DataManager.BagData.ItemData, "dirty", function()
+        self:refreshRedPoint()
+    end)
     self:addEventListener(EventManager.CUSTOM_EVENT.HERO_UPGRADE_SUCCESS, function(id)
         self:refreshRedPoint()
     end)

lua/app/ui/hero/runes_info_comp.lua

@@ -145,6 +145,7 @@ function RunesInfoComp:autoQuenching()
 
     self:refreshSuit()
     self:refreshRunes()
+    EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.RUNE_QUENCHING_SUCCESS, self.tempMaterialCount)
 
     if self.tempMaterialCount < self.tempCostNum then
         -- 材料不够，结束自动淬炼

lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua

@@ -94,6 +94,9 @@ function FourteenDayData:setSyncData()
 end
 
 function FourteenDayData:isOpen()
+    if GFunc.isShenhe() then
+        return false
+    end
     -- 开启条件同七天乐
     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then
         return false

lua/app/userdata/activity/full_moon/full_moon_data.lua

@@ -110,6 +110,10 @@ end
 
 -- 获取需要展示的活动界面
 function FullMoonData:getNeedShowActPanel()
+    -- 引导其间不处理
+    if DataManager.TutorialData:getIsHaveTutorial() then
+        return nil
+    end
     if not self:isOpen() then
         return nil
     end

lua/app/userdata/activity/seven_day/seven_day_data.lua

@@ -56,6 +56,9 @@ function SevenDayData:init(data)
 end
 
 function SevenDayData:getIsOpen()
+    if GFunc.isShenhe() then
+        return false
+    end
     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then
         return false
     end

lua/app/userdata/runes/runes_data.lua

@@ -73,8 +73,8 @@ function RunesData:getRunes(heroId)
 end
 
 -- 是否有红点
-function RunesData:hasRedPoint()
-    return self:getMaterialCount() > GFunc.getConstIntValue("runes_red_point")
+function RunesData:hasRedPoint(tempCount)
+    return (tempCount or self:getMaterialCount()) > GFunc.getConstIntValue("runes_red_point")
 end
 
 -- 获取等级配置