符文副本

lua/app/common/bi_report.lua

@@ -150,6 +150,8 @@ BIReport.ITEM_GET_TYPE = {
 	ACT_FOURTEEN_DAY_TASK = "ActFourteenDayTask",
 	ACT_FOURTEEN_DAY_EXCHANGE = "ActFourteenDayExchange",
 	FOURTEEN_DAY_GIFT = "FourteenDayGift",
+	DUNGEON_RUNE_START = "DungeonRuneStart",
+	DUNGEON_RUNE_SWEEP = "DungeonRuneSweep",
 }
 
 BIReport.ADS_CLICK_TYPE = {
@@ -162,6 +164,7 @@ BIReport.ADS_CLICK_TYPE = {
 	ARENA_REMATCH = "ArenaRematch",
 	ARENA_AD_BOX = "ArenaAdBox",
 	ARMOR_FUND_AD = "ArmorFundAd",
+	DUNGEON_RUNE_REBIRTH = "DungeonRuneRebirth",
 
 	MALL_DAILY = "MallDaily",
 	MALL_DAILY_RESET = "MallDailyReset",

lua/app/common/event_manager.lua

@@ -62,6 +62,7 @@ EventManager.CUSTOM_EVENT = {
 	ACTIVITY_SUMMER_END = "ACTIVITY_SUMMER_END",
 	MAIN_UI_CHECK_SIDE_BAR = "MAIN_UI_CHECK_SIDE_BAR",
 	FORMATION_CHANGE = "FORMATION_CHANGE",
+	BATTLE_REBIRTH = "BATTLE_REBIRTH",
 }
 
 -- 此方法不能直接在外部调用，请使用例如BaseUI，BaseModule等封装好的接口

lua/app/config/act_gift.lua

@@ -5076,7 +5076,7 @@ local act_gift = {
 	},
 	[210102]={
 		["type"]=21,
-		["recharge_id"]=7,
+		["recharge_id"]=5,
 		["reward"]={
 			{
 				["type"]=1,
@@ -5104,9 +5104,83 @@ local act_gift = {
 			}
 		},
 		["limit"]=5
+	},
+	[210202]={
+		["type"]=21,
+		["recharge_id"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		},
+		["limit"]=5
+	},
+	[210302]={
+		["type"]=21,
+		["recharge_id"]=13,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=55,
+ 				["id_for_nothing"]="Uw0=",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		},
+		["limit"]=5
+	},
+	[220102]={
+		["type"]=22,
+		["recharge_id"]=11,
+		["limit"]=1,
+		["value"]=1800
+	},
+	[220202]={
+		["type"]=22,
+		["recharge_id"]=12,
+		["limit"]=1,
+		["value"]=1800
 	}
 }
 local config = {
-data=act_gift,count=114
+data=act_gift,count=118
 }
 return config

lua/app/config/activity_full_moon_quest.lua

@@ -0,0 +1,61 @@
+local activity_full_moon_quest = {
+	[1]={
+		["type"]=40,
+		["number"]=1,
+		["open_stage"]=0
+	},
+	[2]={
+		["type"]=1,
+		["number"]=10,
+		["open_stage"]=0
+	},
+	[3]={
+		["type"]=5,
+		["number"]=100,
+		["open_stage"]=0
+	},
+	[4]={
+		["type"]=41,
+		["number"]=50,
+		["open_stage"]=12
+	},
+	[5]={
+		["type"]=38,
+		["number"]=10,
+		["open_stage"]=8
+	},
+	[6]={
+		["type"]=39,
+		["number"]=10,
+		["open_stage"]=10
+	},
+	[7]={
+		["type"]=30,
+		["number"]=3,
+		["open_stage"]=5
+	},
+	[8]={
+		["type"]=19,
+		["number"]=30,
+		["open_stage"]=0
+	},
+	[9]={
+		["type"]=12,
+		["number"]=6,
+		["open_stage"]=0
+	},
+	[10]={
+		["type"]=11,
+		["number"]=30,
+		["open_stage"]=0
+	},
+	[11]={
+		["type"]=42,
+		["number"]=10,
+		["open_stage"]=12
+	}
+}
+local config = {
+data=activity_full_moon_quest,count=11
+}
+return config

lua/app/config/activity_full_moon_quest.lua.meta

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

lua/app/config/activity_full_moon_reward.lua

@@ -0,0 +1,127 @@
+local activity_full_moon_reward = {
+	[101]={
+		["quest"]=3,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=100,
+ 			["num_for_nothing"]="Vwhc"
+		}
+	},
+	[102]={
+		["quest"]=6,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=10,
+ 			["num_for_nothing"]="Vwg="
+		}
+	},
+	[103]={
+		["quest"]=9,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		}
+	},
+	[104]={
+		["quest"]=12,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=300,
+ 			["num_for_nothing"]="VQhc"
+		}
+	},
+	[105]={
+		["quest"]=15,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=400,
+ 			["num_for_nothing"]="Ughc"
+		}
+	},
+	[106]={
+		["quest"]=18,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=53,
+ 			["id_for_nothing"]="Uws=",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	},
+	[107]={
+		["quest"]=21,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=600,
+ 			["num_for_nothing"]="UAhc"
+		}
+	},
+	[108]={
+		["quest"]=24,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=700,
+ 			["num_for_nothing"]="UQhc"
+		}
+	},
+	[109]={
+		["quest"]=27,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=800,
+ 			["num_for_nothing"]="Xghc"
+		}
+	},
+	[110]={
+		["quest"]=30,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=900,
+ 			["num_for_nothing"]="Xwhc"
+		}
+	},
+	[111]={
+		["quest"]=33,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=5300101,
+ 			["id_for_nothing"]="UwtcA2RRfg==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		}
+	}
+}
+local config = {
+data=activity_full_moon_reward,count=11
+}
+return config

lua/app/config/activity_full_moon_reward.lua.meta

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

lua/app/config/buff.lua

@@ -530,7 +530,7 @@ local buff = {
 		["id"]=59,
 		["name"]="first_hand",
 		["buff_type"]=1,
-		["decr"]=1,
+		["decr"]=3,
 		["icon"]="first_hand"
 	},
 	[60]={
@@ -635,7 +635,8 @@ local buff = {
 		["id"]=72,
 		["name"]="death_summon",
 		["buff_type"]=1,
-		["decr"]=3
+		["decr"]=3,
+		["icon"]="death_summon"
 	},
 	[73]={
 		["id"]=73,
@@ -798,14 +799,14 @@ local buff = {
 		["name"]="charm",
 		["buff_type"]=7,
 		["decr"]=2,
-		["icon"]="self_heal"
+		["icon"]="charm"
 	},
 	[88]={
 		["id"]=88,
 		["name"]="immune",
 		["buff_type"]=7,
 		["decr"]=1,
-		["icon"]="ocean_shield1"
+		["icon"]="immune"
 	}
 }
 local keys = {

lua/app/config/chapter_board_rune.lua.meta

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

lua/app/config/const.lua

@@ -447,6 +447,19 @@ local const = {
 	["dungeon_rune_revival"]={
 		["value"]=5
 	},
+	["dungeon_rune_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=200,
+ 			["num_for_nothing"]="VAhc"
+		}
+	},
+	["dungeon_rune_buylimit"]={
+		["value"]=5
+	},
 	["activity_pvp_time"]={
 		["value"]=1
 	},
@@ -470,11 +483,33 @@ local const = {
  			["num_for_nothing"]="VAg="
 		}
 	},
+	["activity_pvp_win_times"]={
+		["value"]=10
+	},
+	["activity_pvp_lose_times"]={
+		["value"]=2
+	},
 	["activity_pvp_bounty_point"]={
 		["value"]=10
+	},
+	["activity_skin_fight_id_1"]={
+		["value"]=4104
+	},
+	["activity_skin_fight_id_2"]={
+		["value"]=4204
+	},
+	["activity_skin_fight_reward"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=50,
+ 			["num_for_nothing"]="Uwg="
+		}
 	}
 }
 local config = {
-data=const,count=95
+data=const,count=102
 }
 return config

lua/app/config/dungeon_rune_rank.lua

@@ -22,9 +22,7 @@ local dungeon_rune_rank = {
 				["num"]=200,
  				["num_for_nothing"]="VAhc"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[2]={
 		["season"]=1,
@@ -49,9 +47,7 @@ local dungeon_rune_rank = {
 				["num"]=201,
  				["num_for_nothing"]="VAhd"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[3]={
 		["season"]=1,
@@ -76,9 +72,7 @@ local dungeon_rune_rank = {
 				["num"]=202,
  				["num_for_nothing"]="VAhe"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[4]={
 		["season"]=1,
@@ -103,9 +97,7 @@ local dungeon_rune_rank = {
 				["num"]=203,
  				["num_for_nothing"]="VAhf"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[5]={
 		["season"]=1,
@@ -130,9 +122,7 @@ local dungeon_rune_rank = {
 				["num"]=204,
  				["num_for_nothing"]="VAhY"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[6]={
 		["season"]=1,
@@ -157,9 +147,7 @@ local dungeon_rune_rank = {
 				["num"]=205,
  				["num_for_nothing"]="VAhZ"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[7]={
 		["season"]=1,
@@ -184,9 +172,7 @@ local dungeon_rune_rank = {
 				["num"]=206,
  				["num_for_nothing"]="VAha"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[8]={
 		["season"]=1,
@@ -211,9 +197,7 @@ local dungeon_rune_rank = {
 				["num"]=207,
  				["num_for_nothing"]="VAhb"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[9]={
 		["season"]=1,
@@ -238,9 +222,7 @@ local dungeon_rune_rank = {
 				["num"]=208,
  				["num_for_nothing"]="VAhU"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	},
 	[10]={
 		["season"]=1,
@@ -265,9 +247,7 @@ local dungeon_rune_rank = {
 				["num"]=209,
  				["num_for_nothing"]="VAhV"
 			}
-		},
+		}
-		["time_start"]="2023-9-19 00:00:00",
-		["time_end"]="2023-10-23 00:00:00"
 	}
 }
 local config = {

lua/app/config/dungeon_rune_time.lua

@@ -0,0 +1,16 @@
+local dungeon_rune_time = {
+	[1]={
+		["season"]=1,
+		["start_time"]="2023-9-19 00:00:00",
+		["end_time"]="2023-10-23 00:00:00"
+	},
+	[2]={
+		["season"]=2,
+		["start_time"]="2023-10-23 00:00:00",
+		["end_time"]="2023-11-22 00:00:00"
+	}
+}
+local config = {
+data=dungeon_rune_time,count=2
+}
+return config

lua/app/config/dungeon_rune_time.lua.meta

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

lua/app/config/localization/localization_global_const.lua

@@ -527,6 +527,13 @@ local LocalizationGlobalConst =
 	DUNGEON_RUNE_TIP_4 = "DUNGEON_RUNE_TIP_4",
 	DUNGEON_RUNE_TIP_5 = "DUNGEON_RUNE_TIP_5",
 	UNFINISHED = "UNFINISHED",
+
+	["DUNGEON_RUNE_DESC_1"]= "DUNGEON_RUNE_DESC_1",
+    ["DUNGEON_RUNE_DESC_2"] = "DUNGEON_RUNE_DESC_2",
+    ["DUNGEON_RUNE_DESC_3"] = "DUNGEON_RUNE_DESC_3",
+    ["DUNGEON_RUNE_DESC_4"] = "DUNGEON_RUNE_DESC_4",
+    ["DUNGEON_RUNE_DESC_5"] = "DUNGEON_RUNE_DESC_5",
+	DUNGEON_RUNE_DESC_6 = "DUNGEON_RUNE_DESC_6",
 }
 
 return LocalizationGlobalConst

lua/app/config/monster_chapter.lua

@@ -10077,7 +10077,7 @@ local monster_chapter = {
 		["monster_exp"]=22000
 	},
 	[75201]={
-		["monster_base"]=20048,
+		["monster_base"]=10072,
 		["hp"]=134200000,
 		["atk"]=4910000,
 		["atk_times"]=3,
@@ -10086,11 +10086,7 @@ local monster_chapter = {
 			20206,
 			20207
 		},
-		["skill"]={
+		["monster_exp"]=11000
-			110002,
-			110003
-		},
-		["monster_exp"]=22000
 	},
 	[75301]={
 		["monster_base"]=10069,

lua/app/config/monster_dungeon_rune.lua

@@ -10,7 +10,7 @@ local monster_dungeon_rune = {
 			20077,
 			20078
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[208]={
 		["none"]="大史莱姆（黄）",
@@ -23,7 +23,7 @@ local monster_dungeon_rune = {
 			20071,
 			20072
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[308]={
 		["none"]="大史莱姆（蓝）",
@@ -36,7 +36,7 @@ local monster_dungeon_rune = {
 			20074,
 			20075
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[408]={
 		["none"]="大史莱姆（绿）",
@@ -49,7 +49,7 @@ local monster_dungeon_rune = {
 			20068,
 			20069
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[508]={
 		["none"]="盾刀骷髅兵",
@@ -62,7 +62,7 @@ local monster_dungeon_rune = {
 			20026,
 			20027
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[608]={
 		["none"]="盾刀骷髅兵（有头盔）",
@@ -75,111 +75,111 @@ local monster_dungeon_rune = {
 			20113,
 			20114
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[708]={
 		["none"]="哥布林匕首(蓝)",
 		["monster_base"]=10001,
 		["hp"]=474020000,
 		["atk"]=5340000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20001,
 			20002,
 			20003
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[808]={
 		["none"]="哥布林匕首(紫)",
 		["monster_base"]=10003,
 		["hp"]=554250000,
 		["atk"]=5310000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20007,
 			20008,
 			20009
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[908]={
 		["none"]="哥布林法师（红）",
 		["monster_base"]=10008,
 		["hp"]=298160000,
 		["atk"]=4390000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20022,
 			20023,
 			20024
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[1008]={
 		["none"]="哥布林法师(蓝)",
 		["monster_base"]=10005,
 		["hp"]=525000000,
 		["atk"]=5020000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20013,
 			20014,
 			20015
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[1108]={
 		["none"]="哥布林法师（绿）",
 		["monster_base"]=10006,
 		["hp"]=372560000,
 		["atk"]=4530000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20016,
 			20017,
 			20018
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[1208]={
 		["none"]="哥布林法师（紫）",
 		["monster_base"]=10007,
 		["hp"]=450590000,
 		["atk"]=5230000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20019,
 			20020,
 			20021
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[1308]={
 		["none"]="哥布林斧头(红)",
 		["monster_base"]=10002,
 		["hp"]=426740000,
 		["atk"]=4940000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20004,
 			20005,
 			20006
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[1408]={
 		["none"]="哥布林棍棒(绿)",
 		["monster_base"]=10004,
 		["hp"]=391500000,
 		["atk"]=5410000,
-		["atk_times"]=2,
+		["atk_times"]=3,
 		["hurt_skill"]={
 			20010,
 			20011,
 			20012
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[1508]={
 		["none"]="黑色食人花",
@@ -192,7 +192,7 @@ local monster_dungeon_rune = {
 			20146,
 			20147
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[1608]={
 		["none"]="红色蝙蝠恶魔",
@@ -205,7 +205,7 @@ local monster_dungeon_rune = {
 			20152,
 			20153
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[1708]={
 		["none"]="红色恶魔野猪",
@@ -218,7 +218,7 @@ local monster_dungeon_rune = {
 			20149,
 			20150
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[1808]={
 		["none"]="红色蜥蜴剑士",
@@ -231,7 +231,7 @@ local monster_dungeon_rune = {
 			20137,
 			20138
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[1908]={
 		["none"]="红色幽灵恶魔",
@@ -244,7 +244,7 @@ local monster_dungeon_rune = {
 			20161,
 			20162
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[2008]={
 		["none"]="红色蜘蛛",
@@ -257,7 +257,7 @@ local monster_dungeon_rune = {
 			20134,
 			20135
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[2108]={
 		["none"]="黄发剑士",
@@ -270,7 +270,7 @@ local monster_dungeon_rune = {
 			20086,
 			20087
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[2208]={
 		["none"]="火山甲壳虫",
@@ -283,7 +283,7 @@ local monster_dungeon_rune = {
 			20179,
 			20180
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[2308]={
 		["none"]="火山岩石怪",
@@ -296,7 +296,7 @@ local monster_dungeon_rune = {
 			20176,
 			20177
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[2408]={
 		["none"]="剑盾士兵（黄发）",
@@ -309,7 +309,7 @@ local monster_dungeon_rune = {
 			20098,
 			20099
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[2508]={
 		["none"]="剑盾士兵（蓝发）",
@@ -322,7 +322,7 @@ local monster_dungeon_rune = {
 			20101,
 			20102
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[2608]={
 		["none"]="骷髅弓箭手",
@@ -335,7 +335,7 @@ local monster_dungeon_rune = {
 			20110,
 			20111
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[2708]={
 		["none"]="骷髅枪兵",
@@ -348,7 +348,7 @@ local monster_dungeon_rune = {
 			20029,
 			20030
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[2808]={
 		["none"]="骷髅小法师",
@@ -361,7 +361,7 @@ local monster_dungeon_rune = {
 			20116,
 			20117
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[2908]={
 		["none"]="蓝发剑士",
@@ -374,7 +374,7 @@ local monster_dungeon_rune = {
 			20089,
 			20090
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[3008]={
 		["none"]="蓝色蝙蝠恶魔",
@@ -387,7 +387,7 @@ local monster_dungeon_rune = {
 			20119,
 			20120
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[3108]={
 		["none"]="蓝色独眼蝙蝠",
@@ -400,7 +400,7 @@ local monster_dungeon_rune = {
 			20128,
 			20129
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[3208]={
 		["none"]="蓝色恶魔野猪",
@@ -413,7 +413,7 @@ local monster_dungeon_rune = {
 			20122,
 			20123
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[3308]={
 		["none"]="绿色食人花",
@@ -426,7 +426,7 @@ local monster_dungeon_rune = {
 			20143,
 			20144
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[3408]={
 		["none"]="绿色蜥蜴剑士",
@@ -439,7 +439,7 @@ local monster_dungeon_rune = {
 			20140,
 			20141
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[3508]={
 		["none"]="魔都小枪兵（红）",
@@ -452,7 +452,7 @@ local monster_dungeon_rune = {
 			20167,
 			20168
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[3608]={
 		["none"]="魔都小枪兵（紫）",
@@ -465,7 +465,7 @@ local monster_dungeon_rune = {
 			20170,
 			20171
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[3708]={
 		["none"]="女巫师（蓝）",
@@ -478,7 +478,7 @@ local monster_dungeon_rune = {
 			20092,
 			20093
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[3808]={
 		["none"]="女巫师（紫）",
@@ -491,7 +491,7 @@ local monster_dungeon_rune = {
 			20095,
 			20096
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[3908]={
 		["none"]="青绿鬼火",
@@ -504,7 +504,7 @@ local monster_dungeon_rune = {
 			20158,
 			20159
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[4008]={
 		["none"]="人类弓箭手（红）",
@@ -517,7 +517,7 @@ local monster_dungeon_rune = {
 			20104,
 			20105
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[4108]={
 		["none"]="人类弓箭手（绿）",
@@ -530,7 +530,7 @@ local monster_dungeon_rune = {
 			20107,
 			20108
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[4208]={
 		["none"]="人鱼双匕首（红）",
@@ -543,7 +543,7 @@ local monster_dungeon_rune = {
 			20188,
 			20189
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[4308]={
 		["none"]="人鱼双匕首（蓝）",
@@ -556,7 +556,7 @@ local monster_dungeon_rune = {
 			20185,
 			20186
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[4408]={
 		["none"]="兽人大刀兵（红）",
@@ -569,7 +569,7 @@ local monster_dungeon_rune = {
 			20038,
 			20039
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[4508]={
 		["none"]="兽人大刀兵（黄）",
@@ -582,7 +582,7 @@ local monster_dungeon_rune = {
 			20041,
 			20042
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[4608]={
 		["none"]="兽人大刀兵（蓝）",
@@ -595,7 +595,7 @@ local monster_dungeon_rune = {
 			20035,
 			20036
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[4708]={
 		["none"]="兽人大刀兵（绿）",
@@ -608,7 +608,7 @@ local monster_dungeon_rune = {
 			20032,
 			20033
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[4808]={
 		["none"]="兽人盾骨兵（红）",
@@ -621,7 +621,7 @@ local monster_dungeon_rune = {
 			20047,
 			20048
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[4908]={
 		["none"]="兽人盾骨兵（黄）",
@@ -634,7 +634,7 @@ local monster_dungeon_rune = {
 			20050,
 			20051
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[5008]={
 		["none"]="兽人盾骨兵（蓝）",
@@ -647,7 +647,7 @@ local monster_dungeon_rune = {
 			20053,
 			20054
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[5108]={
 		["none"]="兽人盾骨兵（绿）",
@@ -660,7 +660,7 @@ local monster_dungeon_rune = {
 			20044,
 			20045
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[5208]={
 		["none"]="双斧莫西干（红）",
@@ -673,7 +673,7 @@ local monster_dungeon_rune = {
 			20083,
 			20084
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[5308]={
 		["none"]="双斧莫西干（紫）",
@@ -686,7 +686,7 @@ local monster_dungeon_rune = {
 			20080,
 			20081
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[5408]={
 		["none"]="水蜥蜴",
@@ -699,7 +699,7 @@ local monster_dungeon_rune = {
 			20191,
 			20192
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[5508]={
 		["none"]="小史莱姆（红）",
@@ -712,7 +712,7 @@ local monster_dungeon_rune = {
 			20065,
 			20066
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[5608]={
 		["none"]="小史莱姆（黄）",
@@ -725,7 +725,7 @@ local monster_dungeon_rune = {
 			20059,
 			20060
 		},
-		["monster_exp"]=22000
+		["monster_exp"]=0
 	},
 	[5708]={
 		["none"]="小史莱姆（蓝）",
@@ -738,7 +738,7 @@ local monster_dungeon_rune = {
 			20062,
 			20063
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[5808]={
 		["none"]="小史莱姆（绿）",
@@ -751,7 +751,7 @@ local monster_dungeon_rune = {
 			20056,
 			20057
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[5908]={
 		["none"]="紫色独眼蝙蝠",
@@ -764,7 +764,7 @@ local monster_dungeon_rune = {
 			20125,
 			20126
 		},
-		["monster_exp"]=26000
+		["monster_exp"]=0
 	},
 	[6008]={
 		["none"]="紫色鬼火",
@@ -777,7 +777,7 @@ local monster_dungeon_rune = {
 			20155,
 			20156
 		},
-		["monster_exp"]=29000
+		["monster_exp"]=0
 	},
 	[6108]={
 		["none"]="紫色幽灵恶魔",
@@ -790,7 +790,7 @@ local monster_dungeon_rune = {
 			20164,
 			20165
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[6208]={
 		["none"]="紫色蜘蛛",
@@ -803,127 +803,211 @@ local monster_dungeon_rune = {
 			20131,
 			20132
 		},
-		["monster_exp"]=25000
+		["monster_exp"]=0
 	},
 	[6308]={
 		["none"]="深潜者",
-		["monster_base"]=30001,
+		["monster_base"]=20001,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=4,
 		["hurt_skill"]={
-			20130,
+			30165,
-			20131,
+			30166,
-			20132
+			30167
-		}
+		},
+		["skill"]={
+			30169
+		},
+		["passive_skill"]={
+			30168
+		},
+		["monster_exp"]=0
 	},
 	[6408]={
 		["none"]="黑山羊幼崽",
-		["monster_base"]=30002,
+		["monster_base"]=20002,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=4,
 		["hurt_skill"]={
-			20130,
+			30170,
-			20131,
+			30171,
-			20132
+			30172
-		}
+		},
+		["skill"]={
+			30173
+		},
+		["passive_skill"]={
+			10013
+		},
+		["monster_exp"]=0
 	},
 	[6508]={
 		["none"]="莎布·尼古拉斯",
-		["monster_base"]=30003,
+		["monster_base"]=20003,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=4,
 		["hurt_skill"]={
-			20130,
+			30174,
-			20131,
+			30175,
-			20132
+			30176
-		}
+		},
+		["skill"]={
+			30177,
+			30178
+		},
+		["monster_exp"]=0
 	},
 	[6608]={
 		["none"]="奈亚拉托提普",
-		["monster_base"]=30004,
+		["monster_base"]=20004,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=0,
 		["hurt_skill"]={
-			20130,
+			30179,
-			20131,
+			30180,
-			20132
+			30181
-		}
+		},
+		["skill"]={
+			30182,
+			30183,
+			30184,
+			30185
+		},
+		["monster_exp"]=0
 	},
 	[6708]={
 		["none"]="神秘的兄弟神",
-		["monster_base"]=30005,
+		["monster_base"]=20005,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=4,
 		["hurt_skill"]={
-			20130,
+			30186,
-			20131,
+			30187,
-			20132
+			30188
-		}
+		},
+		["skill"]={
+			30190
+		},
+		["passive_skill"]={
+			30189
+		},
+		["monster_exp"]=0
 	},
 	[6808]={
 		["none"]="兰·提戈斯",
-		["monster_base"]=30006,
+		["monster_base"]=20006,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=4,
 		["hurt_skill"]={
-			20130,
+			30191,
-			20131,
+			30192,
-			20132
+			30193
-		}
+		},
+		["skill"]={
+			30195,
+			30196
+		},
+		["passive_skill"]={
+			30194
+		},
+		["monster_exp"]=0
 	},
 	[6908]={
 		["none"]="克希拉",
-		["monster_base"]=30007,
+		["monster_base"]=20007,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=0,
 		["hurt_skill"]={
-			20130,
+			30197,
-			20131,
+			30198,
-			20132
+			30199
-		}
+		},
+		["skill"]={
+			30200,
+			30201,
+			30202,
+			30203,
+			30204,
+			30205,
+			30206,
+			30207
+		},
+		["monster_exp"]=0
 	},
 	[7008]={
 		["none"]="依德·雅",
-		["monster_base"]=30008,
+		["monster_base"]=20008,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=4,
 		["hurt_skill"]={
-			20130,
+			30208,
-			20131,
+			30209,
-			20132
+			30210
-		}
+		},
+		["skill"]={
+			30212,
+			30213,
+			30214
+		},
+		["passive_skill"]={
+			10013,
+			30211
+		},
+		["monster_exp"]=0
 	},
 	[7108]={
 		["none"]="旧日支配者",
-		["monster_base"]=30009,
+		["monster_base"]=20009,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=0,
 		["hurt_skill"]={
-			20130,
+			30215,
-			20131,
+			30216,
-			20132
+			30217
-		}
+		},
+		["skill"]={
+			30219,
+			30220
+		},
+		["passive_skill"]={
+			10013,
+			10014,
+			30218
+		},
+		["monster_exp"]=0
 	},
 	[7208]={
 		["none"]="阿撒托斯",
-		["monster_base"]=30010,
+		["monster_base"]=20010,
-		["hp"]=205490000,
+		["hp"]=1463200000,
-		["atk"]=3950000,
+		["atk"]=1000000,
-		["atk_times"]=3,
+		["atk_times"]=4,
 		["hurt_skill"]={
-			20130,
+			30221,
-			20131,
+			30222,
-			20132
+			30223
-		}
+		},
+		["skill"]={
+			30225,
+			30226,
+			30227,
+			30228,
+			30229
+		},
+		["passive_skill"]={
+			10013,
+			30224
+		},
+		["monster_exp"]=0
 	}
 }
 local config = {

lua/app/config/skill_rogue.lua

@@ -1526,7 +1526,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=1400321,
+				["num"]=1400421,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1543,7 +1543,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=1400322,
+				["num"]=1400422,
 				["ratio"]=10000,
 				["round"]=999
 			}
@@ -1588,7 +1588,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=1400323,
+				["num"]=1400423,
 				["ratio"]=10000,
 				["round"]=1
 			}
@@ -1605,7 +1605,7 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=1400324,
+				["num"]=1400424,
 				["ratio"]=10000,
 				["round"]=1
 			}

lua/app/config/skin.lua

@@ -133,7 +133,7 @@ local skin = {
 		["model_id"]="p0031",
 		["qlt"]=1,
 		["skin_point"]=0,
-		["hero_id"]=24003
+		["hero_id"]=24004
 	},
 	[32001]={
 		["model_id"]="p0001",

lua/app/config/strings/cn/attr.lua

@@ -278,6 +278,31 @@ local attr = {
 		["id"]=56,
 		["desc"]="生命提升{0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["desc"]="所有伤害提升{0}%",
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["desc"]="所有伤害提升{0}%",
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["desc"]="所有伤害提升{0}%",
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["desc"]="所有伤害提升{0}%",
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["desc"]="所有伤害提升{0}%",
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +362,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

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

@@ -527,6 +527,18 @@ local localization_global =
     ["DUNGEON_RUNE_TIP_4"] = "血量回复至50%",
     ["DUNGEON_RUNE_TIP_5"] = "回合数+5！",
     ["UNFINISHED"] = "未完成",
+
+    ["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}",
 }
 
 return localization_global

lua/app/config/strings/cn/hero.lua

@@ -23,6 +23,9 @@ local hero = {
 		["name"]="恶魔侍者",
 		["desc"]="像闪电一样，不停地攻击！！！！"
 	},
+	[14004]={
+		["name"]="祥瑞魅狐"
+	},
 	[22001]={
 		["name"]="刀妹",
 		["desc"]="剑一出鞘，必要见血。"
@@ -47,6 +50,9 @@ local hero = {
 		["name"]="阿飞",
 		["desc"]="手中的太刀如龙飞舞那是无与伦比的剑术。"
 	},
+	[24004]={
+		["name"]="李"
+	},
 	[32001]={
 		["name"]="洋葱头",
 		["desc"]="盾牌只是为了掩饰下一次突刺。"
@@ -71,6 +77,9 @@ local hero = {
 		["name"]="忍者菲尔",
 		["desc"]="迅猛如风，保护水之王国免受邪恶势力的侵害。"
 	},
+	[34004]={
+		["name"]="绿意之刺"
+	},
 	[42001]={
 		["name"]="冰心",
 		["desc"]="我的心和我的法术一样冰冷。"
@@ -95,6 +104,9 @@ local hero = {
 		["name"]="月之法师",
 		["desc"]="在她的月轮双刃下，夜晚的星辰在她的指尖舞动，魔法的月光照亮了她无限的智慧~"
 	},
+	[44004]={
+		["name"]="牧魂者"
+	},
 	[52001]={
 		["name"]="忍者伦",
 		["desc"]="虽然带的是手里剑，但是最擅长的还是护盾术，忍者伦最大的愿望还是世界和平。"
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="堕落骑士",
 		["desc"]="曾经王国中最杰出的骑士之一，命运使他堕落成为一名诅咒巨剑的使用者。"
+	},
+	[54004]={
+		["name"]="女武神"
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/cn/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="堕落之剑:额外造成一次大量技能伤害，附加<color=#3cff28><u>腐败</u></color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[1400420]={
+		["desc"]="九尾祥瑞：将周围<color=#3cff28>4</color>个元素变色，并造成多次大量技能伤害。"
+	},
+	[2400420]={
+		["desc"]="啊，打！：使用后本次伤害提升，并额外造成多次大量技能伤害。"
+	},
+	[3400420]={
+		["desc"]="刺杀艺术：使用后本次伤害提升，并额外造成多次大量技能伤害。"
+	},
+	[4400420]={
+		["desc"]="飞棺降物：额外造成一次技能伤害，附加<color=#fcb501><u>冰霜</u></color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[5400420]={
+		["desc"]="武神意志：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/cn/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="堕落之剑附加的<color=#3cff28>昏睡</color>效果，回合数<color=#3cff28>+1</color>。"
+	},
+	[1400400]={
+		["desc"]="解锁九尾祥瑞：将周围<color=#3cff28>4</color>个元素变色，并造成多次大量技能伤害。"
+	},
+	[1400401]={
+		["desc"]="九尾祥瑞可附加<color=#3cff28>魅惑</color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[1400402]={
+		["desc"]="<color=#fcff28>Combo</color>:祥瑞普攻对<color=#3cff28>流血</color>敌人额外增伤。"
+	},
+	[1400403]={
+		["desc"]="九尾祥瑞周围变色元素<color=#3cff28>+4</color>."
+	},
+	[1400404]={
+		["desc"]="九尾祥瑞附加的<color=#3cff28>魅惑</color>效果，回合数<color=#3cff28>+1</color>。"
+	},
+	[1400405]={
+		["desc"]="九尾祥瑞可为团队附加<color=#3cff28>亢奋</color>效果，<color=#3cff28>2</color>回合。"
+	},
+	[1400406]={
+		["desc"]="祥瑞攻击提升<color=#3cff28>15%</color>。"
+	},
+	[1400407]={
+		["desc"]="九尾祥瑞激活所需能量<color=#3cff28>-2</color>。"
+	},
+	[2400400]={
+		["desc"]="解锁双截龙棍：使用后本次伤害提升，并额外造成多次大量技能伤害。"
+	},
+	[2400401]={
+		["desc"]="双截龙棍技能伤害提升。"
+	},
+	[2400402]={
+		["desc"]="双截龙棍沿＋方向可额外消除<color=#3cff28>4</color>格。"
+	},
+	[2400403]={
+		["desc"]="龙哥普攻有<color=#3cff28>5%</color>概率附加<color=#3cff28>眩晕</color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[2400404]={
+		["desc"]="双截龙棍沿X方向可额外消除<color=#3cff28>4</color>格。"
+	},
+	[2400405]={
+		["desc"]="双截龙棍可附加<color=#3cff28>流血</color>效果，<color=#3cff28>2</color>回合。"
+	},
+	[2400406]={
+		["desc"]="<color=#fcff28>Combo</color>:龙哥普攻对<color=#3cff28>冰霜</color>和<color=#3cff28>流血</color>敌人额外增伤。"
+	},
+	[2400407]={
+		["desc"]="双截龙棍附加的<color=#3cff28>眩晕</color>效果概率提高至<color=#3cff28>10%</color>，回合数<color=#3cff28>+1</color>。"
+	},
+	[3400400]={
+		["desc"]="解锁刺杀艺术：使用后本次伤害提升，并额外造成多次大量技能伤害。"
+	},
+	[3400401]={
+		["desc"]="刺杀艺术可恢复一定量生命。"
+	},
+	[3400402]={
+		["desc"]="绿意之刺普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>中毒</color>效果，<color=#3cff28>2</color>回合。"
+	},
+	[3400403]={
+		["desc"]="刺杀艺术技能伤害提升。"
+	},
+	[3400404]={
+		["desc"]="刺杀艺术恢复生命效果提升。"
+	},
+	[3400405]={
+		["desc"]="绿意之刺每击杀<color=#3cff28>1</color>个敌人，全体生命提升<color=#3cff28>10%</color>。"
+	},
+	[3400406]={
+		["desc"]="绿意之刺沿X方向可额外消除<color=#3cff28>4</color>格。"
+	},
+	[3400407]={
+		["desc"]="绿意之刺链接<color=#3cff28>6</color>个元素及以上时，技能攻击额外释放一次。"
+	},
+	[4400400]={
+		["desc"]="解锁飞棺降物：额外造成一次技能伤害，附加<color=#fcb501>冰霜</color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[4400401]={
+		["desc"]="已逝行者普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。"
+	},
+	[4400402]={
+		["desc"]="飞棺降物可附加<color=#3cff28>虚弱</color>效果，<color=#3cff28>2</color>回合。"
+	},
+	[4400403]={
+		["desc"]="飞棺降物附加的<color=#3cff28>冰霜</color>效果，回合数<color=#3cff28>+1</color>。"
+	},
+	[4400404]={
+		["desc"]="<color=#fcff28>Combo</color>:已逝行者普攻对<color=#3cff28>腐败</color>敌人将恢复生命。"
+	},
+	[4400405]={
+		["desc"]="飞棺降物释放后为团队附加<color=#3cff28>重生</color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[4400406]={
+		["desc"]="飞棺降物沿＋方向可额外消除<color=#3cff28>8</color>格。"
+	},
+	[4400407]={
+		["desc"]="飞棺降物附加的<color=#3cff28>重生</color>效果恢复能力增强，回合数<color=#3cff28>+1</color>。"
+	},
+	[5400400]={
+		["desc"]="解锁武神意志：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"
+	},
+	[5400401]={
+		["desc"]="武神意志随机消除元素<color=#3cff28>+2</color>。"
+	},
+	[5400402]={
+		["desc"]="<color=#fcff28>Combo</color>:女武神普攻<color=#3cff28>冰霜</color>敌人有<color=#3cff28>10%</color>概率附加<color=#3cff28>冻结</color>效果，1回合。"
+	},
+	[5400403]={
+		["desc"]="武神意志释放后为团队附加<color=#3cff28>免疫</color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[5400404]={
+		["desc"]="武神意志释放后为团队附加<color=#3cff28>反击</color>效果，<color=#3cff28>2</color>回合。"
+	},
+	[5400405]={
+		["desc"]="武神意志附加的<color=#3cff28>免疫</color>效果，回合数<color=#3cff28>+1</color>。"
+	},
+	[5400406]={
+		["desc"]="女武神普攻附加的<color=#3cff28>冻结</color>效果，回合数<color=#3cff28>+1</color>。"
+	},
+	[5400407]={
+		["desc"]="武神意志释放后为团队附加<color=#3cff28>不死</color>效果，<color=#3cff28>2</color>回合。"
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/cn/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="防具升级{0}次"
+	},
+	[40]={
+		["desc"]="购买任意礼包{0}次"
+	},
+	[41]={
+		["desc"]="获得{0}个符文精粹"
+	},
+	[52]={
+		["desc"]="符文洗练{0}次"
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/de/attr.lua

@@ -222,6 +222,26 @@ local attr = {
 	[56]={
 		["id"]=56,
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -281,12 +301,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/de/hero.lua

@@ -16,6 +16,9 @@ local hero = {
 	},
 	[14003]={
 
+	},
+	[14004]={
+
 	},
 	[22001]={
 
@@ -34,6 +37,9 @@ local hero = {
 	},
 	[24003]={
 
+	},
+	[24004]={
+
 	},
 	[32001]={
 
@@ -52,6 +58,9 @@ local hero = {
 	},
 	[34003]={
 
+	},
+	[34004]={
+
 	},
 	[42001]={
 
@@ -70,6 +79,9 @@ local hero = {
 	},
 	[44003]={
 
+	},
+	[44004]={
+
 	},
 	[52001]={
 
@@ -88,9 +100,12 @@ local hero = {
 	},
 	[54003]={
 
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/de/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/de/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/de/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/en/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="HP +{0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/en/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="Devil Waiter",
 		["desc"]="Attacking incessantly like lightning!!!!"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="Blade Maid",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="Ferris",
 		["desc"]="The katana in his hand dances like a dragon. That's unparalleled swordsmanship."
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="Onion",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="Ninja Phil",
 		["desc"]="Swift as the wind, protecting the Water Kingdom from the evil forces."
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="Iceheart",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="Lunar Mage",
 		["desc"]="Beneath her chakram, the stars of the night dance at her fingertips, as the magical moonlight illuminates her boundless wisdom~"
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="Ninja Lun",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="Fallen Knight",
 		["desc"]="Once one of the most distinguished knights in the kingdom. Fate turned him into a cursed claymore wielder."
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/en/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="Fallen Sword: Deal one additional hit of massive skill damage and inflict <color=#3cff28><u>Corruption</u></color> for <color=#3cff28>1</color> turn."
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/en/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="Fallen Sword <color=#3cff28>Drowsy</color> effect lasts +<color=#3cff28>1</color> turns."
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/en/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="Upgrade armor {0} times"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/es/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="HP +{0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/es/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="Sirviente Diablo",
 		["desc"]="Ataca incesantemente como un rayo."
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="Chica con Daga",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="Matón",
 		["desc"]="La katana que tiene en la mano vuela como un dragón, es una esgrima incomparable."
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="Cabeza de Cebolla",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="Ninja Phil",
 		["desc"]="Veloz como viento, y protege el Reino del Agua de las fuerzas del mal."
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="Alma Glacial",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="Maga Lunar",
 		["desc"]="Bajo su espada lunar, las estrellas bailan en la punta de sus dedos, y la mágica luz de la luna ilumina su infinita sabiduría."
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="Ninja Jay",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="Jinete Caído",
 		["desc"]="Fue uno de los jinetes más distinguidos del reino, pero el destino lo ha corrompido para convertirle en un portador de la enorme espada maldecida."
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/es/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="Espada Caída: causa un masivo daño de habilidad adicional, con efecto de <color=#fcb501><u>Corrupto</u></color> durante <color=#3cff28>1</color> ronda."
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/es/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="El efecto de <color=#3cff28>Dormido</color> aplicado por Espada Caída dura <color=#3cff28>+1</color> ronda."
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/es/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="Mejora armadura {0} veces"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/fr/attr.lua

@@ -222,6 +222,26 @@ local attr = {
 	[56]={
 		["id"]=56,
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -281,12 +301,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/fr/hero.lua

@@ -16,6 +16,9 @@ local hero = {
 	},
 	[14003]={
 
+	},
+	[14004]={
+
 	},
 	[22001]={
 
@@ -34,6 +37,9 @@ local hero = {
 	},
 	[24003]={
 
+	},
+	[24004]={
+
 	},
 	[32001]={
 
@@ -52,6 +58,9 @@ local hero = {
 	},
 	[34003]={
 
+	},
+	[34004]={
+
 	},
 	[42001]={
 
@@ -70,6 +79,9 @@ local hero = {
 	},
 	[44003]={
 
+	},
+	[44004]={
+
 	},
 	[52001]={
 
@@ -88,9 +100,12 @@ local hero = {
 	},
 	[54003]={
 
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/fr/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/fr/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/fr/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/id/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="HP +{0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/id/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="Pelayan Demon",
 		["desc"]="Menyerang tanpa henti bagai kilat!!!"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="Gadis Pedang",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="Avie",
 		["desc"]="Katana di tangannya menari-nari seperti naga. Itu adalah ilmu pedang yang tak tertandingi."
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="Kepala Bawang",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="Ninja Phil",
 		["desc"]="Secepat angin, melindungi Kerajaan Air dari kekuatan jahat."
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="Hati Es",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="Penyihir Lunar",
 		["desc"]="Bintang-bintang malam menari di ujung jari dan di bawah cakramnya, saat cahaya bulan yang ajaib menerangi kebijaksanaannya yang tak terbatas."
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="Ninja Jay",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="Ksatria Karunia",
 		["desc"]="Pernah menjadi salah satu ksatria paling terhormat di kerajaan. Takdir mengubahnya menjadi pengguna senjata tanah liat terkutuk."
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/id/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="Pedang Karunia: Memberikan satu serangan tambahan dari DMG skill masif dan memberikan efek <color=#3cff28><u>Korosi</u></color> selama <color=#3cff28>1</color> giliran."
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/id/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="Efek <color=#3cff28>Kantuk</color> yang melekat pada Ksatria Karunia <color=#3cff28>+1</color> giliran."
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/id/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="Upgrade Armor {0} kali"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/ja/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="HPが{0}増加する",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/ja/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="デビルウェイター",
 		["desc"]="稲妻のように、攻撃を止めるな！！！！"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="ブレードメイド",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="トビ",
 		["desc"]="手にした刀は龍の如く舞い、無類の剣技。"
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="タマネギ",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="忍者フィル",
 		["desc"]="風のように素早く、邪悪な力から水の王国を守る。"
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="氷心",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="月の法師",
 		["desc"]="月の刃の下で、夜の星が彼女の指先で踊り、魔法の月光が彼女の無限の知恵を照らす~"
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="忍者リン",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="堕落騎士",
 		["desc"]="かつて王国屈指の騎士であった彼は、運命に呪われ、呪いの剣の使い手となった。"
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/ja/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="堕落の剣：追加で大ダメージを与えるスキルを1回発動し、敵に<color=#3cff28>1</color>ターン<color=#3cff28><u>腐敗</u></color>効果を付与する。"
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/ja/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="「堕落の剣」の<color=#3cff28>昏睡</color>効果のターン数が<color=#3cff28>+1</color>。"
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/ja/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="防具を{0}回レベルアップする"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/ko/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="HP +{0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/ko/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="악마 시종",
 		["desc"]="멈추지 않고 번개처럼 공격하라! ! ! !"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="블레이드",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="아피",
 		["desc"]="손에 들린 태도의 움직임이 용이 춤을 추듯 하니 비할 데 없는 검술의 소유자."
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="양파 헤드",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="닌자 필",
 		["desc"]="바람처럼 빠르고 강력하게 물의 왕국을 사악한 세력의 침략으로부터 지켜내리라."
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="얼음의 심장",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="달의 마법사",
 		["desc"]="그녀의 달빛 쌍날과 함께 밤하늘의 별들이 그녀의 손끝에서 춤을 추고 마법의 달빛이 그녀의 무한한 지혜를 비춰준다."
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="닌자 룬",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="타락한 기사",
 		["desc"]="한때 왕국에서 가장 뛰어난 기사 중 한 명이었지만, 운명은 그를 저주받은 거대한 검의 사용자로 타락시켰다."
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/ko/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="타락한 검: 추가로 대량의 스킬 피해를 한 번 입히며 <color=#3cff28>1</color>턴 동안 <color=#3cff28><u>부패</u></color> 효과를 부여합니다."
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/ko/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="타락한 검이 <color=#3cff28>수면</color> 효과를 부여하는 턴의 횟수 <color=#3cff28>+1</color>"
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/ko/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="방어구 업그레이드 {0}회"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/pt/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="Aumento de Vida {0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/pt/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="Serviçal do Demônio",
 		["desc"]="Atacando sem parar, feito um relâmpago!!!!"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="Senhorita dos Gumes",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="Vândalo",
 		["desc"]="A catana em sua mão dança como um dragão, sua perícia com a espada é inigualável."
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="Cabeça de Cebola",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="Ninja Phil",
 		["desc"]="Veloz como o vento, ele protege o Reino da Água das forças do mal."
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="Alma Glacial",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="Mago da Lua",
 		["desc"]="Sob suas lâminas da lua cheia, as estrelas da noite dançam nas pontas dos dedos dela, e o luar mágico ilumina sua infinita sabedoria~"
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="Luninja",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="Cavaleiro Caído",
 		["desc"]="Em outras épocas ele já foi um dos cavaleiros mais ilustres do reino, mas o destino o corrompeu e fez dele portador da espada larga amaldiçoada."
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/pt/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="Espada Corrompida: Causa uma grande quantidade de dano de habilidade, adiciona efeito de <color=#3cff28><u>corrupção</u></color> por <color=#3cff28>1</color> rodada."
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/pt/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="Duração do efeito de <color=#3cff28>atordoamento</color> acionado pela Espada Corrompida <color=#3cff28>+1</color> turno."
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/pt/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="Aprimore Armaduras {0} vezes."
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/ru/attr.lua

@@ -222,6 +222,26 @@ local attr = {
 	[56]={
 		["id"]=56,
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -281,12 +301,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/ru/hero.lua

@@ -16,6 +16,9 @@ local hero = {
 	},
 	[14003]={
 
+	},
+	[14004]={
+
 	},
 	[22001]={
 
@@ -34,6 +37,9 @@ local hero = {
 	},
 	[24003]={
 
+	},
+	[24004]={
+
 	},
 	[32001]={
 
@@ -52,6 +58,9 @@ local hero = {
 	},
 	[34003]={
 
+	},
+	[34004]={
+
 	},
 	[42001]={
 
@@ -70,6 +79,9 @@ local hero = {
 	},
 	[44003]={
 
+	},
+	[44004]={
+
 	},
 	[52001]={
 
@@ -88,9 +100,12 @@ local hero = {
 	},
 	[54003]={
 
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/ru/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/ru/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/th/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="HP เพิ่มขึ้น {0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/th/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="คนรับใช้ปีศาจ",
 		["desc"]="โจมตีต่อเนื่อง รวดเร็วดุจสายฟ้า!!!"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="สาวดาบ",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="เฟย",
 		["desc"]="แกว่งดาบทาชิในมือดุจมังกรร่ายรำ มั่นคือเพลงดาบที่ไร้เทียมทาน"
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="หัวหอม",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="นินจาฟิล",
 		["desc"]="ว่องไวดั่งสายลม ปกป้องอาณาจักรแห่งน้ำจากการบุกรุกของกองกำลังชั่วร้าย"
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="หัวใจน้ำแข็ง",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="นักเวทลูน่า",
 		["desc"]="ภายใต้ดาบจันทร์เสี้ยวคู่ของเธอ ดวงดาวยามราตรีร่ายรำที่ปลายนิ้วของเธอ แสงจันทร์แห่งเวทมนตร์ส่องสว่างความปัญญาของเธอ~"
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="นินจาเร็น",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="อัศวินชั่วร้าย",
 		["desc"]="อดีตเป็นหนึ่งในสิบอัศวินที่โดดเด่นที่สุดในอาณาจักร ฟ้าลิขิตให้เขาตกในบาป จนกลายเป็นผู้ใช้ดาบคำสาป"
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/th/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="ดาบร่วงหล่น: สร้างดาเมจสกิลมหาศาลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์<color=#3cff28><u>ทุจริต</u></color><color=#3cff28>1</color> รอบ"
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/th/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="เอฟเฟกต์<color=#3cff28>หลับ</color>ที่เพิ่มโดยดาบร่วงหล่น จำนวนรอบ<color=#3cff28>+1</color>"
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/th/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="อัปเกรดเกราะ {0} ครั้ง"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/vi/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="Tăng {0} HP",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/vi/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="Incubus",
 		["desc"]="Như tia chớp, tấn công liên tục!!!"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="Irelia",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="Tobi",
 		["desc"]="Thanh kiếm trong tay anh ta múa như rồng, đó là kiếm thuật vô song."
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="Onion",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="Ninja Phil",
 		["desc"]="Nhanh như gió, hãy bảo vệ Vương Quốc Nước khỏi những thế lực xấu xa."
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="Frozen Heart",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="Pháp Sư Moon",
 		["desc"]="Dưới lưỡi kiếm mặt trăng của cô ấy, sao đêm nhảy múa trong tầm tay, và ánh trăng huyền diệu soi sáng trí tuệ vô tận"
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="Ninja Jay",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="Fallen Knight",
 		["desc"]="Từng là một Kỵ Sĩ nổi tiếng vương quốc, số phận đã khiến anh trở thành người nắm giữ thanh kiếm nguyền rủa."
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/vi/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="Kiếm Sa Đọa: Gây thêm 1 lần nhiều sát thương kỹ năng, kèm <color=#3cff28><u>Sa Đọa</u></color>, <color=#3cff28>1</color> hiệp."
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/vi/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="Kiếm Sa Đọa kèm hiệu quả <color=#3cff28>Ngủ Say</color>, số hiệp <color=#3cff28>+1</color>."
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/vi/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="Tăng cấp Phòng Cụ {0} lần"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/config/strings/zh/attr.lua

@@ -278,6 +278,26 @@ local attr = {
 		["id"]=56,
 		["desc"]="生命提高{0}",
 		["name"]="attr_hp_purple"
+	},
+	[57]={
+		["id"]=57,
+		["name"]="attr_all_hurtp_red"
+	},
+	[58]={
+		["id"]=58,
+		["name"]="attr_all_hurtp_yellow"
+	},
+	[59]={
+		["id"]=59,
+		["name"]="attr_all_hurtp_green"
+	},
+	[60]={
+		["id"]=60,
+		["name"]="attr_all_hurtp_blue"
+	},
+	[61]={
+		["id"]=61,
+		["name"]="attr_all_hurtp_purple"
 	}
 }
 local keys = {
@@ -337,12 +357,17 @@ local keys = {
 		["attr_hp_yellow"]=attr[53],
 		["attr_hp_green"]=attr[54],
 		["attr_hp_blue"]=attr[55],
-		["attr_hp_purple"]=attr[56]
+		["attr_hp_purple"]=attr[56],
+		["attr_all_hurtp_red"]=attr[57],
+		["attr_all_hurtp_yellow"]=attr[58],
+		["attr_all_hurtp_green"]=attr[59],
+		["attr_all_hurtp_blue"]=attr[60],
+		["attr_all_hurtp_purple"]=attr[61]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=56
+count=61
 }
 return config

lua/app/config/strings/zh/hero.lua

@@ -22,6 +22,9 @@ local hero = {
 	[14003]={
 		["name"]="惡魔侍者",
 		["desc"]="像閃電一樣，不停地攻擊！！！！"
+	},
+	[14004]={
+
 	},
 	[22001]={
 		["name"]="刀妹",
@@ -46,6 +49,9 @@ local hero = {
 	[24003]={
 		["name"]="阿飛",
 		["desc"]="手中的太刀如龍飛舞那是無與倫比的劍術。"
+	},
+	[24004]={
+
 	},
 	[32001]={
 		["name"]="洋蔥頭",
@@ -70,6 +76,9 @@ local hero = {
 	[34003]={
 		["name"]="忍者菲爾",
 		["desc"]="迅猛如風，保護水之王國免受邪惡勢力的侵害。"
+	},
+	[34004]={
+
 	},
 	[42001]={
 		["name"]="冰心",
@@ -94,6 +103,9 @@ local hero = {
 	[44003]={
 		["name"]="月之法師",
 		["desc"]="在她的月輪雙刃下，夜晚的星辰在她的指尖舞動，魔法的月光照亮了她無限的智慧~"
+	},
+	[44004]={
+
 	},
 	[52001]={
 		["name"]="忍者倫",
@@ -118,9 +130,12 @@ local hero = {
 	[54003]={
 		["name"]="墮落騎士",
 		["desc"]="曾是王國中最傑出的騎士之一，命運使他墮落成為一名詛咒巨劍的使用者。"
+	},
+	[54004]={
+
 	}
 }
 local config = {
-data=hero,count=30
+data=hero,count=35
 }
 return config

lua/app/config/strings/zh/skill.lua

@@ -88,9 +88,24 @@ local skill = {
 	},
 	[5400320]={
 		["desc"]="墮落之劍:額外造成一次大量技能傷害，附帶<color=#3cff28><u>腐敗</u></color>效果，<color=#3cff28>1</color>回合。"
+	},
+	[1400420]={
+
+	},
+	[2400420]={
+
+	},
+	[3400420]={
+
+	},
+	[4400420]={
+
+	},
+	[5400420]={
+
 	}
 }
 local config = {
-data=skill,count=30
+data=skill,count=35
 }
 return config

lua/app/config/strings/zh/skill_rogue.lua

@@ -850,9 +850,129 @@ local skill_rogue = {
 	},
 	[5400307]={
 		["desc"]="墮落之劍附帶的<color=#3cff28>昏睡</color>效果，回合數<color=#3cff28>+1</color>。"
+	},
+	[1400400]={
+
+	},
+	[1400401]={
+
+	},
+	[1400402]={
+
+	},
+	[1400403]={
+
+	},
+	[1400404]={
+
+	},
+	[1400405]={
+
+	},
+	[1400406]={
+
+	},
+	[1400407]={
+
+	},
+	[2400400]={
+
+	},
+	[2400401]={
+
+	},
+	[2400402]={
+
+	},
+	[2400403]={
+
+	},
+	[2400404]={
+
+	},
+	[2400405]={
+
+	},
+	[2400406]={
+
+	},
+	[2400407]={
+
+	},
+	[3400400]={
+
+	},
+	[3400401]={
+
+	},
+	[3400402]={
+
+	},
+	[3400403]={
+
+	},
+	[3400404]={
+
+	},
+	[3400405]={
+
+	},
+	[3400406]={
+
+	},
+	[3400407]={
+
+	},
+	[4400400]={
+
+	},
+	[4400401]={
+
+	},
+	[4400402]={
+
+	},
+	[4400403]={
+
+	},
+	[4400404]={
+
+	},
+	[4400405]={
+
+	},
+	[4400406]={
+
+	},
+	[4400407]={
+
+	},
+	[5400400]={
+
+	},
+	[5400401]={
+
+	},
+	[5400402]={
+
+	},
+	[5400403]={
+
+	},
+	[5400404]={
+
+	},
+	[5400405]={
+
+	},
+	[5400406]={
+
+	},
+	[5400407]={
+
 	}
 }
 local config = {
-data=skill_rogue,count=284
+data=skill_rogue,count=324
 }
 return config

lua/app/config/strings/zh/task_type.lua

@@ -115,9 +115,18 @@ local task_type = {
 	},
 	[39]={
 		["desc"]="防具升級{0}次"
+	},
+	[40]={
+
+	},
+	[41]={
+
+	},
+	[52]={
+
 	}
 }
 local config = {
-data=task_type,count=39
+data=task_type,count=42
 }
 return config

lua/app/global/global_const.lua

@@ -21,6 +21,7 @@ local CONST_PATHS = {
 	CollectionConst = "app/module/collection/collection_const",
 	ActivityConst = "app/module/activity/activity_const",
 	FourteenDayConst = "app/module/activity/fourteen_day/fourteen_day_const",
+	DungeonRuneConst = "app/module/dungeon_rune/dungeon_rune_const",
 }
 
 if EDITOR_MODE then

lua/app/module/dungeon_rune/dungeon_rune_const.lua

@@ -0,0 +1,52 @@
+local BattleConst = GConst.BattleConst
+local DungeonRuneConst = {}
+
+DungeonRuneConst.RANK_MAX_NUM = 50
+
+DungeonRuneConst.TASK_TYPE = {
+    PASS_ROUND = 0,
+    ELIMINATION_ELEMENT = 1,
+    BREAK_GRID_TYPE = 2,
+    KILL_MONSTER = 3
+}
+
+DungeonRuneConst.TASK_ICON = {
+    [DungeonRuneConst.TASK_TYPE.PASS_ROUND] = "dungeon_rune_task_7",
+    [DungeonRuneConst.TASK_TYPE.ELIMINATION_ELEMENT] = {
+        [BattleConst.ELEMENT_TYPE.RED] = "dungeon_rune_task_4",
+        [BattleConst.ELEMENT_TYPE.YELLOW] = "dungeon_rune_task_5",
+        [BattleConst.ELEMENT_TYPE.GREEN] = "dungeon_rune_task_2",
+        [BattleConst.ELEMENT_TYPE.BLUE] = "dungeon_rune_task_1",
+        [BattleConst.ELEMENT_TYPE.PURPLE] = "dungeon_rune_task_3",
+    },
+    [DungeonRuneConst.TASK_TYPE.BREAK_GRID_TYPE] = {
+        [2] = "battle_obstacle_stone_2",
+        [3] = "battle_obstacle_stone_1",
+        [4] = "battle_obstacle_vine",
+        [5] = "battle_obstacle_ice",
+        [7] = "battle_obstacle_stone_3",
+        [12] = "battle_obstacle_leaf",
+        [13] = "battle_obstacle_jelly",
+        [18] = "battle_obstacle_stump_1",
+        [19] = "battle_obstacle_stump_2",
+        [20] = "battle_obstacle_stump_3",
+        [21] = "battle_obstacle_blister",
+        [22] = "battle_obstacle_silt",
+        [23] = "battle_obstacle_poisonous_mist",
+        [24] = "battle_obstacle_altar_1",
+        [25] = "battle_obstacle_altar_2",
+        [26] = "battle_obstacle_altar_3",
+        [27] = "battle_obstacle_circle",
+        [28] = "battle_obstacle_stalactite_1",
+        [29] = "battle_obstacle_stalactite_2",
+        [30] = "battle_obstacle_stalactite_3",
+        [31] = "battle_obstacle_lron_1",
+        [32] = "battle_obstacle_lron_2",
+        [33] = "battle_obstacle_lron_3",
+        [34] = "battle_obstacle_lava",
+        [35] = "battle_obstacle_leaf",
+    },
+    [DungeonRuneConst.TASK_TYPE.KILL_MONSTER] = "dungeon_rune_task_8",
+}
+
+return DungeonRuneConst

lua/app/module/dungeon_rune/dungeon_rune_const.lua.meta

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

lua/app/module/dungeon_rune/dungeon_rune_manager.lua

@@ -9,6 +9,131 @@ function DungeonRuneManager:showFightUI(id)
     if not runeData:canFight(id) then
         GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE))
     end
+
+    local params = {id = id}
+    local isBoss = runeData:isBossChapter(id)
+    if isBoss then
+        UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_boss_fight_ui", params)
+    else
+        UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_fight_ui", params)
+    end
+end
+
+function DungeonRuneManager:showTaskUI(id)
+    local params = {id = id}
+    UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_task_ui", params)
+end
+
+function DungeonRuneManager:showRebirthUI(adCallback, closeCallback, isHpOver)
+    UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_rebirth_ui",{adCallback = adCallback, closeCallback = closeCallback, isHpOver = isHpOver})
+end
+
+function DungeonRuneManager:reqFight(id)
+    local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+    if not runeData:canFight(id) then
+        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE))
+        return
+    end
+
+    local passed = runeData:passedChapter(id)
+    if not passed and not GFunc.checkCost(GConst.ItemConst.ITEM_ID_GLOD_WING, 1, true) then
+        return
+    end
+
+    local heroes = {}
+    local formation = DataManager.FormationData:getDungeonArmorFormation()
+    for matchType, heroId in pairs(formation) do
+        if heroId > 0 then
+            table.insert(heroes, heroId)
+        end
+    end
+    self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterRuneChallengeStartReq, {id = id, heroes = heroes}, {}, self.rspFight, BIReport.ITEM_GET_TYPE.DUNGEON_RUNE_START)
+end
+
+function DungeonRuneManager:rspFight(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        local params = {
+            atkFormation = {}
+        }
+        local formation = DataManager.FormationData:getDungeonRuneFormation()
+        for elementType, heroId in pairs(formation) do
+            local heroEntity = DataManager.HeroData:getHeroById(heroId)
+            if heroEntity then
+                params.atkFormation[elementType] = heroEntity
+            end
+        end
+        ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_RUNE, params, function()
+            UIManager:closeAllUI()
+            ModuleManager.MaincityManager:showMainCityUI()
+            self:showMainUI()
+        end)
+    end
+end
+
+function DungeonRuneManager:reqFightSettlement(chapterId, combatReport, taskProgress)
+    local parmas = {
+        id = chapterId,
+        win = combatReport.victory,
+        task_stat = taskProgress,
+        combatReport = combatReport,
+    }
+    self:sendmessage(ProtoMsgType.FromMsgEnum.ChapterRuneChallengeSettlementReq, parmas, {}, self.rspFightSettlement, BIReport.ITEM_GET_TYPE.DUNGEON_RUNE_SETTLEMENT)
+end
+
+function DungeonRuneManager:rspFightSettlement(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+        local passId = runeData:getPassedMaxId()
+        if result.reqData then
+            runeData:updatePassedMaxId(result.reqData.id, result)
+        end
+        -- ModuleManager.BattleManager:showBattleArmorResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, result.rewards, result.reqData.combatReport)
+
+        if passId ~= runeData:getPassedMaxId() then
+            local data = {}
+            data.dungeon_progress = DataManager.DungeonData:getDungeonBIStr()
+            CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
+        end
+
+        if result.reqData then
+            local taskStat = result.reqData.task_stat
+            if taskStat then
+                ModuleManager.TaskManager:addFightTaskProgress(taskStat)
+            end
+        end
+        runeData:setDirty()
+    end
+end
+
+function DungeonRuneManager:reqSweep(id)
+    if not GFunc.checkCost(GConst.ItemConst.ITEM_ID_SLIVER_WING, 1, true) then
+        return
+    end
+
+    local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+    if not runeData:canSweep(id) then
+        return
+    end
+
+    self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterRuneChallengeFarmReq, {chapter_weapon_id = id}, {}, self.rspSweep, BIReport.ITEM_GET_TYPE.DUNGEON_RUNE_SWEEP)
+end
+
+function DungeonRuneManager:rspSweep(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        GFunc.showRewardBox(result.rewards)
+        local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+        runeData:setDirty()
+    end
+end
+
+function DungeonRuneManager:reqRebirth()
+    self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterRuneAdReq, {}, {}, self.rspRebirth)
+end
+
+function DungeonRuneManager:rspRebirth(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BATTLE_REBIRTH)
+    end
 end
 
 return DungeonRuneManager

lua/app/ui/dungeon_rune/cell/rank_cell.lua

@@ -0,0 +1,65 @@
+local RankCell = class("RankCell", BaseCell)
+
+local RANK_ICON = {
+    "act_ranking_1",
+    "act_ranking_2",
+    "act_ranking_3"
+}
+
+local RANK_BG = {
+    "act_ranking_bg_1",
+    "act_ranking_bg_2",
+    "act_ranking_bg_3",
+    "act_ranking_bg_4"
+}
+
+function RankCell:refresh(index, info)
+    local uiMap = self:getUIMap()
+    if not self.playerHeadCell then
+        self.playerHeadCell = CellManager:addCellComp(uiMap["act_rank_cell.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL)
+    end
+    uiMap["act_rank_cell.tx_rank"]:setText(index)
+    local imgRank = uiMap["act_rank_cell.img_rank"]
+    if RANK_ICON[index] then
+        imgRank:setVisible(true)
+        imgRank:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_ICON[index])
+        uiMap["act_rank_cell.tx_rank"]:setText(GConst.EMPTY_STRING)
+    else
+        imgRank:setVisible(false)
+    end
+
+    local imgBg = uiMap["act_rank_cell.bg"]
+    if RANK_BG[index] then
+        imgBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_BG[index])
+    else
+        imgBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_BG[4])
+    end
+
+    local txName = uiMap["act_rank_cell.tx_name"]
+    local txWave = uiMap["act_rank_cell.tx_wave"]
+    local txRound = uiMap["act_rank_cell.tx_round"]
+
+    if info then
+        txName:setText(info.name)
+        txWave:setText(info.wave)
+        txRound:setText(info.round)
+        self.playerHeadCell:getBaseObject():addClickListener(function()
+            ModuleManager.ActBossRushManager:reqOtherPlayerInfo(info.id, function(formation)
+                if not self.playerHeadCell or not self.playerHeadCell:getBaseObject() or self.playerHeadCell:getBaseObject():isDestroyed() then
+                    return
+                end
+                ModuleManager.TipsManager:showHeroFormation(self.playerHeadCell:getBaseObject(), formation)
+            end)
+        end)
+        self.playerHeadCell:refresh(info.avatar, info.avatar_frame, false)
+    else
+        txName:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_8))
+        txWave:setText("--")
+        txRound:setText("--")
+        self.playerHeadCell:getBaseObject():addClickListener(nil)
+        self.playerHeadCell:refresh(3001, 1000, false) -- 默认
+    end
+
+end
+
+return RankCell

lua/app/ui/dungeon_rune/cell/rank_cell.lua.meta

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

lua/app/ui/dungeon_rune/cell/rune_battle_task_cell.lua

@@ -0,0 +1,11 @@
+local RuneBattleTaskCell = class("RuneBattleTaskCell", BaseCell)
+
+function RuneBattleTaskCell:refresh(desc, taskInfo, over)
+    local uiMap = self:getUIMap()
+    uiMap["task_cell.desc"]:setText(desc)
+    uiMap["task_cell.check"]:setVisible(over)
+    local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+    uiMap["task_cell.task_icon"]:setSprite(runeData:getConditionIcon(taskInfo))
+end
+
+return RuneBattleTaskCell

lua/app/ui/dungeon_rune/cell/rune_battle_task_cell.lua.meta

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

lua/app/ui/dungeon_rune/cell/rune_task_cell.lua

@@ -0,0 +1,38 @@
+local RuneTaskCell = class("RuneTaskCell", BaseCell)
+
+local BG = {"common_board_131", "common_board_132"} -- 紫绿
+
+function RuneTaskCell:refresh(taskInfo)
+    local uiMap = self:getUIMap()
+    local bg = uiMap["rune_task_cell.bg"]
+    local icon = uiMap["rune_task_cell.icon"]
+    local point = uiMap["rune_task_cell.point"]
+    local desc = uiMap["rune_task_cell.desc"]
+    local taskType = taskInfo[1]
+    local taskParams1 = taskInfo[2]
+    local taskParams2 = taskInfo[3]
+
+    local taskNum = 0
+    if taskType == GConst.DungeonRuneConst.TASK_TYPE.PASS_ROUND then
+        taskNum = taskParams1
+    else
+        taskNum = taskParams2 or 0
+    end
+
+    local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+    icon:setSprite(runeData:getConditionIcon(taskInfo))
+
+    desc:setText(taskNum)
+
+    self:hidePoint(false)
+end
+
+function RuneTaskCell:hidePoint(hide)
+    local uiMap = self:getUIMap()
+    local point = uiMap["rune_task_cell.point"]
+    local desc = uiMap["rune_task_cell.desc"]
+    point:setVisible(not hide)
+    desc:setVisible(not hide)
+end
+
+return RuneTaskCell

lua/app/ui/dungeon_rune/dungeon_rune_boss_fight_ui.lua

@@ -0,0 +1,161 @@
+local DungeonRuneBossFightUI = class("DungeonRuneBossFightUI", BaseUI)
+
+local RUNE_TASK_CELL = "app/ui/dungeon_rune/cell/rune_task_cell"
+
+function DungeonRuneBossFightUI:isFullScreen()
+    return false
+end
+
+function DungeonRuneBossFightUI:getPrefabPath()
+    return "assets/prefabs/ui/dungeon_rune/dungeon_rune_boss_fight_ui.prefab"
+end
+
+function DungeonRuneBossFightUI:ctor(params)
+    self.runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+
+    self.id = params.id
+end
+
+function DungeonRuneBossFightUI:onLoadRootComplete()
+    self:_display()
+    self:_addListeners()
+    self:_bind()
+end
+
+function DungeonRuneBossFightUI:_display()
+    local uiMap = self.root:genAllChildren()
+    uiMap["dungeon_rune_boss_fight_ui.bg.title.tx_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.id))
+    uiMap["dungeon_rune_boss_fight_ui.bg.btn_again.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_2))
+    local spineName, spineScale = self.runeData:getChapterMonsterSpine(self.id)
+    local spineObject = uiMap["dungeon_rune_boss_fight_ui.bg.banner.ui_spine_obj"]
+    spineObject:setVisible(false)
+    spineObject:loadAssetAsync(spineName, function()
+        spineObject:playAnim("idle", true, true, true)
+        spineObject:setLocalScale(spineScale, spineScale, spineScale)
+        spineObject:setVisible(true)
+    end, true)
+
+    local i18Config = self.runeData:getChapterMonsterI18N(self.id)
+    uiMap["dungeon_rune_boss_fight_ui.bg.desc_1"]:setText(i18Config.name)
+    uiMap["dungeon_rune_boss_fight_ui.bg.desc_2"]:setText(i18Config.desc)
+
+    self:refreshTargetInfo()
+    self:refreshRewardInfo()
+    self:refreshFightBtn()
+end
+
+function DungeonRuneBossFightUI:_addListeners()
+    local uiMap = self.root:genAllChildren()
+    uiMap["dungeon_rune_boss_fight_ui.bg.btn_close"]:addClickListener(function()
+        self:closeUI()
+    end)
+
+    uiMap["dungeon_rune_boss_fight_ui.bg.btn"]:addClickListener(function()
+        local passed = self.runeData:passedChapter(self.id)
+        if passed then
+            ModuleManager.DungeonRuneManager:reqSweep(self.id)
+        else
+            ModuleManager.DungeonRuneManager:reqFight(self.id)
+        end
+    end)
+
+    uiMap["dungeon_rune_boss_fight_ui.bg.btn_again"]:addClickListener(function()
+        ModuleManager.DungeonRuneManager:reqFight(self.id)
+    end)
+end
+
+function DungeonRuneBossFightUI:_bind()
+    self:bind(self.runeData, "isDirty", function()
+        self:refreshFightBtn()
+    end)
+end
+
+function DungeonRuneBossFightUI:refreshTargetInfo()
+    local uiMap = self.root:genAllChildren()
+    if not self.taskRuneCell then
+        self.taskRuneCell = CellManager:addCellComp(uiMap["dungeon_rune_boss_fight_ui.bg.banner.rune_task_cell"], RUNE_TASK_CELL)
+    end
+
+    local chapterCondition = self.runeData:getChapterCondition(self.id)
+    if chapterCondition[1] then
+        self.taskRuneCell:refresh(chapterCondition[1])
+        self.taskRuneCell:addClickListener(function()
+            ModuleManager.TipsManager:showDescTips(self.runeData:getConditionDesc(chapterCondition[1]), self.taskRuneCell:getBaseObject())
+        end)
+    end
+end
+
+function DungeonRuneBossFightUI:refreshRewardInfo()
+    local uiMap = self.root:genAllChildren()
+    local passed = self.runeData:passedChapter(self.id)
+    local title = uiMap["dungeon_rune_boss_fight_ui.bg.desc_3"]
+
+    local descPassRound = uiMap["dungeon_rune_boss_fight_ui.bg.desc_4"]
+    local imgPassIcon = uiMap["dungeon_rune_boss_fight_ui.bg.icon"]
+    local rewardNode = uiMap["dungeon_rune_boss_fight_ui.bg.reward_node"]
+
+    if not self.rewardCells then
+        self.rewardCells = {}
+        for i = 1, 4 do
+            self.rewardCells[i] = CellManager:addCellComp(uiMap["dungeon_rune_boss_fight_ui.bg.reward_node.reward_cell_" .. i], GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+        end
+    end
+
+    local rewards = self.runeData:getChapterRewards(self.id)
+    if passed then
+        title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_4))
+        local round = self.runeData:getChapterPassRound(self.id)
+        descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round))
+        imgPassIcon:setActive(true)
+        GFunc.centerImgAndTx(imgPassIcon, descPassRound, 5)
+        rewards = self.runeData:getChapterSweepRewards(self.id)
+    else
+        imgPassIcon:setActive(false)
+        descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_5))
+        descPassRound:setAnchoredPositionX(0)
+        title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_3))
+    end
+
+    for index, cell in ipairs(self.rewardCells) do
+        local reward = rewards[index]
+        if reward then
+            cell:refreshByConfig(reward)
+            cell:getBaseObject():setActive(true)
+        else
+            cell:getBaseObject():setActive(false)
+        end
+    end
+
+    rewardNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
+end
+
+function DungeonRuneBossFightUI:refreshFightBtn()
+    local uiMap = self.root:genAllChildren()
+    local btn = uiMap["dungeon_rune_boss_fight_ui.bg.btn"]
+    local btnAgain = uiMap["dungeon_rune_boss_fight_ui.bg.btn_again"]
+
+    local icon = uiMap["dungeon_rune_boss_fight_ui.bg.btn.icon"]
+    local num = uiMap["dungeon_rune_boss_fight_ui.bg.btn.num"]
+    local desc = uiMap["dungeon_rune_boss_fight_ui.bg.btn.desc"]
+
+    local passed = self.runeData:passedChapter(self.id)
+    if passed then
+        desc:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH))
+        num:setText(1)
+        icon:setSprite(ModuleManager.ItemManager:getItemIcon(GConst.ItemConst.ITEM_ID_SLIVER_WING))
+        GFunc.centerImgAndTx(icon, num, 5)
+        btn:setAnchoredPositionX(130)
+        btnAgain:setActive(true)
+        btn:setLocalScale(0.9, 0.9, 0.9)
+    else
+        desc:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE))
+        num:setText(1)
+        icon:setSprite(ModuleManager.ItemManager:getItemIcon(GConst.ItemConst.ITEM_ID_GLOD_WING))
+        GFunc.centerImgAndTx(icon, num, 5)
+        btn:setAnchoredPositionX(0)
+        btnAgain:setActive(false)
+        btn:setLocalScale(1, 1, 1)
+    end
+end
+
+return DungeonRuneBossFightUI

lua/app/ui/dungeon_rune/dungeon_rune_boss_fight_ui.lua.meta

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

lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua

@@ -0,0 +1,134 @@
+local DungeonRuneFightUI = class("DungeonRuneFightUI", BaseUI)
+
+local RUNE_TASK_CELL = "app/ui/dungeon_rune/cell/rune_task_cell"
+
+function DungeonRuneFightUI:isFullScreen()
+    return false
+end
+
+function DungeonRuneFightUI:getPrefabPath()
+    return "assets/prefabs/ui/dungeon_rune/dungeon_rune_fight_ui.prefab"
+end
+
+function DungeonRuneFightUI:ctor(params)
+    self.runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+
+    self.id = params.id
+end
+
+function DungeonRuneFightUI:onLoadRootComplete()
+    self:_display()
+    self:_addListeners()
+end
+
+function DungeonRuneFightUI:_display()
+    local uiMap = self.root:genAllChildren()
+    uiMap["dungeon_rune_fight_ui.bg.title.tx_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.id))
+    uiMap["dungeon_rune_fight_ui.bg.desc_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_1))
+    self:refreshTargetInfo()
+    self:refreshRewardInfo()
+    self:refreshFightBtn()
+end
+
+function DungeonRuneFightUI:_addListeners()
+    local uiMap = self.root:genAllChildren()
+    uiMap["dungeon_rune_fight_ui.bg.btn_close"]:addClickListener(function()
+        self:closeUI()
+    end)
+
+    uiMap["dungeon_rune_fight_ui.bg.btn"]:addClickListener(function()
+        ModuleManager.DungeonRuneManager:reqFight(self.id)
+    end)
+end
+
+function DungeonRuneFightUI:refreshTargetInfo()
+    local uiMap = self.root:genAllChildren()
+    if not self.taskRuneCells then
+        self.taskRuneCells = {}
+        for i = 1, 4 do
+            self.taskRuneCells[i] = CellManager:addCellComp(uiMap["dungeon_rune_fight_ui.bg.rune_task_cell_" .. i], RUNE_TASK_CELL)
+        end
+    end
+
+    local chapterCondition = self.runeData:getChapterCondition(self.id)
+    for index, cell in ipairs(self.taskRuneCells) do
+        local info = chapterCondition[index]
+        if info then
+            cell:refresh(info)
+            cell:getBaseObject():setActive(true)
+            cell:addClickListener(function()
+                ModuleManager.TipsManager:showDescTips(self.runeData:getConditionDesc(info), cell:getBaseObject())
+            end)
+        else
+            cell:getBaseObject():setActive(false)
+        end
+    end
+    uiMap["dungeon_rune_fight_ui.bg.task_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
+end
+
+function DungeonRuneFightUI:refreshRewardInfo()
+    local uiMap = self.root:genAllChildren()
+    local passed = self.runeData:passedChapter(self.id)
+    local descPassRound = uiMap["dungeon_rune_fight_ui.bg.desc_3"]
+    local imgPassIcon = uiMap["dungeon_rune_fight_ui.bg.icon"]
+    local rewardNode = uiMap["dungeon_rune_fight_ui.bg.reward_node"]
+    rewardNode:setActive(not passed)
+    descPassRound:setVisible(passed)
+    imgPassIcon:setVisible(passed)
+    if passed then
+        local round = self.runeData:getChapterPassRound(self.id)
+        descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round))
+        GFunc.centerImgAndTx(imgPassIcon, descPassRound, 5)
+    else
+        if not self.rewardCells then
+            self.rewardCells = {}
+            for i = 1, 4 do
+                self.rewardCells[i] = CellManager:addCellComp(uiMap["dungeon_rune_fight_ui.bg.reward_node.reward_cell_" .. i], GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+            end
+        end
+
+        local rewards = self.runeData:getChapterRewards(self.id)
+        for index, cell in ipairs(self.rewardCells) do
+            local reward = rewards[index]
+            if reward then
+                cell:refreshByConfig(reward)
+                cell:getBaseObject():setActive(true)
+            else
+                cell:getBaseObject():setActive(false)
+            end
+        end
+
+        rewardNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
+    end
+end
+
+function DungeonRuneFightUI:refreshFightBtn()
+    local uiMap = self.root:genAllChildren()
+    local title = uiMap["dungeon_rune_fight_ui.bg.desc_2"]
+
+    local iconBg = uiMap["dungeon_rune_fight_ui.bg.btn.icon_bg"]
+    local icon = uiMap["dungeon_rune_fight_ui.bg.btn.icon"]
+    local num = uiMap["dungeon_rune_fight_ui.bg.btn.num"]
+    local desc = uiMap["dungeon_rune_fight_ui.bg.btn.desc"]
+
+    local descAgain = uiMap["dungeon_rune_fight_ui.bg.btn.desc_again"]
+    local passed = self.runeData:passedChapter(self.id)
+    local notPass = not passed
+    iconBg:setVisible(notPass)
+    icon:setVisible(notPass)
+    num:setVisible(notPass)
+    desc:setVisible(notPass)
+    descAgain:setVisible(passed)
+    if passed then
+        descAgain:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_2))
+        title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_6))
+    else
+        desc:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE))
+        num:setText(1)
+        icon:setSprite(ModuleManager.ItemManager:getItemIcon(GConst.ItemConst.ITEM_ID_GLOD_WING))
+        GFunc.centerImgAndTx(icon, num, 5)
+        title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_3))
+    end
+end
+
+return DungeonRuneFightUI

lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua.meta

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

lua/app/ui/dungeon_rune/dungeon_rune_rank_ui.lua

@@ -0,0 +1,253 @@
+local DungeonRuneRankUI = class("DungeonRuneRankUI", BaseUI)
+
+local RANK_ICON = {
+    "act_ranking_1",
+    "act_ranking_2",
+    "act_ranking_3"
+}
+local PAGE_ICON = {"common_menu_1", "common_menu_2"}
+local RANK_CELL = "app/ui/dungeon_rune/cell/rank_cell"
+
+local PAGE_TYPE = {
+    TODAY = 1,
+    LAST_DAY = 2,
+    REWARD = 3,
+}
+
+local PAGE_TX = {
+    [PAGE_TYPE.LAST_DAY] = I18N.GlobalConst.DUNGEON_RUNE_DESC_9,
+    [PAGE_TYPE.TODAY] = I18N.GlobalConst.DUNGEON_RUNE_DESC_8,
+    [PAGE_TYPE.REWARD] = I18N.GlobalConst.ACT_BOSS_RUSH_DESC_22,
+}
+
+function DungeonRuneRankUI:isFullScreen()
+    return false
+end
+
+function DungeonRuneRankUI:getPrefabPath()
+    return "assets/prefabs/ui/dungeon_rune/dungeon_rune_rank_ui.prefab"
+end
+
+function DungeonRuneRankUI:ctor()
+    self.runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN)
+end
+
+function DungeonRuneRankUI:onLoadRootComplete()
+    self:initScrollrect()
+    self:_display()
+    self:_addListeners()
+    self:_bind()
+
+    self:switchPage(PAGE_TYPE.TODAY)
+
+    self:refreshTime()
+    if self.actCountdownSid then
+        self:unscheduleGlobal(self.actCountdownSid)
+    end
+    self.actCountdownSid = self:scheduleGlobal(function()
+        self:refreshTime()
+	end, 1)
+end
+
+function DungeonRuneRankUI:_display()
+    local uiMap = self.root:genAllChildren()
+    uiMap["dungeon_rune_rank_ui.bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_5))
+    uiMap["dungeon_rune_rank_ui.bg.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_1))
+end
+
+function DungeonRuneRankUI:_addListeners()
+    local uiMap = self.root:genAllChildren()
+    uiMap["dungeon_rune_rank_ui.bg.close_btn"]:addClickListener(function()
+        self:closeUI()
+    end)
+end
+
+function DungeonRuneRankUI:_bind()
+    self:bind(self.runeData, "isDirty", function()
+        self:refreshRankNode()
+        self:refreshMyRankInfo()
+        self:refreshPages()
+    end)
+end
+
+function DungeonRuneRankUI:initScrollrect()
+    if self.scrollRectComp then
+        return
+    end
+
+    local uiMap = self.root:genAllChildren()
+    self.scrollRectComp = uiMap["dungeon_rune_rank_ui.bg.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+    self.scrollRectComp:addInitCallback(function()
+		return RANK_CELL
+	end)
+	self.scrollRectComp:addRefreshCallback(function(index, cell)
+        local info = self.rankList[index + 3]
+		cell:refresh(index, info)
+	end)
+    self.scrollRectComp:clearCells()
+    self.scrollRectComp:setTotalCount(0)
+end
+
+function DungeonRuneRankUI:refreshRankNode()
+    if self.curPage == PAGE_TYPE.LAST_DAY then
+        self.rankList = self.runeData:getLastRankInfo()
+    elseif self.curPage == PAGE_TYPE.TODAY then
+        self.rankList = self.runeData:getCurRankInfo()
+    else
+        self.rankList = {}
+    end
+    self.scrollRectComp:refillCells(#self.rankList)
+end
+
+function DungeonRuneRankUI:refreshPages()
+    if not self.pageObjs then
+        local uiMap = self.root:genAllChildren()
+        self.pageObjs = {}
+        for i = 1, 3 do
+            self.pageObjs[i] = {
+                page = uiMap["dungeon_rune_rank_ui.bg.page_" .. i],
+                tx1 = uiMap["dungeon_rune_rank_ui.bg.page_" .. i .. ".tx"],
+                tx2 = uiMap["dungeon_rune_rank_ui.bg.page_" .. i .. ".tx_hl"],
+            }
+            self.pageObjs[i].page:addClickListener(function()
+                self:switchPage(i)
+            end)
+        end
+    end
+    for index, objs in ipairs(self.pageObjs) do
+        if index == self.curPage then
+            objs.page:setSprite(GConst.ATLAS_PATH.COMMON, PAGE_ICON[1])
+            objs.page:setAnchoredPositionY(-56)
+            objs.tx1:setText(GConst.EMPTY_STRING)
+            objs.tx2:setText(I18N:getGlobalText(PAGE_TX[index]))
+        else
+            objs.page:setSprite(GConst.ATLAS_PATH.COMMON, PAGE_ICON[2])
+            objs.page:setAnchoredPositionY(-45)
+            objs.tx1:setText(I18N:getGlobalText(PAGE_TX[index]))
+            objs.tx2:setText(GConst.EMPTY_STRING)
+        end
+    end
+
+    if self.runeData:canGetRankReward() then
+        self.pageObjs[3].page:addRedPoint(77, -6.5, 1)
+    else
+        self.pageObjs[3].page:removeRedPoint()
+    end
+end
+
+function DungeonRuneRankUI:switchPage(page)
+    if self.curPage == page then
+        return
+    end
+    self.curPage = page
+    self:refreshRankNode()
+    self:refreshPages()
+    self:refreshMyRankInfo()
+end
+
+function DungeonRuneRankUI:refreshMyRankInfo()
+    local info
+    local canGot = self.runeData:canGetRankReward()
+
+    if self.curPage == PAGE_TYPE.TODAY then
+        info = self.runeData:getCurRankSelfInfo()
+    else
+        info = self.runeData:getLastSelfInfo()
+    end
+
+    local rank = info and info.rank or 0
+    local layer = info and info.wave or 0
+    local round = info and info.round or 0
+    local uiMap = self.root:genAllChildren()
+    if not self.playerHeadCell then
+        self.playerHeadCell = CellManager:addCellComp(uiMap["dungeon_rune_rank_ui.bg.my_node.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL)
+        self.selfRewardCells = {}
+        for i = 1, 3 do
+            self.selfRewardCells[i] = CellManager:addCellComp(uiMap["dungeon_rune_rank_ui.bg.my_node.reward_cell_" .. i], GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+        end
+    end
+
+    self.playerHeadCell:refresh()
+    uiMap["dungeon_rune_rank_ui.bg.my_node.tx_name"]:setText(DataManager.PlayerData:getNickname())
+    local rankObj = uiMap["dungeon_rune_rank_ui.bg.my_node.tx_rank"]
+    if not rank or rank <= 0 then
+        rankObj:setText("--")
+    else
+        rankObj:setText(rank)
+        if rank > GConst.DungeonRuneConst.RANK_MAX_NUM then
+            rankObj:setText(GConst.DungeonRuneConst.RANK_MAX_NUM .. "+")
+        end
+    end
+
+    local imgRank = uiMap["dungeon_rune_rank_ui.bg.my_node.img_rank"]
+    if RANK_ICON[rank] then
+        imgRank:setVisible(true)
+        imgRank:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_ICON[rank])
+        rankObj:setText(GConst.EMPTY_STRING)
+    else
+        imgRank:setVisible(false)
+    end
+
+    local layerObj = uiMap["dungeon_rune_rank_ui.bg.my_node.tx_max"]
+    if not layer then
+        layerObj:setText("--")
+    else
+        layerObj:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_10, layer))
+    end
+
+    local roundObj = uiMap["dungeon_rune_rank_ui.bg.my_node.tx_round"]
+    if not round then
+        roundObj:setText("--")
+    else
+        roundObj:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_11, round))
+    end
+
+    if self.curPage ~= PAGE_TYPE.REWARD then
+        layerObj:setVisible(true)
+        roundObj:setVisible(true)
+        for index, cell in ipairs(self.selfRewardCells) do
+            cell:getBaseObject():setActive(false)
+        end
+    else
+        layerObj:setVisible(false)
+        roundObj:setVisible(false)
+
+        local got = self.runeData:isGotRankReward()
+        local rewards
+        if canGot then
+            rewards = DataManager.ActBossRushData:getRankRewards(rank)
+        else
+            info = DataManager.ActBossRushData:getCurRankSelfInfo()
+            rewards = DataManager.ActBossRushData:getRankRewards(info.rank or 0)
+            got = false
+        end
+
+        for index, cell in ipairs(self.selfRewardCells) do
+            if rewards and rewards[index] then
+                cell:refreshByConfig(rewards[index], got, got)
+                cell:getBaseObject():setActive(true)
+                if canGot then
+                    cell:showFrameAnimation()
+                    cell:addClickListener(function()
+                        ModuleManager.ActBossRushManager:reqRankReward()
+                    end)
+                else
+                    cell:hideFrameAnimation()
+                    cell:addClickListener(nil)
+                end
+            else
+                cell:getBaseObject():setActive(false)
+            end
+        end
+    end
+end
+
+function DungeonRuneRankUI:refreshTime()
+    local uiMap = self.root:genAllChildren()
+    local remainTime = self.runeData:getCloseTime()
+    local str
+    str = Time:formatNumTimeStr(remainTime)
+    uiMap["dungeon_rune_rank_ui.bg.time_node.tx_time"]:setText(str)
+end
+
+return DungeonRuneRankUI