副本引导

lua/app/config/chapter_board.lua

@@ -14828,7 +14828,7 @@ local chapter_board = {
 			},
 			{
 				9,
-				4
+				0
 			},
 			{
 				21,
@@ -15263,8 +15263,8 @@ local chapter_board = {
 				3
 			},
 			{
-				21,
+				0,
-				3
+				0
 			},
 			{
 				0,
@@ -15461,8 +15461,8 @@ local chapter_board = {
 				3
 			},
 			{
-				21,
+				0,
-				3
+				0
 			},
 			{
 				0,
@@ -17006,7 +17006,7 @@ local chapter_board = {
 			},
 			{
 				19,
-				5
+				0
 			},
 			{
 				0,
@@ -17204,7 +17204,7 @@ local chapter_board = {
 			},
 			{
 				19,
-				5
+				0
 			},
 			{
 				0,

lua/app/config/chapter_board_daily_challenge.lua

@@ -2002,39 +2002,39 @@ local chapter_board_daily_challenge = {
 	[11]={
 		["board_daily_challenge"]={
 			{
-				1,
+				0,
-				0
+				2
 			},
 			{
-				1,
+				0,
-				0
+				2
 			},
 			{
-				1,
+				0,
-				0
+				2
 			},
 			{
 				0,
 				5
 			},
 			{
-				1,
+				0,
+				2
+			},
+			{
+				0,
+				2
+			},
+			{
+				0,
+				2
+			},
+			{
+				19,
 				0
 			},
 			{
-				1,
+				19,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
-				0
-			},
-			{
-				1,
 				0
 			},
 			{
@@ -2050,15 +2050,15 @@ local chapter_board_daily_challenge = {
 				5
 			},
 			{
-				1,
+				19,
 				0
 			},
 			{
-				1,
+				19,
 				0
 			},
 			{
-				1,
+				19,
 				0
 			},
 			{
@@ -2082,7 +2082,7 @@ local chapter_board_daily_challenge = {
 				3
 			},
 			{
-				1,
+				19,
 				0
 			},
 			{

lua/app/config/chapter_dungeon_equip.lua

@@ -38,14 +38,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1001,
- 				["id_for_nothing"]="VwhcAg==",
-				["num"]=9,
- 				["num_for_nothing"]="Xw=="
 			}
 		},
 		["rand_drop"]={
@@ -61,9 +53,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10011,
+				["id"]=1001,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -119,14 +111,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1001,
- 				["id_for_nothing"]="VwhcAg==",
-				["num"]=9,
- 				["num_for_nothing"]="Xw=="
 			}
 		},
 		["rand_drop"]={
@@ -142,9 +126,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10011,
+				["id"]=1001,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -200,22 +184,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1001,
- 				["id_for_nothing"]="VwhcAg==",
-				["num"]=7,
- 				["num_for_nothing"]="UQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
 			}
 		},
 		["rand_drop"]={
@@ -237,9 +205,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10011,
+				["id"]=1001,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -303,22 +271,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAQ==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1001,
- 				["id_for_nothing"]="VwhcAg==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["rand_drop"]={
@@ -340,9 +292,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10021,
+				["id"]=1002,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -406,22 +358,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAQ==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1001,
- 				["id_for_nothing"]="VwhcAg==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
 			}
 		},
 		["rand_drop"]={
@@ -443,9 +379,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10021,
+				["id"]=1002,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -509,30 +445,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAQ==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1001,
- 				["id_for_nothing"]="VwhcAg==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["rand_drop"]={
@@ -560,9 +472,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10021,
+				["id"]=1002,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -634,22 +546,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAQ==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
 			}
 		},
 		["rand_drop"]={
@@ -677,9 +573,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10021,
+				["id"]=1002,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -751,22 +647,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
 			}
 		},
 		["rand_drop"]={
@@ -788,9 +668,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10031,
+				["id"]=1003,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -854,22 +734,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
 			}
 		},
 		["rand_drop"]={
@@ -897,9 +761,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10031,
+				["id"]=1003,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -963,30 +827,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1002,
- 				["id_for_nothing"]="VwhcAQ==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
 			}
 		},
 		["rand_drop"]={
@@ -1014,9 +854,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10031,
+				["id"]=1003,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1088,22 +928,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcAA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["rand_drop"]={
@@ -1125,9 +949,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10031,
+				["id"]=1003,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1191,30 +1015,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["rand_drop"]={
@@ -1242,9 +1042,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10041,
+				["id"]=1004,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1316,30 +1116,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1003,
- 				["id_for_nothing"]="VwhcAA==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=7,
- 				["num_for_nothing"]="UQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
 			}
 		},
 		["rand_drop"]={
@@ -1367,9 +1143,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10041,
+				["id"]=1004,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1441,22 +1217,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["rand_drop"]={
@@ -1478,9 +1238,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10041,
+				["id"]=1004,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1544,22 +1304,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBw==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
 			}
 		},
 		["rand_drop"]={
@@ -1587,9 +1331,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10041,
+				["id"]=1004,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1661,30 +1405,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1006,
- 				["id_for_nothing"]="VwhcBQ==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["rand_drop"]={
@@ -1712,9 +1432,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10051,
+				["id"]=1005,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1786,30 +1506,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1006,
- 				["id_for_nothing"]="VwhcBQ==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
 			}
 		},
 		["rand_drop"]={
@@ -1837,9 +1533,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10051,
+				["id"]=1005,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -1911,30 +1607,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1006,
- 				["id_for_nothing"]="VwhcBQ==",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
 			}
 		},
 		["rand_drop"]={
@@ -1962,9 +1634,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10051,
+				["id"]=1005,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -2036,30 +1708,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBg==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1006,
- 				["id_for_nothing"]="VwhcBQ==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["rand_drop"]={
@@ -2087,9 +1735,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10051,
+				["id"]=1005,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,
@@ -2161,30 +1809,6 @@ local chapter_dungeon_equip = {
  				["id_for_nothing"]="VwhcBQ==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1004,
- 				["id_for_nothing"]="VwhcBw==",
-				["num"]=0,
- 				["num_for_nothing"]="Vg=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1005,
- 				["id_for_nothing"]="VwhcBg==",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1006,
- 				["id_for_nothing"]="VwhcBQ==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
 			}
 		},
 		["rand_drop"]={
@@ -2212,9 +1836,9 @@ local chapter_dungeon_equip = {
 		["bao_drop"]={
 			{
 				["type"]=1,
-				["id"]=10061,
+				["id"]=1006,
 				["num"]=1,
-				["weight"]=1
+				["weight"]=100
 			}
 		},
 		["bao_drop_num"]=1,

lua/app/config/const.lua

@@ -339,7 +339,7 @@ local const = {
 		["value"]=2
 	},
 	["dungeon_equip_limit"]={
-		["value"]=20
+		["value"]=3
 	},
 	["dungeon_armor_limit"]={
 		["reward"]={
@@ -347,8 +347,8 @@ local const = {
  			["type_for_nothing"]="Vw==",
 			["id"]=3,
  			["id_for_nothing"]="VQ==",
-			["num"]=2,
+			["num"]=5,
- 			["num_for_nothing"]="VA=="
+ 			["num_for_nothing"]="Uw=="
 		}
 	}
 }

lua/app/config/fx.lua

@@ -164,7 +164,7 @@ local fx = {
 		["bind"]="root"
 	},
 	[39]={
-		["res"]="sfx_buff_hudun_zi_b01_1",
+		["res"]="sfx_buff_hudun_zi_b02",
 		["bind"]="root"
 	},
 	[40]={

lua/app/config/item.lua

@@ -460,7 +460,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=1,
 		["icon"]="28",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1007,
@@ -491,7 +491,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=1,
 		["icon"]="29",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1007,
@@ -546,7 +546,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=2,
 		["icon"]="30",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1007,
@@ -625,7 +625,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=2,
 		["icon"]="31",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1007,
@@ -704,7 +704,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=3,
 		["icon"]="32",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1008,
@@ -783,7 +783,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=3,
 		["icon"]="33",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1008,
@@ -862,7 +862,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=4,
 		["icon"]="34",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1009,
@@ -941,7 +941,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=4,
 		["icon"]="35",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1009,
@@ -1020,7 +1020,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=5,
 		["icon"]="36",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1010,
@@ -1099,7 +1099,7 @@ local item = {
 		["type"]=7,
 		["qlt"]=5,
 		["icon"]="37",
-		["item_drop"]={
+		["box_drop"]={
 			{
 				["type"]=1,
 				["id"]=1010,
@@ -1175,7 +1175,7 @@ local item = {
 		}
 	},
 	[38]={
-		["type"]=4,
+		["type"]=8,
 		["qlt"]=1,
 		["icon"]="38",
 		["reward"]={
@@ -1214,7 +1214,7 @@ local item = {
 		}
 	},
 	[39]={
-		["type"]=4,
+		["type"]=8,
 		["qlt"]=2,
 		["icon"]="39",
 		["reward"]={
@@ -1253,7 +1253,7 @@ local item = {
 		}
 	},
 	[40]={
-		["type"]=4,
+		["type"]=8,
 		["qlt"]=3,
 		["icon"]="40",
 		["reward"]={
@@ -1292,7 +1292,7 @@ local item = {
 		}
 	},
 	[41]={
-		["type"]=4,
+		["type"]=8,
 		["qlt"]=4,
 		["icon"]="41",
 		["reward"]={
@@ -1331,7 +1331,7 @@ local item = {
 		}
 	},
 	[42]={
-		["type"]=4,
+		["type"]=8,
 		["qlt"]=5,
 		["icon"]="42",
 		["reward"]={
@@ -1370,7 +1370,7 @@ local item = {
 		}
 	},
 	[43]={
-		["type"]=4,
+		["type"]=8,
 		["qlt"]=5,
 		["icon"]="43",
 		["reward"]={

lua/app/config/localization/localization_global_const.lua

@@ -419,6 +419,7 @@ local LocalizationGlobalConst =
 	DUNGEON_ARMOR_FUND_2 = "DUNGEON_ARMOR_FUND_2",
 	DUNGEON_ARMOR_DESC_15 = "DUNGEON_ARMOR_DESC_15",
 	DUNGEON_ARMOR_DESC_16 = "DUNGEON_ARMOR_DESC_16",
+	MOP_UP_DESC_3 = "MOP_UP_DESC_3",
 }
 
 return LocalizationGlobalConst

lua/app/config/monster_dungeon_equip.lua

@@ -9,6 +9,9 @@ local monster_dungeon_equip = {
 			20164,
 			20165
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=27000
 	},
 	[206]={
@@ -21,6 +24,9 @@ local monster_dungeon_equip = {
 			20131,
 			20132
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=36000
 	},
 	[306]={
@@ -33,6 +39,9 @@ local monster_dungeon_equip = {
 			20080,
 			20081
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=47000
 	},
 	[406]={
@@ -45,6 +54,9 @@ local monster_dungeon_equip = {
 			20008,
 			20009
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=52000
 	},
 	[506]={
@@ -78,6 +90,9 @@ local monster_dungeon_equip = {
 			20176,
 			20177
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=27000
 	},
 	[706]={
@@ -90,6 +105,9 @@ local monster_dungeon_equip = {
 			20161,
 			20162
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=36000
 	},
 	[806]={
@@ -102,6 +120,9 @@ local monster_dungeon_equip = {
 			20077,
 			20078
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=47000
 	},
 	[906]={
@@ -114,6 +135,9 @@ local monster_dungeon_equip = {
 			20191,
 			20192
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=52000
 	},
 	[1006]={
@@ -146,6 +170,9 @@ local monster_dungeon_equip = {
 			20041,
 			20042
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=27000
 	},
 	[1206]={
@@ -158,6 +185,9 @@ local monster_dungeon_equip = {
 			20071,
 			20072
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=36000
 	},
 	[1306]={
@@ -170,6 +200,9 @@ local monster_dungeon_equip = {
 			20086,
 			20087
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=47000
 	},
 	[1406]={
@@ -182,6 +215,9 @@ local monster_dungeon_equip = {
 			20050,
 			20051
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=52000
 	},
 	[1506]={
@@ -214,6 +250,9 @@ local monster_dungeon_equip = {
 			20011,
 			20012
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=27000
 	},
 	[1706]={
@@ -226,6 +265,9 @@ local monster_dungeon_equip = {
 			20143,
 			20144
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=36000
 	},
 	[1806]={
@@ -238,6 +280,9 @@ local monster_dungeon_equip = {
 			20107,
 			20108
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=47000
 	},
 	[1906]={
@@ -250,6 +295,9 @@ local monster_dungeon_equip = {
 			20044,
 			20045
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=52000
 	},
 	[2006]={
@@ -283,6 +331,9 @@ local monster_dungeon_equip = {
 			20062,
 			20063
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=27000
 	},
 	[2206]={
@@ -295,6 +346,9 @@ local monster_dungeon_equip = {
 			20092,
 			20093
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=36000
 	},
 	[2306]={
@@ -307,6 +361,9 @@ local monster_dungeon_equip = {
 			20035,
 			20036
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=47000
 	},
 	[2406]={
@@ -319,6 +376,9 @@ local monster_dungeon_equip = {
 			20002,
 			20003
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=52000
 	},
 	[2506]={
@@ -351,6 +411,9 @@ local monster_dungeon_equip = {
 			20131,
 			20132
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=27000
 	},
 	[2706]={
@@ -363,6 +426,9 @@ local monster_dungeon_equip = {
 			20164,
 			20165
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=36000
 	},
 	[2806]={
@@ -375,6 +441,9 @@ local monster_dungeon_equip = {
 			20008,
 			20009
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=47000
 	},
 	[2906]={
@@ -387,6 +456,9 @@ local monster_dungeon_equip = {
 			20080,
 			20081
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=52000
 	},
 	[3006]={
@@ -420,6 +492,9 @@ local monster_dungeon_equip = {
 			20152,
 			20153
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=27000
 	},
 	[3206]={
@@ -432,6 +507,9 @@ local monster_dungeon_equip = {
 			20182,
 			20183
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=36000
 	},
 	[3306]={
@@ -444,6 +522,9 @@ local monster_dungeon_equip = {
 			20104,
 			20105
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=47000
 	},
 	[3406]={
@@ -456,6 +537,9 @@ local monster_dungeon_equip = {
 			20179,
 			20180
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=52000
 	},
 	[3506]={
@@ -488,6 +572,9 @@ local monster_dungeon_equip = {
 			20086,
 			20087
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=27000
 	},
 	[3706]={
@@ -500,6 +587,9 @@ local monster_dungeon_equip = {
 			20041,
 			20042
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=36000
 	},
 	[3806]={
@@ -512,6 +602,9 @@ local monster_dungeon_equip = {
 			20071,
 			20072
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=47000
 	},
 	[3906]={
@@ -524,6 +617,9 @@ local monster_dungeon_equip = {
 			20098,
 			20099
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=52000
 	},
 	[4006]={
@@ -556,6 +652,9 @@ local monster_dungeon_equip = {
 			20158,
 			20159
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=27000
 	},
 	[4206]={
@@ -568,6 +667,9 @@ local monster_dungeon_equip = {
 			20107,
 			20108
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=36000
 	},
 	[4306]={
@@ -580,6 +682,9 @@ local monster_dungeon_equip = {
 			20032,
 			20033
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=47000
 	},
 	[4406]={
@@ -592,6 +697,9 @@ local monster_dungeon_equip = {
 			20143,
 			20144
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=52000
 	},
 	[4506]={
@@ -625,6 +733,9 @@ local monster_dungeon_equip = {
 			20122,
 			20123
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=27000
 	},
 	[4706]={
@@ -637,6 +748,9 @@ local monster_dungeon_equip = {
 			20074,
 			20075
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=36000
 	},
 	[4806]={
@@ -649,6 +763,9 @@ local monster_dungeon_equip = {
 			20053,
 			20054
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=47000
 	},
 	[4906]={
@@ -661,6 +778,9 @@ local monster_dungeon_equip = {
 			20002,
 			20003
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=52000
 	},
 	[5006]={
@@ -693,6 +813,9 @@ local monster_dungeon_equip = {
 			20131,
 			20132
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=27000
 	},
 	[5206]={
@@ -705,6 +828,9 @@ local monster_dungeon_equip = {
 			20164,
 			20165
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=36000
 	},
 	[5306]={
@@ -717,6 +843,9 @@ local monster_dungeon_equip = {
 			20008,
 			20009
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=47000
 	},
 	[5406]={
@@ -729,6 +858,9 @@ local monster_dungeon_equip = {
 			20080,
 			20081
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=52000
 	},
 	[5506]={
@@ -762,6 +894,9 @@ local monster_dungeon_equip = {
 			20083,
 			20084
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=27000
 	},
 	[5706]={
@@ -774,6 +909,9 @@ local monster_dungeon_equip = {
 			20161,
 			20162
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=36000
 	},
 	[5806]={
@@ -786,6 +924,9 @@ local monster_dungeon_equip = {
 			20149,
 			20150
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=47000
 	},
 	[5906]={
@@ -798,6 +939,9 @@ local monster_dungeon_equip = {
 			20191,
 			20192
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=52000
 	},
 	[6006]={
@@ -830,6 +974,9 @@ local monster_dungeon_equip = {
 			20041,
 			20042
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=27000
 	},
 	[6206]={
@@ -842,6 +989,9 @@ local monster_dungeon_equip = {
 			20071,
 			20072
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=36000
 	},
 	[6306]={
@@ -854,6 +1004,9 @@ local monster_dungeon_equip = {
 			20059,
 			20060
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=47000
 	},
 	[6406]={
@@ -866,6 +1019,9 @@ local monster_dungeon_equip = {
 			20098,
 			20099
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=52000
 	},
 	[6506]={
@@ -898,6 +1054,9 @@ local monster_dungeon_equip = {
 			20143,
 			20144
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=27000
 	},
 	[6706]={
@@ -910,6 +1069,9 @@ local monster_dungeon_equip = {
 			20017,
 			20018
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=36000
 	},
 	[6806]={
@@ -922,6 +1084,9 @@ local monster_dungeon_equip = {
 			20158,
 			20159
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=47000
 	},
 	[6906]={
@@ -934,6 +1099,9 @@ local monster_dungeon_equip = {
 			20068,
 			20069
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=52000
 	},
 	[7006]={
@@ -967,6 +1135,9 @@ local monster_dungeon_equip = {
 			20053,
 			20054
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=27000
 	},
 	[7206]={
@@ -979,6 +1150,9 @@ local monster_dungeon_equip = {
 			20101,
 			20102
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=36000
 	},
 	[7306]={
@@ -991,6 +1165,9 @@ local monster_dungeon_equip = {
 			20074,
 			20075
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=47000
 	},
 	[7406]={
@@ -1003,6 +1180,9 @@ local monster_dungeon_equip = {
 			20119,
 			20120
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=52000
 	},
 	[7506]={
@@ -1035,6 +1215,9 @@ local monster_dungeon_equip = {
 			20155,
 			20156
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=27000
 	},
 	[7706]={
@@ -1047,6 +1230,9 @@ local monster_dungeon_equip = {
 			20125,
 			20126
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=36000
 	},
 	[7806]={
@@ -1059,6 +1245,9 @@ local monster_dungeon_equip = {
 			20095,
 			20096
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=47000
 	},
 	[7906]={
@@ -1071,6 +1260,9 @@ local monster_dungeon_equip = {
 			20080,
 			20081
 		},
+		["passive_skill"]={
+			10012
+		},
 		["monster_exp"]=52000
 	},
 	[8006]={
@@ -1104,6 +1296,9 @@ local monster_dungeon_equip = {
 			20104,
 			20105
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=27000
 	},
 	[8206]={
@@ -1116,6 +1311,9 @@ local monster_dungeon_equip = {
 			20047,
 			20048
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=36000
 	},
 	[8306]={
@@ -1128,6 +1326,9 @@ local monster_dungeon_equip = {
 			20065,
 			20066
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=47000
 	},
 	[8406]={
@@ -1140,6 +1341,9 @@ local monster_dungeon_equip = {
 			20149,
 			20150
 		},
+		["passive_skill"]={
+			10008
+		},
 		["monster_exp"]=52000
 	},
 	[8506]={
@@ -1172,6 +1376,9 @@ local monster_dungeon_equip = {
 			20059,
 			20060
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=27000
 	},
 	[8706]={
@@ -1184,6 +1391,9 @@ local monster_dungeon_equip = {
 			20098,
 			20099
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=36000
 	},
 	[8806]={
@@ -1196,6 +1406,9 @@ local monster_dungeon_equip = {
 			20086,
 			20087
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=47000
 	},
 	[8906]={
@@ -1208,6 +1421,9 @@ local monster_dungeon_equip = {
 			20050,
 			20051
 		},
+		["passive_skill"]={
+			10009
+		},
 		["monster_exp"]=52000
 	},
 	[9006]={
@@ -1240,6 +1456,9 @@ local monster_dungeon_equip = {
 			20044,
 			20045
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=27000
 	},
 	[9206]={
@@ -1252,6 +1471,9 @@ local monster_dungeon_equip = {
 			20158,
 			20159
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=36000
 	},
 	[9306]={
@@ -1264,6 +1486,9 @@ local monster_dungeon_equip = {
 			20017,
 			20018
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=47000
 	},
 	[9406]={
@@ -1276,6 +1501,9 @@ local monster_dungeon_equip = {
 			20056,
 			20057
 		},
+		["passive_skill"]={
+			10010
+		},
 		["monster_exp"]=52000
 	},
 	[9506]={
@@ -1309,6 +1537,9 @@ local monster_dungeon_equip = {
 			20089,
 			20090
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=27000
 	},
 	[9706]={
@@ -1321,6 +1552,9 @@ local monster_dungeon_equip = {
 			20101,
 			20102
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=36000
 	},
 	[9806]={
@@ -1333,6 +1567,9 @@ local monster_dungeon_equip = {
 			20053,
 			20054
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=47000
 	},
 	[9906]={
@@ -1345,6 +1582,9 @@ local monster_dungeon_equip = {
 			20035,
 			20036
 		},
+		["passive_skill"]={
+			10011
+		},
 		["monster_exp"]=52000
 	},
 	[10006]={

lua/app/config/skill.lua

@@ -10042,8 +10042,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=2,
+		["cd_start"]=1,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound"]=10042,
@@ -10072,8 +10072,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=3,
+		["cd_start"]=2,
 		["sound"]=42001201,
 		["sound_delay"]=0.5,
 		["name_act"]="skill02",
@@ -10394,8 +10394,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=2,
+		["cd_start"]=1,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound"]=10042,
@@ -10424,8 +10424,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=3,
+		["cd_start"]=2,
 		["sound"]=42001201,
 		["sound_delay"]=0.5,
 		["name_act"]="skill02",
@@ -10746,8 +10746,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=2,
+		["cd_start"]=1,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound"]=10042,
@@ -10776,8 +10776,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=3,
+		["cd_start"]=2,
 		["sound"]=42001201,
 		["sound_delay"]=0.5,
 		["name_act"]="skill02",
@@ -11098,8 +11098,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=2,
+		["cd_start"]=1,
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound"]=10042,
@@ -11128,8 +11128,8 @@ local skill = {
 			2,
 			0
 		},
-		["cd"]=3,
+		["cd"]=2,
-		["cd_start"]=3,
+		["cd_start"]=2,
 		["sound"]=42001201,
 		["sound_delay"]=0.5,
 		["name_act"]="skill02",

lua/app/config/strings/cn/equip.lua

@@ -15,7 +15,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[1300101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="宽剑,精铁宽剑,勇士宽剑,贵族宽剑,迅影宽剑,逐风"
 	},
 	[1300102]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -30,7 +30,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[1300201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="拳套,搏击拳套,秘法拳套,淬火拳套,龙焰拳套,净化之焰"
 	},
 	[1300202]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -45,7 +45,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[1400101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="巨力锤,战者之锤,流星巨锤,破军锤,断魂锤,陨星"
 	},
 	[1400102]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -60,7 +60,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[1400201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="猫拳,尖刺猫拳,青钢猫拳,裂伤猫拳,破空猫拳,福神之力"
 	},
 	[1400202]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -75,7 +75,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[2200101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="弯刀,狼牙弯刀,飞虹刀,断瀑刀,屠魔刀,斩龙刀"
 	},
 	[2200102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -90,7 +90,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[2300101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="回旋骨刀,锯齿骨刀,尖刺骨刀,龙牙骨刀,嗜血骨刀,狂骨刀"
 	},
 	[2300102]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -105,7 +105,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[2300201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="西洋剑,华贵长剑,金蛇剑,幻影剑,鹰喙,独角兽之灵"
 	},
 	[2300202]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -120,7 +120,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[2400101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="阔剑,钢铁阔剑,劈山剑,囚魂剑,堕落魔剑,阿波菲斯之遗"
 	},
 	[2400102]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -135,7 +135,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[2400201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="雷锤,闪电雷锤,震荡雷锤,震天雷锤,罚罪雷锤,掣电雷锤"
 	},
 	[2400202]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -165,7 +165,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[3300101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="法杖,灵木杖,雀羽杖,鹿鸣杖,树神杖,聚灵杖"
 	},
 	[3300102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -180,7 +180,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[3300201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="爪套,猛兽爪,狼王利爪,剜心爪,摄魂爪,鬼神刺"
 	},
 	[3300202]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -195,7 +195,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[3400101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="弓箭,檀木弓,黑金弓,太极弓,轩辕弓,凤翼"
 	},
 	[3400102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -210,7 +210,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[3400201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="魅心,展颜,玲珑,眸若碧波,灿若繁星,日月失辉"
 	},
 	[3400202]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -225,7 +225,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[4200101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="魔杖,精致魔杖,水晶魔杖,寒冰魔杖,霜星魔杖,雪域冰天"
 	},
 	[4200102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -240,7 +240,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[4300101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="冰晶,破碎冰晶,闪耀冰晶,永冻冰晶,传说冰晶,冰龙之眸"
 	},
 	[4300102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -255,7 +255,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[4300201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="匕首,染血匕首,蛇骨匕首,毒刺匕首,封印之匕,恶鬼獠牙"
 	},
 	[4300202]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -270,7 +270,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[4400101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="飞刃,寒芒刃,风雪刃,冰灵刃,圣灵刃,冰脉的传承"
 	},
 	[4400102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -285,7 +285,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[4400201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="法球,蒙尘法球,黯光法球,符文法球,诅咒法球,法老之心"
 	},
 	[4400202]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -300,7 +300,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[5200101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="手里剑,大型手里剑,机关手里剑,疾风手里剑,幽灵手里剑,追影"
 	},
 	[5200102]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -315,7 +315,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[5300101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="扫把,古木扫把,飞行扫把,巫术扫把,精灵扫把,神鸟之羽"
 	},
 	[5300102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -330,7 +330,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[5300201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="镰刀,碎骨镰,蝠翼镰,暗影镰,恶魔镰,哈迪斯之握"
 	},
 	[5300202]={
 		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
@@ -345,7 +345,7 @@ local equip = {
 		["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
 	},
 	[5400101]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="太刀,玄铁刀,藏锋刀,流光刀,幻影刀,妖刀村正"
 	},
 	[5400102]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"
@@ -360,7 +360,7 @@ local equip = {
 		["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲"
 	},
 	[5400201]={
-		["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇"
+		["name"]="环刃,蛇形环,月牙环,断肠环,离魂环,月痕"
 	},
 	[5400202]={
 		["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠"

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

@@ -367,12 +367,12 @@ local localization_global =
     ["EQUIP_DESC_1"] = "武器",
     ["EQUIP_DESC_2"] = "防具",
     ["EQUIP_DESC_3"] = "强化",
-    ["EQUIP_DESC_4"] = "专武属性",
+    ["EQUIP_DESC_4"] = "武器属性",
-    ["EQUIP_DESC_5"] = "专武特性",
+    ["EQUIP_DESC_5"] = "武器特性",
     ["EQUIP_DESC_6"] = "套装效果",
     ["EQUIP_DESC_7"] = "玩家等级{0}级可继续强化",
     ["EQUIP_DESC_8"] = "材料不足",
-    ["EQUIP_DESC_9"] = "专武需强化到{0}",
+    ["EQUIP_DESC_9"] = "武器需强化到{0}",
     ["EQUIP_DESC_10"] = "普攻伤害",
     ["EQUIP_DESC_11"] = "技能伤害",
     ["EQUIP_DESC_12"] = "待解锁",
@@ -419,6 +419,7 @@ local localization_global =
     ["DUNGEON_ARMOR_FUND_2"] = "时空裂隙基金Ⅱ",
     ["DUNGEON_ARMOR_DESC_15"] = "请先购买本基金",
     ["DUNGEON_ARMOR_DESC_16"] = "超值",
+    ["MOP_UP_DESC_3"] = "足够",
 }
 
 return localization_global

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="解锁雷神之锤：额外造成一次大量技能伤害。"
 	},
 	[2400201]={
-		["desc"]="雷神之锤可随机消除4个元素。"
+		["desc"]="雷神之锤可随机消除<color=#3cff28>4</color>个元素。"
 	},
 	[2400202]={
 		["desc"]="雷神之锤使用后随机增加一种技能的能量<color=#3cff28>2</color>点。"
 	},
 	[2400203]={
-		["desc"]="雷神之锤可随机消除2个元素。"
+		["desc"]="雷神之锤可随机消除<color=#3cff28>2</color>个元素。"
 	},
 	[2400204]={
 		["desc"]="索尔普攻时有<color=#3cff28>10%</color>概率附加<color=#3cff28>虚弱</color>效果，<color=#3cff28>1</color>回合。"

lua/app/config/strings/cn/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="请点击这里查看对战规则。"
+	},
+	["tutorial_txt_11"]={
+		["value"]="武器可以提升大量进攻类属性！"
+	},
+	["tutorial_txt_12"]={
+		["value"]="让我们先去获取一下武器强化材料吧！"
+	},
+	["tutorial_txt_13"]={
+		["value"]="防具可以同时提升进攻和生存属性！"
+	},
+	["tutorial_txt_14"]={
+		["value"]="让我们去获取一下防具强化材料吧！"
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

lua/app/config/strings/de/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="Unlock Mjolnir: Deal one additional hit of massive skill damage."
 	},
 	[2400201]={
-		["desc"]="Mjolnir can clear 4 random elements."
+		["desc"]="Mjolnir can clear <color=#3cff28>4</color> random elements."
 	},
 	[2400202]={
 		["desc"]="When Mjolnir is used, a random skill energy increases by <color=#3cff28>2</color>."
 	},
 	[2400203]={
-		["desc"]="Mjolnir can clear 2 random elements."
+		["desc"]="Mjolnir can clear <color=#3cff28>2</color> random elements."
 	},
 	[2400204]={
 		["desc"]="Thor's normal attack has a <color=#3cff28>10%</color> chance of inflicting Weak for <color=#3cff28>1</color> turn."

lua/app/config/strings/en/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="Please click here to view the battle rules."
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="Desbloquea Martillo de Thor: causa un masivo daño de habilidad adicional."
 	},
 	[2400201]={
-		["desc"]="Martillo de Thor puede elimina 4 elementos aleatorios."
+		["desc"]="Martillo de Thor puede elimina <color=#3cff28>4</color> elementos aleatorios."
 	},
 	[2400202]={
 		["desc"]="Al usar Martillo de Thor, la energía de una habilidad aleatoria aumenta en <color=#3cff28>2</color> puntos."
 	},
 	[2400203]={
-		["desc"]="Martillo de Thor puede eliminar 2 elementos aleatorios."
+		["desc"]="Martillo de Thor puede eliminar <color=#3cff28>2</color> elementos aleatorios."
 	},
 	[2400204]={
 		["desc"]="El ataque común de Sol tiene un <color=#3cff28>10%</color> de chance de aplicar Debilidad durante <color=#3cff28>1</color> ronda."

lua/app/config/strings/es/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="Haz clic aquí para ver las reglas del juego."
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

lua/app/config/strings/fr/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="Membuka Palu Thor: Menyebabkan DMG skill tambahan dalam jumlah besar."
 	},
 	[2400201]={
-		["desc"]="Palu Thor dapat menghilangkan 4 elemen secara acak."
+		["desc"]="Palu Thor dapat menghilangkan <color=#3cff28>4</color> elemen secara acak."
 	},
 	[2400202]={
 		["desc"]="Palu Thor meningkatkan energi satu skill sebesar <color=#3cff28>2</color> poin secara acak saat digunakan."
 	},
 	[2400203]={
-		["desc"]="Palu Thor dapat menghilangkan 2 elemen secara acak."
+		["desc"]="Palu Thor dapat menghilangkan <color=#3cff28>2</color> elemen secara acak."
 	},
 	[2400204]={
 		["desc"]="Ada <color=#3cff28>10%</color> peluang menambahkan efek <color=#3cff28>Lemah</color> pada serangan Thor selama <color=#3cff28>1</color> giliran."

lua/app/config/strings/id/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="Silakan ketuk di sini untuk melihat aturan battle."
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="ソーのハンマー解放：追加で大ダメージを与えるスキルを1回発動する。"
 	},
 	[2400201]={
-		["desc"]="「ソーのハンマー」はランダムで4つの元素を消す。"
+		["desc"]="「ソーのハンマー」はランダムで<color=#3cff28>4</color>つの元素を消す。"
 	},
 	[2400202]={
 		["desc"]="「ソーのハンマー」はいずれの元素のエネルギーを<color=#3cff28>2</color>カウント増加する。"
 	},
 	[2400203]={
-		["desc"]="「ソーのハンマー」はランダムで2つの元素を消す。"
+		["desc"]="「ソーのハンマー」はランダムで<color=#3cff28>2</color>つの元素を消す。"
 	},
 	[2400204]={
 		["desc"]="ソーの通常攻撃は<color=#3cff28>10%</color>の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28>弱体</color>効果を付与する。"

lua/app/config/strings/ja/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="ここをタップして、対戦ルールを確認してください。"
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="토르의 망치 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입힙니다."
 	},
 	[2400201]={
-		["desc"]="토르의 망치는 랜덤으로 4개의 원소를 소멸할 수 있습니다."
+		["desc"]="토르의 망치는 랜덤으로 <color=#3cff28>4</color>개의 원소를 소멸할 수 있습니다."
 	},
 	[2400202]={
 		["desc"]="토르의 망치를 사용하면 랜덤으로 하나의 스킬 에너지가 <color=#3cff28>2</color> 포인트 증가합니다."
 	},
 	[2400203]={
-		["desc"]="토르의 망치는 랜덤으로 2개의 원소를 소멸할 수 있습니다."
+		["desc"]="토르의 망치는 랜덤으로 <color=#3cff28>2</color>개의 원소를 소멸할 수 있습니다."
 	},
 	[2400204]={
 		["desc"]="토르의 일반 공격은 <color=#3cff28>10%</color> 확률로 <color=#3cff28>1</color>턴 동안 <color=#3cff28>탈진</color> 효과를 부여합니다."

lua/app/config/strings/ko/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="대결 규칙을 보려면 이곳을 클릭해 주세요."
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="Desbloquear o Martelo de Thor: causa dano adicional significativo com habilidades."
 	},
 	[2400201]={
-		["desc"]="O Martelo de Thor pode eliminar aleatoriamente 4 elementos."
+		["desc"]="O Martelo de Thor pode eliminar aleatoriamente <color=#3cff28>4</color> elementos."
 	},
 	[2400202]={
 		["desc"]="Após usar o Martelo de Thor, aumenta aleatoriamente a energia de uma habilidade em <color=#3cff28>2</color> pontos."
 	},
 	[2400203]={
-		["desc"]="O Martelo de Thor pode eliminar aleatoriamente 2 elementos."
+		["desc"]="O Martelo de Thor pode eliminar aleatoriamente <color=#3cff28>2</color> elementos."
 	},
 	[2400204]={
 		["desc"]="Durante o ataque de Solpu, há uma probabilidade de <color=#3cff28>10%</color> de adicionar o efeito <color=#3cff28>fraqueza</color> por <color=#3cff28>1</color> turno."

lua/app/config/strings/pt/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="Confira as regras de batalha aqui."
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

lua/app/config/strings/ru/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="ปลดล็อคค้อนของเทพสายฟ้า: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง"
 	},
 	[2400201]={
-		["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด 4 ธาตุ"
+		["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด <color=#3cff28>4</color> ธาตุ"
 	},
 	[2400202]={
 		["desc"]="หลังจากใช้ค้อนของเทพสายฟ้าจะสุ่มเพิ่มพลังงาน<color=#3cff28>2</color>แต้มของสกิลอย่างใดอย่างหนึ่ง"
 	},
 	[2400203]={
-		["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด 2 ธาตุ"
+		["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด <color=#3cff28>2</color> ธาตุ"
 	},
 	[2400204]={
 		["desc"]="เมื่อโซลโจมตีทั่วไปจะมีโอกาส<color=#3cff28>10%</color>เพิ่มเอฟเฟกต์<color=#3cff28>อ่อนแอ</color> <color=#3cff28>1</color>รอบ"

lua/app/config/strings/th/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="กรุณาแตะที่นี่เพื่อดูกติกาของเกม"
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="Mở khóa Búa Thor: Gây thêm 1 lần nhiều sát thương kỹ năng."
 	},
 	[2400201]={
-		["desc"]="Búa Thor có thể xua tan ngẫu nhiên 4 nguyên tố."
+		["desc"]="Búa Thor có thể xua tan ngẫu nhiên <color=#3cff28>4</color> nguyên tố."
 	},
 	[2400202]={
 		["desc"]="Sau khi dùng Búa Thor tăng ngẫu nhiên 1 loại kỹ năng <color=#3cff28>2</color> Năng Lượng."
 	},
 	[2400203]={
-		["desc"]="Búa Thor có thể xua tan ngẫu nhiên 2 nguyên tố."
+		["desc"]="Búa Thor có thể xua tan ngẫu nhiên <color=#3cff28>2</color> nguyên tố."
 	},
 	[2400204]={
 		["desc"]="Khi Thor đánh thường có <color=#3cff28>10%</color> kèm hiệu quả<color=#3cff28>Suy Yếu</color>, <color=#3cff28>1</color> hiệp."

lua/app/config/strings/vi/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="Hãy ấn vào đây xem quy tắc."
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

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

@@ -351,13 +351,13 @@ local skill_rogue = {
 		["desc"]="解鎖雷神之鎚：額外造成一次大量技能傷害。"
 	},
 	[2400201]={
-		["desc"]="雷神之鎚可隨機消除4個元素。"
+		["desc"]="雷神之鎚可隨機消除<color=#3cff28>4</color>個元素。"
 	},
 	[2400202]={
 		["desc"]="雷神之鎚使用後隨機增加一種技能的能量<color=#3cff28>2</color>點。"
 	},
 	[2400203]={
-		["desc"]="雷神之鎚可隨機消除2個元素。"
+		["desc"]="雷神之鎚可隨機消除<color=#3cff28>2</color>個元素。"
 	},
 	[2400204]={
 		["desc"]="索爾普攻時有<color=#3cff28>10%</color>機率附帶<color=#3cff28>虛弱</color>效果，<color=#3cff28>1</color>回合。"

lua/app/config/strings/zh/tutorial.lua

@@ -28,9 +28,21 @@ local tutorial = {
 	},
 	["tutorial_txt_10"]={
 		["value"]="請點擊這裡查看對戰規則。"
+	},
+	["tutorial_txt_11"]={
+
+	},
+	["tutorial_txt_12"]={
+
+	},
+	["tutorial_txt_13"]={
+
+	},
+	["tutorial_txt_14"]={
+
 	}
 }
 local config = {
-data=tutorial,count=10
+data=tutorial,count=14
 }
 return config

lua/app/config/tutorial.lua

@@ -614,9 +614,226 @@ local tutorial = {
 			0,
 			50
 		}
+	},
+	[80000]={
+		["next_id"]=80010,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[80010]={
+		["next_id"]=80020,
+		["delay"]=0.5,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		},
+		["show_mask"]=1
+	},
+	[80020]={
+		["next_id"]=80030,
+		["type"]=2,
+		["target_name"]="hero_detail_ui(Clone)/common/btns/btn_weapon",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
+	},
+	[80030]={
+		["next_id"]=80040,
+		["type"]=1,
+		["txt"]="tutorial_txt_11",
+		["txt_offset"]={
+			0,
+			200
+		}
+	},
+	[80040]={
+		["next_id"]=80050,
+		["type"]=3,
+		["txt"]="tutorial_txt_12",
+		["txt_offset"]={
+			0,
+			200
+		},
+		["target_name"]="hero_detail_ui(Clone)/common/btn_close"
+	},
+	[80050]={
+		["next_id"]=80060,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[80060]={
+		["next_id"]=80070,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		},
+		["show_mask"]=2,
+		["circle_r"]=150,
+		["circle_offset"]={
+			0,
+			0
+		}
+	},
+	[80070]={
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_2/btn_start",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		}
+	},
+	[90000]={
+		["next_id"]=90010,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[90010]={
+		["next_id"]=90020,
+		["delay"]=0.5,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		},
+		["show_mask"]=1
+	},
+	[90020]={
+		["next_id"]=90030,
+		["type"]=2,
+		["target_name"]="hero_detail_ui(Clone)/common/btns/btn_armor",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		}
+	},
+	[90030]={
+		["next_id"]=90040,
+		["type"]=1,
+		["txt"]="tutorial_txt_13",
+		["txt_offset"]={
+			0,
+			200
+		}
+	},
+	[90040]={
+		["next_id"]=90050,
+		["type"]=3,
+		["txt"]="tutorial_txt_14",
+		["txt_offset"]={
+			0,
+			200
+		},
+		["target_name"]="hero_detail_ui(Clone)/common/btn_close"
+	},
+	[90050]={
+		["next_id"]=90060,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			0
+		},
+		["show_mask"]=1,
+		["square_size"]={
+			50,
+			50
+		},
+		["square_offset"]={
+			0,
+			0
+		}
+	},
+	[90060]={
+		["next_id"]=90070,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon",
+		["arrow_direction"]=1,
+		["arrow_offset"]={
+			0,
+			-50
+		},
+		["show_mask"]=2,
+		["circle_r"]=150,
+		["circle_offset"]={
+			0,
+			0
+		}
+	},
+	[90070]={
+		["next_id"]=90080,
+		["type"]=2,
+		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_3/btn_start",
+		["arrow_direction"]=2,
+		["arrow_offset"]={
+			0,
+			50
+		}
+	},
+	[90080]={
+		["type"]=2,
+		["target_name"]="dungeon_armor_main_ui(Clone)/scrollrect/viewport/content/scroll_cell_1/touch_node",
+		["arrow_direction"]=4,
+		["arrow_offset"]={
+			20,
+			0
+		}
 	}
 }
 local config = {
-data=tutorial,count=46
+data=tutorial,count=63
 }
 return config

lua/app/config/tutorial_start.lua

@@ -26,9 +26,17 @@ local tutorial_start = {
 	[7]={
 		["start_id"]=70000,
 		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
+	},
+	[8]={
+		["start_id"]=80000,
+		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
+	},
+	[9]={
+		["start_id"]=90000,
+		["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
 	}
 }
 local config = {
-data=tutorial_start,count=7
+data=tutorial_start,count=9
 }
 return config

lua/app/module/tutorial/tutorial_const.lua

@@ -10,6 +10,8 @@ TutorialConst.PASS_THREE_CHAPTER = 4
 TutorialConst.UNLOCK_DAILY_CHALLENGE = 5
 TutorialConst.UNLOCK_DUNGEON = 6
 TutorialConst.UNLOCK_ARENA = 7
+TutorialConst.WEAPON_DUNGEON = 8
+TutorialConst.ARMOR_DUNGEON = 9
 
 TutorialConst.TUTORIAL_TYPE = {
 	CLICK = 1,	-- 点击任意区域

lua/app/ui/main_city/main_city_ui.lua

@@ -1034,6 +1034,18 @@ function MainCityUI:checkTutorial(onlyCheck)
             return true
         end
     end
+
+    if DataManager.DungeonData:isOpen(ModuleManager.MODULE_KEY.EQUIP_WEAPON) then
+        if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.WEAPON_DUNGEON, onlyCheck) then
+            return true
+        end
+    end
+
+    if DataManager.DungeonData:isOpen(ModuleManager.MODULE_KEY.EQUIP_ARMOR) then
+        if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.ARMOR_DUNGEON, onlyCheck) then
+            return true
+        end
+    end
 end
 
 -- 检查礼包(首充(作废)/入门/章节/新手/助力/成长/金币顺序)