战令

lua/app/common/module_manager.lua

@@ -45,6 +45,7 @@ ModuleManager.MODULE_KEY = {
 	TASK = "task",
 	STORE_BOX_OPEN = "store_box_open",
 	STORE_BOX_3_OPEN = "store_box_3_open",
+	BOUNTY_OPEN = "bounty_open",
 }
 
 local _moduleMgrs = {}

lua/app/common/time.lua

@@ -43,28 +43,7 @@ function Time:getCertainTime(data)
 end
 
 -- 得到特定时间的时间戳
--- 没有算时区差异，优先使用getCertainTimeByStr2
 function Time:getCertainTimeByStr(timeStr)
-    -- "2022-08-9 00:00:00"
-    if type(timeStr) ~= "string" then
-        return 0
-    end
-    timeStr = string.trim(timeStr)
-    local timeTab = {}
-    for i,v in string.gmatch(timeStr, "%d+") do
-        -- print(i, v)
-        table.insert(timeTab, i)
-    end
-    local year = timeTab[1]
-    local month = timeTab[2]
-    local day = timeTab[3]
-    local hour = timeTab[4]
-    local minute = timeTab[5]
-    local second = timeTab[6]
-    return os.time({day = day, month = month, year = year, hour = hour, min = minute, sec = second})
-end
-
-function Time:getCertainTimeByStr2(timeStr)
     -- "2022-08-9 00:00:00"
     if type(timeStr) ~= "string" then
         return 0

lua/app/config/bounty_level.lua

@@ -13,10 +13,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=2,
+			["id"]=44001,
- 			["id_for_nothing"]="VA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=1,
+			["num"]=3,
- 			["num_for_nothing"]="Vw=="
+ 			["num_for_nothing"]="VQ=="
 		}
 	},
 	[102]={
@@ -193,10 +193,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
@@ -394,10 +394,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
@@ -595,10 +595,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
@@ -796,10 +796,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
@@ -997,10 +997,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
@@ -1198,10 +1198,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
@@ -1399,10 +1399,10 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
@@ -1600,16 +1600,16 @@ local bounty_level = {
 		["reward_pro"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=6,
+			["id"]=44001,
- 			["id_for_nothing"]="UA==",
+ 			["id_for_nothing"]="UgxcA2Q=",
-			["num"]=10,
+			["num"]=3,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VQ=="
 		},
 		["reward_type"]=1
 	},
 	[181]={
 		["season"]=1,
-		["exp"]=500,
+		["exp"]=1000,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
@@ -3229,7 +3229,7 @@ local bounty_level = {
 	},
 	[281]={
 		["season"]=2,
-		["exp"]=500,
+		["exp"]=1000,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",

lua/app/config/chapter.lua

@@ -14,9 +14,9 @@ local chapter = {
 		},
 		["involved_skill"]={
 			{
-				200100,
+				3200101,
-				200200,
+				2200101,
-				200300
+				4200101
 			}
 		},
 		["not_involved_skill"]={
@@ -40,6 +40,24 @@ local chapter = {
 			401,
 			501
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -160,6 +178,38 @@ local chapter = {
 			1401,
 			1501
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -318,6 +368,38 @@ local chapter = {
 			2901,
 			3001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -498,6 +580,38 @@ local chapter = {
 			4901,
 			5001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -705,6 +819,38 @@ local chapter = {
 			6901,
 			7001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -912,6 +1058,38 @@ local chapter = {
 			8901,
 			9001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -1119,6 +1297,38 @@ local chapter = {
 			10901,
 			11001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -1342,6 +1552,38 @@ local chapter = {
 			12901,
 			13001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -1565,6 +1807,38 @@ local chapter = {
 			14901,
 			15001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,
@@ -1787,6 +2061,38 @@ local chapter = {
 			16901,
 			17001
 		},
+		["mystery_box"]={
+			{
+				1,
+				5
+			},
+			{
+				6,
+				10
+			}
+		},
+		["mystery_box_reward"]={
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			},
+			{
+				{
+					["type"]=1,
+ 					["type_for_nothing"]="Vw==",
+					["id"]=2,
+ 					["id_for_nothing"]="VA==",
+					["num"]=10,
+ 					["num_for_nothing"]="Vwg="
+				}
+			}
+		},
 		["wave_reward"]={
 			{
 				["type"]=1,

lua/app/config/chapter_board.lua

@@ -198,6 +198,21 @@ local chapter_board = {
 				0
 			}
 		},
+		["control_element"]={
+			3,
+			3,
+			2,
+			3,
+			3,
+			3,
+			3,
+			3,
+			3,
+			3,
+			3,
+			3,
+			3
+		},
 		["control_element"]={
 			3,
 			3,

lua/app/config/func_open.lua

@@ -3,6 +3,9 @@ local func_open = {
 		["stage"]=3,
 		["pop_ups"]=1
 	},
+	["bounty_open"]={
+		["stage"]=2
+	},
 	["task"]={
 		["stage"]=2
 	},
@@ -30,6 +33,6 @@ local func_open = {
 	}
 }
 local config = {
-data=func_open,count=9
+data=func_open,count=10
 }
 return config

lua/app/config/hero.lua

@@ -3,17 +3,16 @@ local hero = {
 		["position"]=1,
 		["qlt"]=2,
 		["hurt_skill"]={
+			1200110,
 			1200111,
 			1200112,
-			1200113,
+			1200113
-			1200114
 		},
 		["base_skill"]=1200120,
-		["support_skill"]=1200110,
+		["rouge_skill"]=1200101,
-		["rouge_skill"]=200500,
+		["rouge_skill_1"]=1200102,
-		["rouge_skill_1"]=200501,
+		["rouge_skill_2"]=1200103,
-		["rouge_skill_2"]=200502,
+		["rouge_skill_3"]=1200104,
-		["rouge_skill_3"]=200503,
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
@@ -52,23 +51,184 @@ local hero = {
 		["model_id"]="p0005",
 		["icon"]="5",
 		["item_id"]=12001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
+	},
+	[13001]={
+		["position"]=1,
+		["qlt"]=3,
+		["hurt_skill"]={
+			1300110,
+			1300111,
+			1300112,
+			1300113
+		},
+		["base_skill"]=1300120,
+		["rouge_skill"]=1200101,
+		["rouge_skill_1"]=1200102,
+		["rouge_skill_2"]=1200103,
+		["rouge_skill_3"]=1200104,
+		["begin_lv"]=3,
+		["hp"]={
+			2000000,
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
+		},
+		["atk"]={
+			1000000,
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
+		},
+		["model_id"]="p0014",
+		["icon"]="5",
+		["item_id"]=13001,
+		["unlock_chapter"]=1
+	},
+	[13002]={
+		["position"]=1,
+		["qlt"]=3,
+		["hurt_skill"]={
+			1300210,
+			1300211,
+			1300212,
+			1300213
+		},
+		["base_skill"]=1300220,
+		["rouge_skill"]=1200101,
+		["rouge_skill_1"]=1200102,
+		["rouge_skill_2"]=1200103,
+		["rouge_skill_3"]=1200104,
+		["begin_lv"]=3,
+		["hp"]={
+			2000000,
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
+		},
+		["atk"]={
+			1000000,
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
+		},
+		["model_id"]="p0009",
+		["icon"]="5",
+		["item_id"]=13002,
+		["unlock_chapter"]=1
+	},
+	[24001]={
+		["position"]=1,
+		["qlt"]=4,
+		["hurt_skill"]={
+			2400110,
+			2400111,
+			2400112,
+			2400113
+		},
+		["base_skill"]=2400120,
+		["rouge_skill"]=1200101,
+		["rouge_skill_1"]=1200102,
+		["rouge_skill_2"]=1200103,
+		["rouge_skill_3"]=1200104,
+		["begin_lv"]=5,
+		["hp"]={
+			2000000,
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
+		},
+		["atk"]={
+			1000000,
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
+		},
+		["model_id"]="p0011",
+		["icon"]="5",
+		["item_id"]=24001,
+		["unlock_chapter"]=1
 	},
 	[22001]={
 		["position"]=2,
 		["qlt"]=2,
 		["hurt_skill"]={
+			2200110,
 			2200111,
 			2200112,
-			2200113,
+			2200113
-			2200114
 		},
 		["base_skill"]=2200120,
-		["support_skill"]=2200110,
+		["rouge_skill"]=2200101,
-		["rouge_skill"]=200200,
+		["rouge_skill_1"]=2200102,
-		["rouge_skill_1"]=200201,
+		["rouge_skill_2"]=2200103,
-		["rouge_skill_2"]=200202,
+		["rouge_skill_3"]=2200104,
-		["rouge_skill_3"]=200203,
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
@@ -107,78 +267,130 @@ local hero = {
 		["model_id"]="p0002",
 		["icon"]="2",
 		["item_id"]=22001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
 	},
 	[23001]={
 		["position"]=2,
 		["qlt"]=3,
 		["hurt_skill"]={
+			2300110,
 			2300111,
 			2300112,
-			2300113,
+			2300113
-			2300114
 		},
 		["base_skill"]=2300120,
-		["support_skill"]=2300110,
+		["rouge_skill"]=2200101,
-		["rouge_skill"]=200700,
+		["rouge_skill_1"]=2200102,
-		["rouge_skill_1"]=200701,
+		["rouge_skill_2"]=2200103,
-		["rouge_skill_2"]=200702,
+		["rouge_skill_3"]=2200104,
-		["rouge_skill_3"]=200703,
 		["begin_lv"]=3,
 		["hp"]={
-			3000000,
+			2000000,
-			3520000,
+			2400000,
-			4040000,
+			2800000,
-			4580000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7120000,
+			7140000,
-			7900000,
+			7940000,
-			8760000,
+			8840000,
-			9700000,
+			9840000,
-			10740000,
+			10980000
-			11920000,
-			13220000,
-			14700000
 		},
 		["atk"]={
-			1500000,
+			1000000,
-			1760000,
+			1200000,
-			2020000,
+			1400000,
-			2290000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3560000,
+			3570000,
-			3950000,
+			3970000,
-			4380000,
+			4420000,
-			4850000,
+			4920000,
-			5370000,
+			5490000
-			5960000,
+		},
-			6610000,
+		["model_id"]="p0010",
-			7350000
+		["icon"]="5",
+		["item_id"]=23001,
+		["unlock_chapter"]=1
+	},
+	[24001]={
+		["position"]=2,
+		["qlt"]=4,
+		["hurt_skill"]={
+			2400110,
+			2400111,
+			2400112,
+			2400113
+		},
+		["base_skill"]=2400120,
+		["rouge_skill"]=2400101,
+		["rouge_skill_1"]=2400102,
+		["rouge_skill_2"]=2400103,
+		["rouge_skill_3"]=2400104,
+		["begin_lv"]=5,
+		["hp"]={
+			2000000,
+			2400000,
+			2800000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
+			5160000,
+			5760000,
+			6420000,
+			7140000,
+			7940000,
+			8840000,
+			9840000,
+			10980000
+		},
+		["atk"]={
+			1000000,
+			1200000,
+			1400000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
+			2580000,
+			2880000,
+			3210000,
+			3570000,
+			3970000,
+			4420000,
+			4920000,
+			5490000
 		},
 		["model_id"]="p0007",
 		["icon"]="7",
-		["item_id"]=23001,
+		["item_id"]=24001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
 	},
 	[32001]={
 		["position"]=3,
 		["qlt"]=2,
 		["hurt_skill"]={
+			3200110,
 			3200111,
 			3200112,
-			3200113,
+			3200113
-			3200114
 		},
 		["base_skill"]=3200120,
-		["support_skill"]=3200110,
+		["rouge_skill"]=3200101,
-		["rouge_skill"]=200100,
+		["rouge_skill_1"]=3200102,
-		["rouge_skill_1"]=200101,
+		["rouge_skill_2"]=3200103,
-		["rouge_skill_2"]=200102,
+		["rouge_skill_3"]=3200104,
-		["rouge_skill_3"]=200103,
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
@@ -217,78 +429,76 @@ local hero = {
 		["model_id"]="p0001",
 		["icon"]="1",
 		["item_id"]=32001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
 	},
 	[33001]={
 		["position"]=3,
 		["qlt"]=3,
 		["hurt_skill"]={
+			3300110,
 			3300111,
 			3300112,
-			3300113,
+			3300113
-			3300114
 		},
 		["base_skill"]=3300120,
-		["support_skill"]=3300110,
+		["rouge_skill"]=3300101,
-		["rouge_skill"]=200600,
+		["rouge_skill_1"]=3300102,
-		["rouge_skill_1"]=200601,
+		["rouge_skill_2"]=3300103,
-		["rouge_skill_2"]=200602,
+		["rouge_skill_3"]=3300104,
-		["rouge_skill_3"]=200603,
 		["begin_lv"]=3,
 		["hp"]={
-			3000000,
+			2000000,
-			3520000,
+			2400000,
-			4040000,
+			2800000,
-			4580000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7120000,
+			7140000,
-			7900000,
+			7940000,
-			8760000,
+			8840000,
-			9700000,
+			9840000,
-			10740000,
+			10980000
-			11920000,
-			13220000,
-			14700000
 		},
 		["atk"]={
-			1500000,
+			1000000,
-			1760000,
+			1200000,
-			2020000,
+			1400000,
-			2290000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3560000,
+			3570000,
-			3950000,
+			3970000,
-			4380000,
+			4420000,
-			4850000,
+			4920000,
-			5370000,
+			5490000
-			5960000,
-			6610000,
-			7350000
 		},
 		["model_id"]="p0006",
 		["icon"]="6",
 		["item_id"]=33001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
 	},
 	[42001]={
 		["position"]=4,
 		["qlt"]=2,
 		["hurt_skill"]={
+			4200110,
 			4200111,
 			4200112,
-			4200113,
+			4200113
-			4200114
 		},
 		["base_skill"]=4200120,
-		["support_skill"]=4200110,
+		["rouge_skill"]=4200101,
-		["rouge_skill"]=200300,
+		["rouge_skill_1"]=4200102,
-		["rouge_skill_1"]=200301,
+		["rouge_skill_2"]=4200103,
-		["rouge_skill_2"]=200302,
+		["rouge_skill_3"]=4200104,
-		["rouge_skill_3"]=200303,
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
@@ -327,78 +537,76 @@ local hero = {
 		["model_id"]="p0003",
 		["icon"]="3",
 		["item_id"]=42001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
 	},
-	[43001]={
+	[44001]={
 		["position"]=4,
-		["qlt"]=3,
+		["qlt"]=4,
 		["hurt_skill"]={
-			4300111,
+			4400110,
-			4300112,
+			4400111,
-			4300113,
+			4400112,
-			4300114
+			4400113
 		},
-		["base_skill"]=4300120,
+		["base_skill"]=4400120,
-		["support_skill"]=4300110,
+		["rouge_skill"]=4400101,
-		["rouge_skill"]=200800,
+		["rouge_skill_1"]=4400102,
-		["rouge_skill_1"]=200801,
+		["rouge_skill_2"]=4400103,
-		["rouge_skill_2"]=200802,
+		["rouge_skill_3"]=4400104,
-		["rouge_skill_3"]=200803,
+		["begin_lv"]=5,
-		["begin_lv"]=3,
 		["hp"]={
-			3000000,
+			2000000,
-			3520000,
+			2400000,
-			4040000,
+			2800000,
-			4580000,
+			3220000,
+			3660000,
+			4120000,
+			4620000,
 			5160000,
 			5760000,
 			6420000,
-			7120000,
+			7140000,
-			7900000,
+			7940000,
-			8760000,
+			8840000,
-			9700000,
+			9840000,
-			10740000,
+			10980000
-			11920000,
-			13220000,
-			14700000
 		},
 		["atk"]={
-			1500000,
+			1000000,
-			1760000,
+			1200000,
-			2020000,
+			1400000,
-			2290000,
+			1610000,
+			1830000,
+			2060000,
+			2310000,
 			2580000,
 			2880000,
 			3210000,
-			3560000,
+			3570000,
-			3950000,
+			3970000,
-			4380000,
+			4420000,
-			4850000,
+			4920000,
-			5370000,
+			5490000
-			5960000,
-			6610000,
-			7350000
 		},
 		["model_id"]="p0008",
 		["icon"]="8",
-		["item_id"]=43001,
+		["item_id"]=44001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
 	},
 	[52001]={
 		["position"]=5,
 		["qlt"]=2,
 		["hurt_skill"]={
+			5200110,
 			5200111,
 			5200112,
-			5200113,
+			5200113
-			5200114
 		},
 		["base_skill"]=5200120,
-		["support_skill"]=5200110,
+		["rouge_skill"]=5200101,
-		["rouge_skill"]=200400,
+		["rouge_skill_1"]=5200102,
-		["rouge_skill_1"]=200401,
+		["rouge_skill_2"]=5200103,
-		["rouge_skill_2"]=200402,
+		["rouge_skill_3"]=5200104,
-		["rouge_skill_3"]=200403,
 		["begin_lv"]=1,
 		["hp"]={
 			2000000,
@@ -437,10 +645,10 @@ local hero = {
 		["model_id"]="p0004",
 		["icon"]="4",
 		["item_id"]=52001,
-		["unlock_chapter"]=0
+		["unlock_chapter"]=1
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

lua/app/config/item.lua

@@ -56,6 +56,18 @@ local item = {
 		["qlt"]=3,
 		["icon"]="5",
 		["hero_drop"]={
+			{
+				["type"]=1,
+				["id"]=13001,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=13002,
+				["num"]=1,
+				["weight"]=100
+			},
 			{
 				["type"]=1,
 				["id"]=23001,
@@ -67,12 +79,6 @@ local item = {
 				["id"]=33001,
 				["num"]=1,
 				["weight"]=100
-			},
-			{
-				["type"]=1,
-				["id"]=43001,
-				["num"]=1,
-				["weight"]=100
 			}
 		}
 	},
@@ -83,19 +89,19 @@ local item = {
 		["hero_drop"]={
 			{
 				["type"]=1,
-				["id"]=23001,
+				["id"]=24001,
 				["num"]=1,
 				["weight"]=100
 			},
 			{
 				["type"]=1,
-				["id"]=33001,
+				["id"]=24001,
 				["num"]=1,
 				["weight"]=100
 			},
 			{
 				["type"]=1,
-				["id"]=43001,
+				["id"]=44001,
 				["num"]=1,
 				["weight"]=100
 			}
@@ -152,6 +158,24 @@ local item = {
 		["qlt"]=2,
 		["icon"]="12001"
 	},
+	[13001]={
+		["type"]=5,
+		["parameter"]=13001,
+		["qlt"]=3,
+		["icon"]="13001"
+	},
+	[13002]={
+		["type"]=5,
+		["parameter"]=13002,
+		["qlt"]=3,
+		["icon"]="13002"
+	},
+	[24001]={
+		["type"]=5,
+		["parameter"]=24001,
+		["qlt"]=4,
+		["icon"]="24001"
+	},
 	[22001]={
 		["type"]=5,
 		["parameter"]=22001,
@@ -164,6 +188,12 @@ local item = {
 		["qlt"]=3,
 		["icon"]="23001"
 	},
+	[24001]={
+		["type"]=5,
+		["parameter"]=24001,
+		["qlt"]=4,
+		["icon"]="24001"
+	},
 	[32001]={
 		["type"]=5,
 		["parameter"]=32001,
@@ -182,11 +212,11 @@ local item = {
 		["qlt"]=2,
 		["icon"]="42001"
 	},
-	[43001]={
+	[44001]={
 		["type"]=5,
-		["parameter"]=43001,
+		["parameter"]=44001,
-		["qlt"]=3,
+		["qlt"]=4,
-		["icon"]="43001"
+		["icon"]="44001"
 	},
 	[52001]={
 		["type"]=5,
@@ -196,6 +226,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

lua/app/config/monster_base.lua

@@ -1,156 +1,230 @@
 local monster_base = {
 	[10001]={
-		["hurt_num"]=3,
 		["model_id"]="m10001",
 		["body"]=3
 	},
 	[10002]={
-		["hurt_num"]=3,
 		["model_id"]="m10002",
 		["body"]=3
 	},
 	[10003]={
-		["hurt_num"]=3,
 		["model_id"]="m10003",
 		["body"]=3
 	},
 	[10004]={
-		["hurt_num"]=3,
 		["model_id"]="m10004",
 		["body"]=3
 	},
 	[10005]={
-		["hurt_num"]=3,
 		["model_id"]="m10005",
 		["body"]=3
 	},
 	[10006]={
-		["hurt_num"]=3,
 		["model_id"]="m10006",
 		["body"]=3
 	},
 	[10007]={
-		["hurt_num"]=3,
 		["model_id"]="m10007",
 		["body"]=3
 	},
 	[10008]={
-		["hurt_num"]=3,
 		["model_id"]="m10008",
 		["body"]=3
 	},
 	[10009]={
-		["hurt_num"]=3,
 		["model_id"]="m10009",
 		["body"]=3
 	},
 	[10010]={
-		["hurt_num"]=3,
 		["model_id"]="m10010",
 		["body"]=2
 	},
 	[10011]={
-		["hurt_num"]=3,
 		["model_id"]="m10011",
 		["body"]=2
 	},
 	[10012]={
-		["hurt_num"]=3,
 		["model_id"]="m10012",
 		["body"]=2
 	},
 	[10013]={
-		["hurt_num"]=3,
 		["model_id"]="m10013",
 		["body"]=2
 	},
 	[10014]={
-		["hurt_num"]=3,
 		["model_id"]="m10014",
 		["body"]=2
 	},
 	[10015]={
-		["hurt_num"]=3,
 		["model_id"]="m10015",
 		["body"]=2
 	},
 	[10016]={
-		["hurt_num"]=3,
 		["model_id"]="m10016",
 		["body"]=2
 	},
 	[10017]={
-		["hurt_num"]=3,
 		["model_id"]="m10017",
 		["body"]=2
 	},
 	[10018]={
-		["hurt_num"]=3,
 		["model_id"]="m10018",
 		["body"]=2
 	},
+	[10019]={
+		["model_id"]="m10019",
+		["body"]=2
+	},
+	[10028]={
+		["model_id"]="m10028",
+		["body"]=2
+	},
+	[10029]={
+		["model_id"]="m10029",
+		["body"]=2
+	},
+	[10030]={
+		["model_id"]="m10030",
+		["body"]=2
+	},
+	[10031]={
+		["model_id"]="m10031",
+		["body"]=2
+	},
+	[10032]={
+		["model_id"]="m10032",
+		["body"]=2
+	},
+	[10033]={
+		["model_id"]="m10033",
+		["body"]=2
+	},
+	[10039]={
+		["model_id"]="m10039",
+		["body"]=2
+	},
 	[20001]={
-		["hurt_num"]=1,
 		["model_id"]="m20001",
 		["body"]=1
 	},
 	[20002]={
-		["hurt_num"]=1,
 		["model_id"]="m20002",
 		["body"]=1
 	},
 	[20003]={
-		["hurt_num"]=3,
 		["model_id"]="m20003",
 		["body"]=1
 	},
 	[20004]={
-		["hurt_num"]=3,
 		["model_id"]="m20004",
 		["body"]=1
 	},
 	[20005]={
-		["hurt_num"]=3,
 		["model_id"]="m20005",
 		["body"]=1
 	},
 	[20006]={
-		["hurt_num"]=3,
 		["model_id"]="m20006",
 		["body"]=1
 	},
 	[20007]={
-		["hurt_num"]=3,
 		["model_id"]="m20007",
 		["body"]=1
 	},
 	[20008]={
-		["hurt_num"]=3,
 		["model_id"]="m20008",
 		["body"]=1
 	},
 	[20009]={
-		["hurt_num"]=3,
 		["model_id"]="m20009",
 		["body"]=1
 	},
 	[20010]={
-		["hurt_num"]=3,
 		["model_id"]="m20010",
 		["body"]=1
 	},
 	[20011]={
-		["hurt_num"]=3,
 		["model_id"]="m20011",
 		["body"]=1
 	},
 	[20012]={
-		["hurt_num"]=3,
 		["model_id"]="m20012",
 		["body"]=1
+	},
+	[20013]={
+		["model_id"]="m20013",
+		["body"]=1
+	},
+	[20014]={
+		["model_id"]="m20014",
+		["body"]=1
+	},
+	[20015]={
+		["model_id"]="m20015",
+		["body"]=1
+	},
+	[20016]={
+		["model_id"]="m20016",
+		["body"]=1
+	},
+	[20017]={
+		["model_id"]="m20017",
+		["body"]=1
+	},
+	[20018]={
+		["model_id"]="m20018",
+		["body"]=1
+	},
+	[30001]={
+		["model_id"]="p0001",
+		["body"]=1
+	},
+	[30002]={
+		["model_id"]="p0002",
+		["body"]=1
+	},
+	[30003]={
+		["model_id"]="p0003",
+		["body"]=1
+	},
+	[30004]={
+		["model_id"]="p0004",
+		["body"]=1
+	},
+	[30005]={
+		["model_id"]="p0005",
+		["body"]=1
+	},
+	[30006]={
+		["model_id"]="p0006",
+		["body"]=1
+	},
+	[30007]={
+		["model_id"]="p0007",
+		["body"]=1
+	},
+	[30008]={
+		["model_id"]="p0008",
+		["body"]=1
+	},
+	[30009]={
+		["model_id"]="p0009",
+		["body"]=1
+	},
+	[30010]={
+		["model_id"]="p0010",
+		["body"]=1
+	},
+	[30011]={
+		["model_id"]="p0011",
+		["body"]=1
+	},
+	[30014]={
+		["model_id"]="p0014",
+		["body"]=1
 	}
 }
 local config = {
-data=monster_base,count=30
+data=monster_base,count=56
 }
 return config

lua/app/config/skill_rogue.lua

@@ -653,61 +653,67 @@ local skill_rogue = {
 		},
 		["icon"]="29"
 	},
-	[200100]={
+	[1200101]={
 		["limit_times"]=1,
 		["weight"]=30000,
 		["qlt"]=4,
 		["type"]=6,
-		["skill_position"]=3,
+		["skill_position"]=1,
-		["icon"]="55"
+		["icon"]="59"
 	},
-	[200101]={
+	[1200102]={
 		["limit_times"]=1,
 		["weight"]=2000,
 		["qlt"]=3,
-		["type"]=12,
+		["type"]=2,
-		["skill_position"]=3,
+		["skill_position"]=1,
-		["effect"]={
+		["boardrange"]={
 			{
-				["type"]="add_skill",
+				["type"]=1,
-				["num"]=10,
+				["range"]=1
-				["ratio"]=10000,
+			},
-				["round"]=1
+			{
+				["type"]=2,
+				["range"]=1
 			}
 		},
-		["obj"]=5,
+		["icon"]="43"
-		["icon"]="63"
 	},
-	[200102]={
+	[1200103]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
-		["type"]=7,
+		["type"]=3,
-		["parameter"]={
+		["skill_position"]=1,
-			1,
-			30000
-		},
-		["skill_position"]=3,
-		["icon"]="64"
-	},
-	[200103]={
-		["limit_times"]=1,
-		["weight"]=1000,
-		["qlt"]=4,
-		["type"]=12,
-		["skill_position"]=3,
 		["effect"]={
 			{
-				["type"]="add_skill",
+				["type"]="atkp",
-				["num"]=9,
+				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=1
 			}
 		},
-		["obj"]=5,
+		["obj"]=1,
-		["icon"]="33"
+		["icon"]="44"
 	},
-	[200200]={
+	[1200104]={
+		["limit_times"]=1,
+		["weight"]=1000,
+		["qlt"]=4,
+		["type"]=13,
+		["skill_position"]=1,
+		["effect"]={
+			{
+				["type"]="block",
+				["num"]=200,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["icon"]="45"
+	},
+	[2200101]={
 		["limit_times"]=1,
 		["weight"]=30000,
 		["qlt"]=4,
@@ -715,7 +721,7 @@ local skill_rogue = {
 		["skill_position"]=2,
 		["icon"]="56"
 	},
-	[200201]={
+	[2200102]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
@@ -727,18 +733,33 @@ local skill_rogue = {
 		["skill_position"]=2,
 		["icon"]="65"
 	},
-	[200202]={
+	[2200103]={
 		["limit_times"]=1,
 		["weight"]=2000,
 		["qlt"]=3,
-		["type"]=1,
+		["type"]=2,
-		["parameter"]={
+		["skill_position"]=1,
-			2200121
+		["boardrange"]={
+			{
+				["type"]=1,
+				["range"]=1
+			},
+			{
+				["type"]=2,
+				["range"]=1
+			},
+			{
+				["type"]=3,
+				["range"]=1
+			},
+			{
+				["type"]=4,
+				["range"]=1
+			}
 		},
-		["skill_position"]=2,
 		["icon"]="34"
 	},
-	[200203]={
+	[2200104]={
 		["limit_times"]=1,
 		["weight"]=1000,
 		["qlt"]=4,
@@ -761,217 +782,7 @@ local skill_rogue = {
 		["obj"]=4,
 		["icon"]="36"
 	},
-	[200300]={
+	[2400101]={
-		["limit_times"]=1,
-		["weight"]=30000,
-		["qlt"]=4,
-		["type"]=6,
-		["skill_position"]=4,
-		["icon"]="57"
-	},
-	[200301]={
-		["limit_times"]=1,
-		["weight"]=1000,
-		["qlt"]=3,
-		["type"]=2,
-		["skill_position"]=4,
-		["boardrange"]={
-			{
-				["type"]=0,
-				["range"]=2
-			}
-		},
-		["icon"]="39"
-	},
-	[200302]={
-		["limit_times"]=1,
-		["weight"]=3000,
-		["qlt"]=3,
-		["type"]=3,
-		["skill_position"]=4,
-		["effect"]={
-			{
-				["type"]="atkp",
-				["num"]=1000,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=1,
-		["icon"]="38"
-	},
-	[200303]={
-		["limit_times"]=1,
-		["weight"]=1000,
-		["qlt"]=4,
-		["type"]=2,
-		["skill_position"]=4,
-		["boardrange"]={
-			{
-				["type"]=0,
-				["range"]=2
-			}
-		},
-		["icon"]="39"
-	},
-	[200400]={
-		["limit_times"]=1,
-		["weight"]=30000,
-		["qlt"]=4,
-		["type"]=6,
-		["skill_position"]=5,
-		["icon"]="58"
-	},
-	[200401]={
-		["limit_times"]=1,
-		["weight"]=3000,
-		["qlt"]=3,
-		["type"]=7,
-		["parameter"]={
-			1,
-			600
-		},
-		["skill_position"]=5,
-		["icon"]="41"
-	},
-	[200402]={
-		["limit_times"]=1,
-		["weight"]=2000,
-		["qlt"]=3,
-		["type"]=8,
-		["parameter"]={
-			1,
-			1
-		},
-		["skill_position"]=5,
-		["icon"]="42"
-	},
-	[200403]={
-		["limit_times"]=1,
-		["weight"]=1000,
-		["qlt"]=4,
-		["type"]=1,
-		["parameter"]={
-			5200121
-		},
-		["skill_position"]=5,
-		["icon"]="66"
-	},
-	[200500]={
-		["limit_times"]=1,
-		["weight"]=30000,
-		["qlt"]=4,
-		["type"]=6,
-		["skill_position"]=1,
-		["icon"]="59"
-	},
-	[200501]={
-		["limit_times"]=1,
-		["weight"]=2000,
-		["qlt"]=3,
-		["type"]=2,
-		["skill_position"]=1,
-		["boardrange"]={
-			{
-				["type"]=1,
-				["range"]=1
-			},
-			{
-				["type"]=2,
-				["range"]=1
-			}
-		},
-		["icon"]="43"
-	},
-	[200502]={
-		["limit_times"]=1,
-		["weight"]=3000,
-		["qlt"]=3,
-		["type"]=3,
-		["skill_position"]=1,
-		["effect"]={
-			{
-				["type"]="atkp",
-				["num"]=1000,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=1,
-		["icon"]="44"
-	},
-	[200503]={
-		["limit_times"]=1,
-		["weight"]=1000,
-		["qlt"]=4,
-		["type"]=13,
-		["skill_position"]=1,
-		["effect"]={
-			{
-				["type"]="block",
-				["num"]=200,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=1,
-		["icon"]="45"
-	},
-	[200600]={
-		["limit_times"]=1,
-		["weight"]=30000,
-		["qlt"]=4,
-		["type"]=6,
-		["skill_position"]=3,
-		["icon"]="60"
-	},
-	[200601]={
-		["limit_times"]=1,
-		["weight"]=2000,
-		["qlt"]=3,
-		["type"]=7,
-		["parameter"]={
-			1,
-			500
-		},
-		["skill_position"]=3,
-		["icon"]="67"
-	},
-	[200602]={
-		["limit_times"]=1,
-		["weight"]=3000,
-		["qlt"]=3,
-		["type"]=3,
-		["skill_position"]=3,
-		["effect"]={
-			{
-				["type"]="atkp",
-				["num"]=1500,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=1,
-		["icon"]="47"
-	},
-	[200603]={
-		["limit_times"]=1,
-		["weight"]=1000,
-		["qlt"]=4,
-		["type"]=12,
-		["skill_position"]=3,
-		["effect"]={
-			{
-				["type"]="add_skill",
-				["num"]=14,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=1,
-		["icon"]="48"
-	},
-	[200700]={
 		["limit_times"]=1,
 		["weight"]=30000,
 		["qlt"]=4,
@@ -979,7 +790,7 @@ local skill_rogue = {
 		["skill_position"]=2,
 		["icon"]="61"
 	},
-	[200701]={
+	[2400102]={
 		["limit_times"]=1,
 		["weight"]=2000,
 		["qlt"]=3,
@@ -1005,7 +816,7 @@ local skill_rogue = {
 		},
 		["icon"]="49"
 	},
-	[200702]={
+	[2400103]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
@@ -1022,7 +833,7 @@ local skill_rogue = {
 		["obj"]=1,
 		["icon"]="50"
 	},
-	[200703]={
+	[2400104]={
 		["limit_times"]=1,
 		["weight"]=1000,
 		["qlt"]=4,
@@ -1048,7 +859,168 @@ local skill_rogue = {
 		},
 		["icon"]="51"
 	},
-	[200800]={
+	[3200101]={
+		["limit_times"]=1,
+		["weight"]=30000,
+		["qlt"]=4,
+		["type"]=6,
+		["skill_position"]=3,
+		["icon"]="55"
+	},
+	[3200102]={
+		["limit_times"]=1,
+		["weight"]=2000,
+		["qlt"]=3,
+		["type"]=12,
+		["skill_position"]=3,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=10,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=5,
+		["icon"]="63"
+	},
+	[3200103]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=7,
+		["parameter"]={
+			1,
+			30000
+		},
+		["skill_position"]=3,
+		["icon"]="64"
+	},
+	[3200104]={
+		["limit_times"]=1,
+		["weight"]=1000,
+		["qlt"]=4,
+		["type"]=12,
+		["skill_position"]=3,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=9,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=5,
+		["icon"]="33"
+	},
+	[3300101]={
+		["limit_times"]=1,
+		["weight"]=30000,
+		["qlt"]=4,
+		["type"]=6,
+		["skill_position"]=3,
+		["icon"]="60"
+	},
+	[3300102]={
+		["limit_times"]=1,
+		["weight"]=2000,
+		["qlt"]=3,
+		["type"]=7,
+		["parameter"]={
+			1,
+			500
+		},
+		["skill_position"]=3,
+		["icon"]="67"
+	},
+	[3300103]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=3,
+		["skill_position"]=3,
+		["effect"]={
+			{
+				["type"]="atkp",
+				["num"]=1500,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["icon"]="47"
+	},
+	[3300104]={
+		["limit_times"]=1,
+		["weight"]=1000,
+		["qlt"]=4,
+		["type"]=12,
+		["skill_position"]=3,
+		["effect"]={
+			{
+				["type"]="add_skill",
+				["num"]=14,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["icon"]="48"
+	},
+	[4200101]={
+		["limit_times"]=1,
+		["weight"]=30000,
+		["qlt"]=4,
+		["type"]=6,
+		["skill_position"]=4,
+		["icon"]="57"
+	},
+	[4200102]={
+		["limit_times"]=1,
+		["weight"]=1000,
+		["qlt"]=3,
+		["type"]=2,
+		["skill_position"]=4,
+		["boardrange"]={
+			{
+				["type"]=0,
+				["range"]=2
+			}
+		},
+		["icon"]="39"
+	},
+	[4200103]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=3,
+		["skill_position"]=4,
+		["effect"]={
+			{
+				["type"]="atkp",
+				["num"]=1000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["icon"]="38"
+	},
+	[4200104]={
+		["limit_times"]=1,
+		["weight"]=1000,
+		["qlt"]=4,
+		["type"]=2,
+		["skill_position"]=4,
+		["boardrange"]={
+			{
+				["type"]=0,
+				["range"]=2
+			}
+		},
+		["icon"]="39"
+	},
+	[4400101]={
 		["limit_times"]=1,
 		["weight"]=30000,
 		["qlt"]=4,
@@ -1056,18 +1028,33 @@ local skill_rogue = {
 		["skill_position"]=4,
 		["icon"]="62"
 	},
-	[200801]={
+	[4400102]={
 		["limit_times"]=1,
 		["weight"]=2000,
 		["qlt"]=3,
-		["type"]=1,
+		["type"]=2,
-		["parameter"]={
+		["skill_position"]=1,
-			4300121
+		["boardrange"]={
+			{
+				["type"]=1,
+				["range"]=1
+			},
+			{
+				["type"]=2,
+				["range"]=1
+			},
+			{
+				["type"]=3,
+				["range"]=1
+			},
+			{
+				["type"]=4,
+				["range"]=1
+			}
 		},
-		["skill_position"]=4,
 		["icon"]="52"
 	},
-	[200802]={
+	[4400103]={
 		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=3,
@@ -1079,7 +1066,7 @@ local skill_rogue = {
 		["skill_position"]=4,
 		["icon"]="53"
 	},
-	[200803]={
+	[4400104]={
 		["limit_times"]=1,
 		["weight"]=1000,
 		["qlt"]=4,
@@ -1090,6 +1077,49 @@ local skill_rogue = {
 		},
 		["skill_position"]=4,
 		["icon"]="54"
+	},
+	[5200101]={
+		["limit_times"]=1,
+		["weight"]=30000,
+		["qlt"]=4,
+		["type"]=6,
+		["skill_position"]=5,
+		["icon"]="58"
+	},
+	[5200102]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=3,
+		["type"]=7,
+		["parameter"]={
+			1,
+			600
+		},
+		["skill_position"]=5,
+		["icon"]="41"
+	},
+	[5200103]={
+		["limit_times"]=1,
+		["weight"]=2000,
+		["qlt"]=3,
+		["type"]=8,
+		["parameter"]={
+			1,
+			1
+		},
+		["skill_position"]=5,
+		["icon"]="42"
+	},
+	[5200104]={
+		["limit_times"]=1,
+		["weight"]=1000,
+		["qlt"]=4,
+		["type"]=1,
+		["parameter"]={
+			5200121
+		},
+		["skill_position"]=5,
+		["icon"]="66"
 	}
 }
 local config = {

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

@@ -1,30 +1,42 @@
 local hero = {
 	[12001]={
-		["name"]="洛克西"
+		["name"]="舞娘"
+	},
+	[13001]={
+		["name"]="独臂哥"
+	},
+	[13002]={
+		["name"]="火旺"
+	},
+	[24001]={
+		["name"]="铁锤赵"
 	},
 	[22001]={
-		["name"]="卡拉"
+		["name"]="黑刀妹"
 	},
 	[23001]={
-		["name"]="巨剑罗伯特"
+		["name"]="野蛮人"
+	},
+	[24001]={
+		["name"]="魔童剑士"
 	},
 	[32001]={
-		["name"]="阿斯克"
+		["name"]="洋葱骑士"
 	},
 	[33001]={
-		["name"]="艾芙琳"
+		["name"]="小鹿"
 	},
 	[42001]={
-		["name"]="莉莉丝"
+		["name"]="法师"
 	},
-	[43001]={
+	[44001]={
-		["name"]="白发凯瑟琳"
+		["name"]="蓝SSR冰刃"
 	},
 	[52001]={
-		["name"]="艾伦"
+		["name"]="忍者"
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -56,39 +56,55 @@ local item = {
 		["desc"]="用于商城开启珍贵宝箱。"
 	},
 	[12001]={
-		["name"]="洛克西英雄碎片",
+		["name"]="红R舞女碎片",
-		["desc"]="洛克西英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
+	},
+	[13001]={
+		["name"]="红SR-克劳德碎片",
+		["desc"]="凑齐可解锁或升级。"
+	},
+	[13002]={
+		["name"]="红SR-武僧碎片",
+		["desc"]="凑齐可解锁或升级。"
+	},
+	[24001]={
+		["name"]="红SSR-铁锤小孩碎片",
+		["desc"]="凑齐可解锁或升级。"
 	},
 	[22001]={
-		["name"]="卡拉英雄碎片",
+		["name"]="黄R黑妹碎片",
-		["desc"]="卡拉英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
 	},
 	[23001]={
-		["name"]="巨剑罗伯特英雄碎片",
+		["name"]="黄SR野蛮人碎片",
-		["desc"]="巨剑罗伯特英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
+	},
+	[24001]={
+		["name"]="黄ssr巨剑碎片",
+		["desc"]="凑齐可解锁或升级。"
 	},
 	[32001]={
-		["name"]="阿斯克英雄碎片",
+		["name"]="绿R洋葱碎片",
-		["desc"]="阿斯克英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
 	},
 	[33001]={
-		["name"]="艾芙琳英雄碎片",
+		["name"]="绿SR小鹿碎片",
-		["desc"]="艾芙琳英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
 	},
 	[42001]={
-		["name"]="莉莉丝英雄碎片",
+		["name"]="蓝R莉莉丝碎片",
-		["desc"]="莉莉丝英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
 	},
-	[43001]={
+	[44001]={
-		["name"]="白发凯瑟琳英雄碎片",
+		["name"]="蓝SSR冰刃碎片",
-		["desc"]="白发凯瑟琳英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
 	},
 	[52001]={
-		["name"]="艾伦英雄碎片",
+		["name"]="紫R忍者碎片",
-		["desc"]="艾伦英雄碎片,凑齐可解锁或升级。"
+		["desc"]="凑齐可解锁或升级。"
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 		["desc"]="快速治愈：立即恢复艾芙琳150%攻击力的生命值"
 	},
-	[2300120]={
+	[2400120]={
 		["desc"]="巨剑连斩：攻击伤害增加50%，结束时使用巨剑造成大量伤害。"
 	},
-	[4300120]={
+	[4400120]={
 		["desc"]="霜冻剑舞：造成1次大量伤害并给敌人1回合冰霜效果（普攻次数-2）"
 	}
 }

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

@@ -131,101 +131,101 @@ local skill_rogue = {
 	[44]={
 		["desc"]="将场上随机<color=#3cff28>5</color>个非紫色元素变为紫色"
 	},
-	[200100]={
+	[1200101]={
-		["desc"]="长枪突刺：阿斯克可造成<color=#3cff28>1</color>次大量伤害"
-	},
-	[200101]={
-		["desc"]="长枪突刺可<color=#3cff28>恢复生命</color>"
-	},
-	[200102]={
-		["desc"]="长枪突刺<color=#3cff28>伤害提升</color>"
-	},
-	[200103]={
-		["desc"]="长枪突刺有<color=#3cff28>30%</color>概率眩晕对手<color=#3cff28>1</color>回合"
-	},
-	[200200]={
-		["desc"]="拔刀斩：卡拉可造成<color=#3cff28>1</color>次大量伤害"
-	},
-	[200201]={
-		["desc"]="拔刀斩<color=#3cff28>伤害提升</color>"
-	},
-	[200202]={
-		["desc"]="拔刀斩释放时上下左右各消除<color=#3cff28>1</color>格"
-	},
-	[200203]={
-		["desc"]="拔刀斩终结技可放<color=#3cff28>2</color>次"
-	},
-	[200300]={
-		["desc"]="元素链接：随机额外消除<color=#3cff28>3</color>个元素"
-	},
-	[200301]={
-		["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个"
-	},
-	[200302]={
-		["desc"]="元素链接使用时本次普攻伤害提升<color=#3cff28>10%</color>"
-	},
-	[200303]={
-		["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个"
-	},
-	[200400]={
-		["desc"]="魔法罩：艾伦可生成一个魔法罩持续<color=#3cff28>1</color>回合"
-	},
-	[200401]={
-		["desc"]="增加魔法罩承受<color=#3cff28>伤害增加</color>。"
-	},
-	[200402]={
-		["desc"]="生成的魔法罩如果没有破可以额外持续<color=#3cff28>1</color>回合"
-	},
-	[200403]={
-		["desc"]="魔法罩存在时可反伤对方造成<color=#3cff28>200%伤害</color>"
-	},
-	[200500]={
 		["desc"]="舞步消散：将左右<color=#3cff28>2</color>格元素进行消除"
 	},
-	[200501]={
+	[1200102]={
 		["desc"]="舞步消散上下可多消<color=#3cff28>1</color>格"
 	},
-	[200502]={
+	[1200103]={
 		["desc"]="舞步消散使用时本次普攻伤害提升<color=#3cff28>10%</color>"
 	},
-	[200503]={
+	[1200104]={
 		["desc"]="每有1个元素连接舞步消散则本回合格挡增加<color=#3cff28>2%</color>"
 	},
-	[200600]={
+	[2200101]={
-		["desc"]="快速治愈：艾芙琳可恢复<color=#3cff28>150%</color>攻击力的生命值"
+		["desc"]="拔刀斩：卡拉可造成<color=#3cff28>1</color>次大量伤害"
 	},
-	[200601]={
+	[2200102]={
-		["desc"]="快速治愈的<color=#3cff28>恢复量提升</color>"
+		["desc"]="拔刀斩<color=#3cff28>伤害提升</color>"
 	},
-	[200602]={
+	[2200103]={
-		["desc"]="快速治愈使用时本次普攻伤害提升<color=#3cff28>15%</color>"
+		["desc"]="拔刀斩释放时上下左右各消除<color=#3cff28>1</color>格"
 	},
-	[200603]={
+	[2200104]={
-		["desc"]="连接快速治愈的每一击都将<color=#3cff28>恢复</color>生命值"
+		["desc"]="拔刀斩终结技可放<color=#3cff28>2</color>次"
 	},
-	[200700]={
+	[2400101]={
 		["desc"]="巨剑连斩：每一次攻击的伤害将增加<color=#3cff28>50%</color>"
 	},
-	[200701]={
+	[2400102]={
 		["desc"]="巨剑连斩被连接消除其上下左右<color=#3cff28>4</color>个元素"
 	},
-	[200702]={
+	[2400103]={
 		["desc"]="巨剑连斩使用时本次普攻伤害提升<color=#3cff28>20%</color>"
 	},
-	[200703]={
+	[2400104]={
 		["desc"]="巨剑连斩被连接消除其斜方向的<color=#3cff28>4</color>个元素"
 	},
-	[200800]={
+	[3200101]={
+		["desc"]="长枪突刺：阿斯克可造成<color=#3cff28>1</color>次大量伤害"
+	},
+	[3200102]={
+		["desc"]="长枪突刺可<color=#3cff28>恢复生命</color>"
+	},
+	[3200103]={
+		["desc"]="长枪突刺<color=#3cff28>伤害提升</color>"
+	},
+	[3200104]={
+		["desc"]="长枪突刺有<color=#3cff28>30%</color>概率眩晕对手<color=#3cff28>1</color>回合"
+	},
+	[3300101]={
+		["desc"]="快速治愈：艾芙琳可恢复<color=#3cff28>150%</color>攻击力的生命值"
+	},
+	[3300102]={
+		["desc"]="快速治愈的<color=#3cff28>恢复量提升</color>"
+	},
+	[3300103]={
+		["desc"]="快速治愈使用时本次普攻伤害提升<color=#3cff28>15%</color>"
+	},
+	[3300104]={
+		["desc"]="连接快速治愈的每一击都将<color=#3cff28>恢复</color>生命值"
+	},
+	[4200101]={
+		["desc"]="元素链接：随机额外消除<color=#3cff28>3</color>个元素"
+	},
+	[4200102]={
+		["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个"
+	},
+	[4200103]={
+		["desc"]="元素链接使用时本次普攻伤害提升<color=#3cff28>10%</color>"
+	},
+	[4200104]={
+		["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个"
+	},
+	[4400101]={
 		["desc"]="霜冻剑舞：造成<color=#3cff28>1</color>次伤害并施加<color=#3cff28>1</color>回合冰霜效果"
 	},
-	[200801]={
+	[4400102]={
 		["desc"]="霜冻剑舞被使用时可消除掉其上下左右<color=#3cff28>4</color>个元素"
 	},
-	[200802]={
+	[4400103]={
 		["desc"]="霜冻剑舞<color=#3cff28>伤害提升</color>"
 	},
-	[200803]={
+	[4400104]={
 		["desc"]="霜冻剑舞造成的冰霜效果将持续<color=#3cff28>2</color>回合"
+	},
+	[5200101]={
+		["desc"]="魔法罩：艾伦可生成一个魔法罩持续<color=#3cff28>1</color>回合"
+	},
+	[5200102]={
+		["desc"]="增加魔法罩承受<color=#3cff28>伤害增加</color>。"
+	},
+	[5200103]={
+		["desc"]="生成的魔法罩如果没有破可以额外持续<color=#3cff28>1</color>回合"
+	},
+	[5200104]={
+		["desc"]="魔法罩存在时可反伤对方造成<color=#3cff28>200%伤害</color>"
 	}
 }
 local config = {

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -49,12 +49,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -65,7 +77,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -73,6 +85,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,30 +1,42 @@
 local hero = {
 	[12001]={
-		["name"]="Roxy"
+
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
-		["name"]="Carla"
+
 	},
 	[23001]={
-		["name"]="Great Sword Robert"
+
+	},
+	[24001]={
+
 	},
 	[32001]={
-		["name"]="Aske"
+
 	},
 	[33001]={
-		["name"]="Evelyn"
+
 	},
 	[42001]={
-		["name"]="Lilith"
+
 	},
-	[43001]={
+	[44001]={
-		["name"]="White-Hair Catherine"
+
 	},
 	[52001]={
-		["name"]="Allen"
+
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -54,36 +54,48 @@ local item = {
 		["name"]="Roxy Shard",
 		["desc"]="Roxy Shard, collect it to unlock or upgrade Roxy"
 	},
-	[22001]={
+	[13001]={
 		["name"]="Carla Shard",
 		["desc"]="Carla Shard, collect it to unlock or upgrade Carla"
 	},
-	[23001]={
+	[13002]={
 		["name"]="Great Sword Robert Shard",
 		["desc"]="Great Sword Robert Shard, collect it to unlock or upgrade Great Sword Robert"
 	},
-	[32001]={
+	[24001]={
 		["name"]="Aske Shard",
 		["desc"]="Aske Shard, collect it to unlock or upgrade Aske"
 	},
-	[33001]={
+	[22001]={
 		["name"]="Evelyn Shard",
 		["desc"]="Evelyn Shard, collect it to unlock or upgrade Evelyn"
 	},
-	[42001]={
+	[23001]={
 		["name"]="Lilith Shard",
 		["desc"]="Lilith Shard, collect it to unlock or upgrade Lilith"
 	},
-	[43001]={
+	[24001]={
 		["name"]="White-Hair Catherine Shard",
 		["desc"]="White-Hair Catherine Shard, collect it to unlock or upgrade White-Hair Catherine"
 	},
-	[52001]={
+	[32001]={
 		["name"]="Allen Shard",
 		["desc"]="Allen Shard, collect it to unlock or upgrade Allen"
+	},
+	[33001]={
+
+	},
+	[42001]={
+
+	},
+	[44001]={
+
+	},
+	[52001]={
+
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 		["desc"]="Quick Regen: Immediately restores HP by an amount equal to 150% of Evelyn's Attack"
 	},
-	[2300120]={
+	[2400120]={
 		["desc"]="Great Sword Combos: Increases the damage of each attack by 50%, ends with a huge sword that deals tons of damage"
 	},
-	[4300120]={
+	[4400120]={
 		["desc"]="Frosty Blade Dance: Deals massive damage for one time and the applies Frost status on the enemy for 1 round (normal attack hits -2)"
 	}
 }

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

@@ -131,101 +131,101 @@ local skill_rogue = {
 	[44]={
 		["desc"]="Turns <color=#3cff28>5</color> random Non-Purple elements into Purple"
 	},
-	[200100]={
+	[1200101]={
-		["desc"]="Lance Thrust: Aske deals massive damage for <color=#3cff28>1</color> time"
-	},
-	[200101]={
-		["desc"]="Lance Thrust <color=#3cff28>restores HP</color>"
-	},
-	[200102]={
-		["desc"]="<color=#3cff28>Increases the damage</color> of Lance Thrust"
-	},
-	[200103]={
-		["desc"]="Lance Thrust has a <color=#3cff28>30%</color> chance to stun the enemy for <color=#3cff28>1</color> round"
-	},
-	[200200]={
-		["desc"]="Unsheathe: Carla deals massive damage for <color=#3cff28>1</color> time"
-	},
-	[200201]={
-		["desc"]="<color=#3cff28>Increases the damage</color> of Unsheathe"
-	},
-	[200202]={
-		["desc"]="When performing Unsheathe, clears <color=#3cff28>1</color> tile on the top, bottom, left and right side respectively."
-	},
-	[200203]={
-		["desc"]="Unsheathe Ultimate Skill can be unleashed for <color=#3cff28>twice</color>"
-	},
-	[200300]={
-		["desc"]="Elemental Link: Clears random <color=#3cff28>3</color> extra elements"
-	},
-	[200301]={
-		["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
-	},
-	[200302]={
-		["desc"]="Increases the damage of normal attacks by <color=#3cff28>10%</color> by using Elemental Link "
-	},
-	[200303]={
-		["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
-	},
-	[200400]={
-		["desc"]="Magic Shield: Allen generates a Magic Shield that lasts for <color=#3cff28>1</color> round"
-	},
-	[200401]={
-		["desc"]="<color=#3cff28>Increases the damage taken</color> by the Magic Shield"
-	},
-	[200402]={
-		["desc"]="Magic Shield lasts for <color=#3cff28>1</color> more round if it isn’t destroyed"
-	},
-	[200403]={
-		["desc"]="Magic Shield reflects and deals <color=#3cff28>200% damage</color> back to the enemy when activated"
-	},
-	[200500]={
 		["desc"]="Disperse in Dance: Clears elements on <color=#3cff28>2</color> tiles on the left and right"
 	},
-	[200501]={
+	[1200102]={
 		["desc"]="Disperse in Dance clears elements on <color=#3cff28>1</color> extra tile on the top and bottom"
 	},
-	[200502]={
+	[1200103]={
 		["desc"]="Increases the damage of normal attacks by <color=#3cff28>10%</color> by using Disperse in Dance"
 	},
-	[200503]={
+	[1200104]={
 		["desc"]="Increases Block Chance by <color=#3cff28>2%</color> in the current round for every 1 element connected to Disperse in Dance"
 	},
-	[200600]={
+	[2200101]={
-		["desc"]="Quick Regen: Evelyn can restore HP equal to <color=#3cff28>150%</color> of her Attack"
+		["desc"]="Unsheathe: Carla deals massive damage for <color=#3cff28>1</color> time"
 	},
-	[200601]={
+	[2200102]={
-		["desc"]="Increases the <color=#3cff28>amount of HP restored</color> by Quick Regen"
+		["desc"]="<color=#3cff28>Increases the damage</color> of Unsheathe"
 	},
-	[200602]={
+	[2200103]={
-		["desc"]="Increases the damage of normal attacks by <color=#3cff28>15%</color> by using Quick Regen"
+		["desc"]="When performing Unsheathe, clears <color=#3cff28>1</color> tile on the top, bottom, left and right side respectively."
 	},
-	[200603]={
+	[2200104]={
-		["desc"]="Each attack of elements connected by the same link of Quick Regen <color=#3cff28>restores HP</color>"
+		["desc"]="Unsheathe Ultimate Skill can be unleashed for <color=#3cff28>twice</color>"
 	},
-	[200700]={
+	[2400101]={
 		["desc"]="Great Sword Combos: Increases the damage of each attack by <color=#3cff28>50%</color>"
 	},
-	[200701]={
+	[2400102]={
 		["desc"]="Great Sword Combos clears <color=#3cff28>4</color> elements on the top, bottom, left and right side when connected"
 	},
-	[200702]={
+	[2400103]={
 		["desc"]="Increases the damage of normal attacks by <color=#3cff28>20%</color> by using Great Sword Combos"
 	},
-	[200703]={
+	[2400104]={
 		["desc"]="Great Sword Combos clears <color=#3cff28>4</color> elements on the diagonal directions when connected"
 	},
-	[200800]={
+	[3200101]={
+		["desc"]="Lance Thrust: Aske deals massive damage for <color=#3cff28>1</color> time"
+	},
+	[3200102]={
+		["desc"]="Lance Thrust <color=#3cff28>restores HP</color>"
+	},
+	[3200103]={
+		["desc"]="<color=#3cff28>Increases the damage</color> of Lance Thrust"
+	},
+	[3200104]={
+		["desc"]="Lance Thrust has a <color=#3cff28>30%</color> chance to stun the enemy for <color=#3cff28>1</color> round"
+	},
+	[3300101]={
+		["desc"]="Quick Regen: Evelyn can restore HP equal to <color=#3cff28>150%</color> of her Attack"
+	},
+	[3300102]={
+		["desc"]="Increases the <color=#3cff28>amount of HP restored</color> by Quick Regen"
+	},
+	[3300103]={
+		["desc"]="Increases the damage of normal attacks by <color=#3cff28>15%</color> by using Quick Regen"
+	},
+	[3300104]={
+		["desc"]="Each attack of elements connected by the same link of Quick Regen <color=#3cff28>restores HP</color>"
+	},
+	[4200101]={
+		["desc"]="Elemental Link: Clears random <color=#3cff28>3</color> extra elements"
+	},
+	[4200102]={
+		["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
+	},
+	[4200103]={
+		["desc"]="Increases the damage of normal attacks by <color=#3cff28>10%</color> by using Elemental Link "
+	},
+	[4200104]={
+		["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
+	},
+	[4400101]={
 		["desc"]="Frosty Blade Dance: Deal the damage for <color=#3cff28>1</color> hit and applies Frost status for <color=#3cff28>1</color> round"
 	},
-	[200801]={
+	[4400102]={
 		["desc"]="When performing Frosty Blade Dance, clears <color=#3cff28>4</color> elements on the top, bottom, left and right side"
 	},
-	[200802]={
+	[4400103]={
 		["desc"]="<color=#3cff28>Increases the damage</color> of Frosty Blade Dance"
 	},
-	[200803]={
+	[4400104]={
 		["desc"]="Frost status caused by Frosty Blade Dance lasts for <color=#3cff28>2</color> rounds"
+	},
+	[5200101]={
+		["desc"]="Magic Shield: Allen generates a Magic Shield that lasts for <color=#3cff28>1</color> round"
+	},
+	[5200102]={
+		["desc"]="<color=#3cff28>Increases the damage taken</color> by the Magic Shield"
+	},
+	[5200103]={
+		["desc"]="Magic Shield lasts for <color=#3cff28>1</color> more round if it isn’t destroyed"
+	},
+	[5200104]={
+		["desc"]="Magic Shield reflects and deals <color=#3cff28>200% damage</color> back to the enemy when activated"
 	}
 }
 local config = {

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -49,12 +49,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -65,7 +77,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -73,6 +85,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -49,12 +49,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -65,7 +77,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -73,6 +85,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -49,12 +49,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -65,7 +77,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -73,6 +85,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -49,12 +49,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -65,7 +77,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -73,6 +85,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -48,12 +48,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -64,7 +76,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -72,6 +84,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -46,12 +46,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -62,7 +74,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -70,6 +82,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -46,12 +46,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -62,7 +74,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -70,6 +82,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,12 +1,24 @@
 local hero = {
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -17,7 +29,7 @@ local hero = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -25,6 +37,6 @@ local hero = {
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -49,12 +49,24 @@ local item = {
 	},
 	[12001]={
 
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
 
 	},
 	[23001]={
 
+	},
+	[24001]={
+
 	},
 	[32001]={
 
@@ -65,7 +77,7 @@ local item = {
 	[42001]={
 
 	},
-	[43001]={
+	[44001]={
 
 	},
 	[52001]={
@@ -73,6 +85,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 
 	},
-	[2300120]={
+	[2400120]={
 
 	},
-	[4300120]={
+	[4400120]={
 
 	}
 }

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

@@ -131,100 +131,100 @@ local skill_rogue = {
 	[44]={
 
 	},
-	[200100]={
+	[1200101]={
 
 	},
-	[200101]={
+	[1200102]={
 
 	},
-	[200102]={
+	[1200103]={
 
 	},
-	[200103]={
+	[1200104]={
 
 	},
-	[200200]={
+	[2200101]={
 
 	},
-	[200201]={
+	[2200102]={
 
 	},
-	[200202]={
+	[2200103]={
 
 	},
-	[200203]={
+	[2200104]={
 
 	},
-	[200300]={
+	[2400101]={
 
 	},
-	[200301]={
+	[2400102]={
 
 	},
-	[200302]={
+	[2400103]={
 
 	},
-	[200303]={
+	[2400104]={
 
 	},
-	[200400]={
+	[3200101]={
 
 	},
-	[200401]={
+	[3200102]={
 
 	},
-	[200402]={
+	[3200103]={
 
 	},
-	[200403]={
+	[3200104]={
 
 	},
-	[200500]={
+	[3300101]={
 
 	},
-	[200501]={
+	[3300102]={
 
 	},
-	[200502]={
+	[3300103]={
 
 	},
-	[200503]={
+	[3300104]={
 
 	},
-	[200600]={
+	[4200101]={
 
 	},
-	[200601]={
+	[4200102]={
 
 	},
-	[200602]={
+	[4200103]={
 
 	},
-	[200603]={
+	[4200104]={
 
 	},
-	[200700]={
+	[4400101]={
 
 	},
-	[200701]={
+	[4400102]={
 
 	},
-	[200702]={
+	[4400103]={
 
 	},
-	[200703]={
+	[4400104]={
 
 	},
-	[200800]={
+	[5200101]={
 
 	},
-	[200801]={
+	[5200102]={
 
 	},
-	[200802]={
+	[5200103]={
 
 	},
-	[200803]={
+	[5200104]={
 
 	}
 }

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

@@ -1,30 +1,42 @@
 local hero = {
 	[12001]={
-		["name"]="洛克西"
+
+	},
+	[13001]={
+
+	},
+	[13002]={
+
+	},
+	[24001]={
+
 	},
 	[22001]={
-		["name"]="卡拉"
+
 	},
 	[23001]={
-		["name"]="巨劍羅伯特"
+
+	},
+	[24001]={
+
 	},
 	[32001]={
-		["name"]="阿斯克"
+
 	},
 	[33001]={
-		["name"]="艾芙琳"
+
 	},
 	[42001]={
-		["name"]="莉莉絲"
+
 	},
-	[43001]={
+	[44001]={
-		["name"]="白髮凱瑟琳"
+
 	},
 	[52001]={
-		["name"]="艾倫"
+
 	}
 }
 local config = {
-data=hero,count=8
+data=hero,count=12
 }
 return config

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

@@ -51,39 +51,51 @@ local item = {
 
 	},
 	[12001]={
-		["name"]="洛克西英雄碎片",
+		["name"]="红R舞女碎片",
 		["desc"]="洛克西英雄碎片,湊齊可解鎖或升級。"
 	},
-	[22001]={
+	[13001]={
-		["name"]="卡拉英雄碎片",
+		["name"]="红SR-克劳德碎片",
 		["desc"]="卡拉英雄碎片,湊齊可解鎖或升級。"
 	},
-	[23001]={
+	[13002]={
-		["name"]="巨劍羅伯特英雄碎片",
+		["name"]="红SR-武僧碎片",
 		["desc"]="巨劍羅伯特英雄碎片,湊齊可解鎖或升級。"
 	},
-	[32001]={
+	[24001]={
-		["name"]="阿斯克英雄碎片",
+		["name"]="红SSR-铁锤小孩碎片",
 		["desc"]="阿斯克英雄碎片,湊齊可解鎖或升級。"
 	},
-	[33001]={
+	[22001]={
-		["name"]="艾芙琳英雄碎片",
+		["name"]="黄R黑妹碎片",
 		["desc"]="艾芙琳英雄碎片,湊齊可解鎖或升級。"
 	},
-	[42001]={
+	[23001]={
-		["name"]="莉莉絲英雄碎片",
+		["name"]="黄SR野蛮人碎片",
 		["desc"]="莉莉絲英雄碎片,湊齊可解鎖或升級。"
 	},
-	[43001]={
+	[24001]={
-		["name"]="白髮凱瑟琳英雄碎片",
+		["name"]="黄ssr巨剑碎片",
 		["desc"]="白髮凱瑟琳英雄碎片,湊齊可解鎖或升級。"
 	},
-	[52001]={
+	[32001]={
-		["name"]="艾倫英雄碎片",
+		["name"]="绿R洋葱碎片",
 		["desc"]="艾倫英雄碎片,湊齊可解鎖或升級。"
+	},
+	[33001]={
+		["name"]="绿SR小鹿碎片"
+	},
+	[42001]={
+		["name"]="蓝R莉莉丝碎片"
+	},
+	[44001]={
+		["name"]="蓝SSR冰刃碎片"
+	},
+	[52001]={
+		["name"]="紫R忍者碎片"
 	}
 }
 local config = {
-data=item,count=23
+data=item,count=27
 }
 return config

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

@@ -17,10 +17,10 @@ local skill = {
 	[3300120]={
 		["desc"]="快速治癒：立即恢復艾芙琳150%攻擊力的生命值"
 	},
-	[2300120]={
+	[2400120]={
 		["desc"]="巨劍連斬：攻擊傷害增加50%，結束時使用巨劍造成大量傷害。"
 	},
-	[4300120]={
+	[4400120]={
 		["desc"]="霜凍劍舞：造成1次大量傷害並給敵人1回合冰霜效果（普攻次數-2）"
 	}
 }

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

@@ -131,101 +131,101 @@ local skill_rogue = {
 	[44]={
 		["desc"]="將場上隨機<color=#3cff28>5</color>個非紫色元素變為紫色"
 	},
-	[200100]={
+	[1200101]={
-		["desc"]="長槍突刺：阿斯克可造成<color=#3cff28>1</color>次大量傷害"
-	},
-	[200101]={
-		["desc"]="長槍突刺可<color=#3cff28>恢復生命</color>"
-	},
-	[200102]={
-		["desc"]="長槍突刺<color=#3cff28>傷害提升</color>"
-	},
-	[200103]={
-		["desc"]="長槍突刺有<color=#3cff28>30%</color>概率眩暈對手<color=#3cff28>1</color>回合"
-	},
-	[200200]={
-		["desc"]="拔刀斬：卡拉可造成<color=#3cff28>1</color>次大量傷害"
-	},
-	[200201]={
-		["desc"]="拔刀斬<color=#3cff28>傷害提升</color>"
-	},
-	[200202]={
-		["desc"]="拔刀斬釋放時上下左右各消除<color=#3cff28>1</color>格"
-	},
-	[200203]={
-		["desc"]="拔刀斬終結技可放<color=#3cff28>2</color>次"
-	},
-	[200300]={
-		["desc"]="元素鏈接：隨機額外消除<color=#3cff28>3</color>個元素"
-	},
-	[200301]={
-		["desc"]="元素鏈接隨機消除元素增加<color=#3cff28>2</color>個"
-	},
-	[200302]={
-		["desc"]="元素鏈接使用時本次普攻傷害提升<color=#3cff28>10%</color>"
-	},
-	[200303]={
-		["desc"]="元素鏈接隨機消除元素增加<color=#3cff28>2</color>個"
-	},
-	[200400]={
-		["desc"]="魔法罩：艾倫可生成一個魔法罩持續<color=#3cff28>1</color>回合"
-	},
-	[200401]={
-		["desc"]="增加魔法罩承受<color=#3cff28>傷害增加</color>。"
-	},
-	[200402]={
-		["desc"]="生成的魔法罩如果沒有破可以額外持續<color=#3cff28>1</color>回合"
-	},
-	[200403]={
-		["desc"]="魔法罩存在時可反傷對方造成<color=#3cff28>200%傷害</color>"
-	},
-	[200500]={
 		["desc"]="舞步消散：將左右<color=#3cff28>2</color>格元素進行消除"
 	},
-	[200501]={
+	[1200102]={
 		["desc"]="舞步消散上下可多消<color=#3cff28>1</color>格"
 	},
-	[200502]={
+	[1200103]={
 		["desc"]="舞步消散使用時本次普攻傷害提升<color=#3cff28>10%</color>"
 	},
-	[200503]={
+	[1200104]={
 		["desc"]="每有1個元素連接舞步消散則本回合格擋增加<color=#3cff28>2%</color>"
 	},
-	[200600]={
+	[2200101]={
-		["desc"]="快速治癒：艾芙琳可恢復<color=#3cff28>150%</color>攻擊力的生命值"
+		["desc"]="拔刀斬：卡拉可造成<color=#3cff28>1</color>次大量傷害"
 	},
-	[200601]={
+	[2200102]={
-		["desc"]="快速治癒的<color=#3cff28>恢復量提升</color>"
+		["desc"]="拔刀斬<color=#3cff28>傷害提升</color>"
 	},
-	[200602]={
+	[2200103]={
-		["desc"]="快速治癒使用時本次普攻傷害提升<color=#3cff28>15%</color>"
+		["desc"]="拔刀斬釋放時上下左右各消除<color=#3cff28>1</color>格"
 	},
-	[200603]={
+	[2200104]={
-		["desc"]="連接快速治癒的每一擊都將<color=#3cff28>恢復</color>生命值"
+		["desc"]="拔刀斬終結技可放<color=#3cff28>2</color>次"
 	},
-	[200700]={
+	[2400101]={
 		["desc"]="巨劍連斬：每一次攻擊的傷害將增加<color=#3cff28>50%</color>"
 	},
-	[200701]={
+	[2400102]={
 		["desc"]="巨劍連斬被連接消除其上下左右<color=#3cff28>4</color>個元素"
 	},
-	[200702]={
+	[2400103]={
 		["desc"]="巨劍連斬使用時本次普攻傷害提升<color=#3cff28>20%</color>"
 	},
-	[200703]={
+	[2400104]={
 		["desc"]="巨劍連斬被連接消除其斜方向的<color=#3cff28>4</color>個元素"
 	},
-	[200800]={
+	[3200101]={
+		["desc"]="長槍突刺：阿斯克可造成<color=#3cff28>1</color>次大量傷害"
+	},
+	[3200102]={
+		["desc"]="長槍突刺可<color=#3cff28>恢復生命</color>"
+	},
+	[3200103]={
+		["desc"]="長槍突刺<color=#3cff28>傷害提升</color>"
+	},
+	[3200104]={
+		["desc"]="長槍突刺有<color=#3cff28>30%</color>概率眩暈對手<color=#3cff28>1</color>回合"
+	},
+	[3300101]={
+		["desc"]="快速治癒：艾芙琳可恢復<color=#3cff28>150%</color>攻擊力的生命值"
+	},
+	[3300102]={
+		["desc"]="快速治癒的<color=#3cff28>恢復量提升</color>"
+	},
+	[3300103]={
+		["desc"]="快速治癒使用時本次普攻傷害提升<color=#3cff28>15%</color>"
+	},
+	[3300104]={
+		["desc"]="連接快速治癒的每一擊都將<color=#3cff28>恢復</color>生命值"
+	},
+	[4200101]={
+		["desc"]="元素鏈接：隨機額外消除<color=#3cff28>3</color>個元素"
+	},
+	[4200102]={
+		["desc"]="元素鏈接隨機消除元素增加<color=#3cff28>2</color>個"
+	},
+	[4200103]={
+		["desc"]="元素鏈接使用時本次普攻傷害提升<color=#3cff28>10%</color>"
+	},
+	[4200104]={
+		["desc"]="元素鏈接隨機消除元素增加<color=#3cff28>2</color>個"
+	},
+	[4400101]={
 		["desc"]="霜凍劍舞：造成<color=#3cff28>1</color>次傷害並施加<color=#3cff28>1</color>回合冰霜效果"
 	},
-	[200801]={
+	[4400102]={
 		["desc"]="霜凍劍舞被使用時可消除掉其上下左右<color=#3cff28>4</color>個元素"
 	},
-	[200802]={
+	[4400103]={
 		["desc"]="霜凍劍舞<color=#3cff28>傷害提升</color>"
 	},
-	[200803]={
+	[4400104]={
 		["desc"]="霜凍劍舞造成的冰霜效果將持續<color=#3cff28>2</color>回合"
+	},
+	[5200101]={
+		["desc"]="魔法罩：艾倫可生成一個魔法罩持續<color=#3cff28>1</color>回合"
+	},
+	[5200102]={
+		["desc"]="增加魔法罩承受<color=#3cff28>傷害增加</color>。"
+	},
+	[5200103]={
+		["desc"]="生成的魔法罩如果沒有破可以額外持續<color=#3cff28>1</color>回合"
+	},
+	[5200104]={
+		["desc"]="魔法罩存在時可反傷對方造成<color=#3cff28>200%傷害</color>"
 	}
 }
 local config = {

lua/app/global/global_func.lua

@@ -1643,6 +1643,10 @@ function GFunc.DOBFSliderValue(slider, endValue, duration, snapping)
 	return CS.BF.Utils.DOBFSliderValue(slider, endValue, duration, snapping)
 end
 
+function GFunc.intToString(int)
+	return GConst.INT_TO_STRING[int] or tostring(int)
+end
+
 --[[
 	设置tabLe只速 出现改写会抛出Lua error
 	用法locaL readOnlyCfg = GFunc.readOnlyTab(cfg) return readOnlyCfg

lua/app/module/bounty/bounty_manager.lua

@@ -70,7 +70,7 @@ end
 
 function BountyManager:onBoughtBountyFinish(result)
 	if result.status == 0 then
-    	DataManager.BountyData:setBought(true, result.level)
+    	DataManager.BountyData:setBought(result.season, result.level)
 	end
 end
 

lua/app/module/item/item_const.lua

@@ -3,6 +3,7 @@ local ItemConst = {}
 ItemConst.ITEM_ID_GOLD = 1
 ItemConst.ITEM_ID_GEM = 2
 ItemConst.ITEM_ID_VIT = 3
+ItemConst.ITEM_ID_BOUNTY_EXP = 7
 
 ItemConst.ITEM_TYPE = {
 	RES = 1,

lua/app/proto/proto_msg_type.lua

@@ -19,6 +19,8 @@ local ProtoMsgType = {
         [554456514] = "EnergyByDiamondRsp",
         [613793796] = "WatchADReq",
         [613795629] = "WatchADRsp",
+        [737107384] = "BuyMallIdleReq",
+        [737109217] = "BuyMallIdleRsp",
         [1008447203] = "DeleteReq",
         [1008449036] = "DeleteRsp",
         [1068769299] = "ReconnectReq",
@@ -115,6 +117,8 @@ local ProtoMsgType = {
         EnergyByDiamondRsp = 554456514,
         WatchADReq = 613793796,
         WatchADRsp = 613795629,
+        BuyMallIdleReq = 737107384,
+        BuyMallIdleRsp = 737109217,
         DeleteReq = 1008447203,
         DeleteRsp = 1008449036,
         ReconnectReq = 1068769299,
@@ -211,6 +215,8 @@ local ProtoMsgType = {
         EnergyByDiamondRsp = "EnergyByDiamondRsp",
         WatchADReq = "WatchADReq",
         WatchADRsp = "WatchADRsp",
+        BuyMallIdleReq = "BuyMallIdleReq",
+        BuyMallIdleRsp = "BuyMallIdleRsp",
         DeleteReq = "DeleteReq",
         DeleteRsp = "DeleteRsp",
         ReconnectReq = "ReconnectReq",

lua/app/ui/bounty/bounty_main_ui.lua

@@ -11,14 +11,20 @@ function BountyMainUI:ctor()
 	self.previewRewardIndex = 10
 end
 
+function BountyMainUI:onClose()
+	self:clearAdaptScrollrect()
+end
+
 function BountyMainUI:onLoadRootComplete()
 	local uiMap = self.root:genAllChildren()
 	self.uiMap = uiMap
-	local closeBtn = uiMap["bounty_main_ui.bottom_node.clost_btn"]
+	local closeBtn = uiMap["bounty_main_ui.bottom_node.close_btn"]
 	closeBtn:addClickListener(function()
 		self:closeUI()
 	end)
 
+	self:initTime()
+	self:initLevel()
 	self:initPayBtn()
 	self:initPreviewReward()
 	self:initRewards()
@@ -30,6 +36,20 @@ function BountyMainUI:onLoadRootComplete()
 	self:updateTime()
 end
 
+function BountyMainUI:initTime()
+	self.timeIcon = self.uiMap["bounty_main_ui.top_node.time_icon"]
+	self.timeTx = self.uiMap["bounty_main_ui.top_node.time_tx"]
+	self.timeTx:setText(GConst.EMPTY_STRING)
+	self.adjustTimeUI = false
+end
+
+function BountyMainUI:initLevel()
+	self.levelSlider = self.uiMap["bounty_main_ui.top_node.progress_bg.slider"]
+	self.levelItemImg = self.uiMap["bounty_main_ui.top_node.progress_bg.item_img"]
+	self.levelSliderTx = self.uiMap["bounty_main_ui.top_node.progress_bg.slider_tx"]
+	self.lvTx = self.uiMap["bounty_main_ui.top_node.progress_bg.lv_img.lv_tx"]
+end
+
 function BountyMainUI:initPayBtn()
 	self.payBtn = self.uiMap["bounty_main_ui.top_node.buy_btn"]
 	self.payBtnTx = self.uiMap["bounty_main_ui.top_node.buy_btn.tx"]
@@ -49,22 +69,54 @@ function BountyMainUI:initPreviewReward()
 end
 
 function BountyMainUI:initRewards()
+	self.adjustRewardsTitleUI = false
+	local rewardsLeftTitle = self.uiMap["bounty_main_ui.top_node.left"]
+	rewardsLeftTitle:setAnchoredPositionX(-GConst.UI_SCREEN_WIDTH/4)
+	self.rewardsLeftTitleIcon = self.uiMap["bounty_main_ui.top_node.left.icon"]
+	self.rewardsLeftTitleTx = self.uiMap["bounty_main_ui.top_node.left.text"]
+	local rewardsRightTitle = self.uiMap["bounty_main_ui.top_node.right"]
+	rewardsRightTitle:setAnchoredPositionX(GConst.UI_SCREEN_WIDTH/4)
+	self.rewardsRightTitleIcon = self.uiMap["bounty_main_ui.top_node.right.icon"]
+	self.rewardsRightTitleTx = self.uiMap["bounty_main_ui.top_node.right.text"]
+
 	self.line = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.line"]
+	local buyLevelItemIcon = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.line.btn.item"]
+	local buyLevelItemTx = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.line.btn.tx"]
+	local cost = DataManager.BountyData:getBuyBountyLevelCost()
+	local costId = GFunc.getRewardId(cost)
+	local info = ConfigManager:getConfig("item")[costId]
+    if info then
+        buyLevelItemIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon)
+    end
+	local costNum = GFunc.getRewardNum(cost)
+	buyLevelItemTx:setText(tostring(costNum))
+	GFunc.centerImgAndTx(buyLevelItemIcon, buyLevelItemTx)
 	self.buyLevelBtn = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.line.btn"]
 	self.buyLevelBtn:addClickListener(function()
 		ModuleManager.BountyManager:buyBountyLevel()
 	end)
 
 	self.scrollrect = self.uiMap["bounty_main_ui.mid_node.scrollrect"]
+	self.scrollrectViewport = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport"]
 	self.rewardsContent = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content"]
 	self.scrollrectComp = self.scrollrect:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
 	self.scrollrectComp:clearCells()
 	self.scrollrectComp:setTotalCount(0)
 	self.scrollrectComp:setFadeArgs(0, 0.3)
 	self.scrollrectComp:addInitCallback(function()
-		return "app/ui/bounty/cell/bounty_reward_cell"
+		return "app/ui/bounty/cell/bounty_cell"
 	end)
 	self.scrollrectComp:addRefreshCallback(function(index, cell)
+		-- TODO 有时候顺序还是不对
+		if self.refreshIndex then
+			if index > self.refreshIndex then
+				cell:getBaseObject():getTransform():SetAsLastSibling()
+			elseif index < self.refreshIndex then
+				cell:getBaseObject():getTransform():SetAsFirstSibling()
+			end
+		end
+		self.refreshIndex = index
+
 		if index > self.maxCellIdx then
 			self.maxCellIdx = index
 			self:showLevelNextCell()
@@ -76,18 +128,35 @@ function BountyMainUI:initRewards()
 		if index > lv - 1 or index < lv + 1 then
 			self.line:getTransform():SetAsLastSibling()
 		end
-		cell:refresh(index)
+		cell:refresh(index, index == self.scrollrectComp:getTotalCount())
 	end)
-	self.cellHeight = self.scrollrectComp:getCellHeight()
+	self.cellHeight = 200
-	local scrollBottom = 114
+	local scrollBottom = 106
-	local scrollTop = 416
+	local scrollTop = 464
 	local height = self.root:getRectHeight()
 	height = height - scrollTop - scrollBottom
 	self.maxCellNum = math.ceil(height/self.cellHeight)
+	self:adaptScrollrect()
+end
 
-	self.scrollrect:setOffsetMin(-scrollTop, scrollBottom)
+function BountyMainUI:adaptScrollrect()
-	self.scrollrect:setSizeDeltaX(1280)
+    if not self.rectDefaultSize then
-	self.scrollrect:setAnchoredPosition(0, -scrollTop)
+        self.rectDefaultSize = self.scrollrect:getSizeDelta()
+    end
+    if not self.viewDefaultSize then
+        self.viewDefaultSize = self.scrollrectViewport:getSizeDelta()
+    end
+	local addH = GFunc.calculateFitSizeY()
+    self.scrollrect:setSizeDelta(self.rectDefaultSize.x, self.rectDefaultSize.y + addH)
+    self.scrollrectViewport:setSizeDelta(self.viewDefaultSize.x, self.viewDefaultSize.y + addH)
+end
+
+function BountyMainUI:clearAdaptScrollrect()
+    if not self.rectDefaultSize then
+		return
+    end
+    self.scrollrect:setSizeDelta(self.rectDefaultSize.x, self.rectDefaultSize.y)
+    self.scrollrectViewport:setSizeDelta(self.viewDefaultSize.x, self.viewDefaultSize.y)
 end
 
 function BountyMainUI:bindData()
@@ -97,11 +166,23 @@ function BountyMainUI:bindData()
 end
 
 function BountyMainUI:onRefresh()
+	self:refreshLv()
 	self:refreshPayBtn()
 	self:refreshPreviewReward(self.previewRewardIndex)
 	self:refreshRewards()
 end
 
+function BountyMainUI:refreshLv()
+	local exp = DataManager.BountyData:getExp()
+	local lvUpExp = DataManager.BountyData:getLvUpExp()
+	local level = DataManager.BountyData:getLevel()
+	self.levelSliderTx:setText(exp .. "/" .. lvUpExp)
+	self.levelSlider:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = exp / lvUpExp
+	self.lvTx:setText(tostring(level))
+	local expItemIcon = DataManager.BountyData:getExpItemIcon()
+	self.levelItemImg:setSprite(GConst.ATLAS_PATH.ICON_ITEM, expItemIcon)
+end
+
 function BountyMainUI:refreshPayBtn()
 	if DataManager.BountyData:getBought() then
 		self.payBtn:setTouchEnable(false)
@@ -121,6 +202,13 @@ function BountyMainUI:refreshPreviewReward(idx)
 end
 
 function BountyMainUI:refreshRewards()
+	self.rewardsLeftTitleTx:setText("临时文本:免费通行证")
+	self.rewardsRightTitleTx:setText("临时文本:黄金通行证")
+	if not self.adjustRewardsTitleUI then
+		self.adjustRewardsTitleUI = true
+		GFunc.centerImgAndTx(self.rewardsLeftTitleIcon, self.rewardsLeftTitleTx)
+		GFunc.centerImgAndTx(self.rewardsRightTitleIcon, self.rewardsRightTitleTx)
+	end
 	local maxLv = DataManager.BountyData:getMaxLevel()
 	local lv = DataManager.BountyData:getLevel()
 	if self.scrollrectComp:getTotalCount() <= 0 then
@@ -132,8 +220,8 @@ function BountyMainUI:refreshRewards()
 		self.line:setVisible(false)
 	else
 		self.line:setVisible(true)
-		local posY = (maxLv - lv)*self.cellHeight
+		local posY = -lv*self.cellHeight
-		self.line:setAnchoredPosition(640, posY + 5)
+		self.line:setAnchoredPositionY(posY)
 	end
 end
 
@@ -216,6 +304,16 @@ function BountyMainUI:scrollToIndex(targetIndex)
 end
 
 function BountyMainUI:updateTime()
+	local remainTime = DataManager.BountyData:getRemainTime()
+	if remainTime < 0 then
+		UIManager:closeUnderUI(self)
+		return self:closeUI()
+	end
+	self.timeTx:setText(GFunc.getTimeStr(remainTime))
+	if not self.adjustTimeUI then
+		self.adjustTimeUI = true
+		GFunc.centerImgAndTx(self.timeIcon, self.timeTx)
+	end
 end
 
 return BountyMainUI

lua/app/ui/bounty/cell/bounty_cell.lua

@@ -0,0 +1,94 @@
+local BountyCell = class("BountyCell", BaseCell)
+
+local BOUNTY_REWARD_CELL = "app/ui/bounty/cell/bounty_reward_cell"
+
+function BountyCell:init()
+	local uiMap = self:getUIMap()
+	self.uiMap = uiMap
+	uiMap["cell.bg.bounty_reward_cell_1"]:setAnchoredPositionX(-GConst.UI_SCREEN_WIDTH/4)
+	self.bountyRewardCell1 = uiMap["cell.bg.bounty_reward_cell_1"]:addLuaComponent(BOUNTY_REWARD_CELL)
+	uiMap["cell.bg.bounty_reward_cell_2"]:setAnchoredPositionX(GConst.UI_SCREEN_WIDTH/4)
+	self.bountyRewardCell2 = uiMap["cell.bg.bounty_reward_cell_2"]:addLuaComponent(BOUNTY_REWARD_CELL)
+	self.maskImg = uiMap["cell.mask_img"]
+	self.lvBg = uiMap["cell.bg.lv_bg"]
+	self.lvTx = uiMap["cell.bg.lv_bg.lv_tx"]
+
+	self.progressBg = uiMap["cell.bg.progress_bg"]
+	self.progressComp = uiMap["cell.bg.progress_bg.progress"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
+	self.bountyRewardCell1:addClickListener(function()
+		if self.idx == nil then
+			return
+		end
+		local iCslaimed = DataManager.BountyData:getLevelState(self.idx)
+		local lv = DataManager.BountyData:getLevel()
+		if not iCslaimed and lv >= self.idx then
+			ModuleManager.BountyManager:claimReward(self.idx, false)
+		else
+			local bountyInfo = DataManager.BountyData:getSeasonInfoByLevel(self.idx)
+			ModuleManager.TipsManager:showRewardTips(bountyInfo.reward.id, bountyInfo.reward.type, self.bountyRewardCell1:getBaseObject())
+		end
+	end)
+	self.bountyRewardCell2:addClickListener(function()
+		if self.idx == nil then
+			return
+		end
+		local isBought = DataManager.BountyData:getBought()
+		local iCslaimed = DataManager.BountyData:getProLevelState(self.idx)
+		local lv = DataManager.BountyData:getLevel()
+		if isBought and not iCslaimed and lv >= self.idx then
+			ModuleManager.BountyManager:claimReward(self.idx, true)
+		else
+			local bountyInfo = DataManager.BountyData:getSeasonInfoByLevel(self.idx)
+			ModuleManager.TipsManager:showRewardTips(bountyInfo.reward_pro.id, bountyInfo.reward_pro.type, self.bountyRewardCell2:getBaseObject())
+		end
+	end)
+end
+
+function BountyCell:refresh(idx, isFinalCell)
+	self.idx = idx
+	local bountyInfo = DataManager.BountyData:getSeasonInfoByLevel(idx)
+	local lv = DataManager.BountyData:getLevel()
+	local state = DataManager.BountyData:getLevelState(idx)
+	local proState = DataManager.BountyData:getProLevelState(idx)
+	local isBought = DataManager.BountyData:getBought()
+
+	self.lvTx:setText(GFunc.intToString(idx))
+	self.bountyRewardCell1:refresh(bountyInfo.reward, false, false, state)
+	self.bountyRewardCell2:refresh(bountyInfo.reward_pro, true, not isBought, proState)
+	if lv >= idx then
+		self.maskImg:setVisible(false)
+		self.lvBg:setImageGray(false)
+		if lv == idx then
+			self.progressComp.value = 0
+		else
+			self.progressComp.value = 1
+		end
+		if state then -- 已经领过了
+			self.bountyRewardCell1:hideLight()
+		else
+			self.bountyRewardCell1:showLight()
+		end
+		if isBought and not proState then
+			self.bountyRewardCell2:showLight()
+		else
+			self.bountyRewardCell2:hideLight()
+		end
+	else
+		self.lvBg:setImageGray(true)
+		self.maskImg:setVisible(true)
+		self.progressComp.value = 0
+		self.bountyRewardCell1:hideLight()
+		self.bountyRewardCell2:hideLight()
+	end
+	if isFinalCell then
+		self.progressBg:setVisible(false)
+	else
+		self.progressBg:setVisible(true)
+	end
+end
+
+function BountyCell:setVisible(visible)
+	self.baseObject:setVisible(visible)
+end
+
+return BountyCell

lua/app/ui/bounty/cell/bounty_cell.lua.meta

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

lua/app/ui/bounty/cell/bounty_reward_cell.lua

@@ -2,84 +2,104 @@ local BountyRewardCell = class("BountyRewardCell", BaseCell)
 
 function BountyRewardCell:init()
 	local uiMap = self:getUIMap()
-	self.uiMap = uiMap
+	self.bg = uiMap["bounty_reward_cell.bg"]
-	self.rewardCell1 = uiMap["cell.bg.reward_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+	self.icon = uiMap["bounty_reward_cell.icon"]
-	self.rewardCell2 = uiMap["cell.bg.reward_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+	self.numTx = uiMap["bounty_reward_cell.num"]
-	self.maskImg = uiMap["cell.mask_img"]
+	self.check = uiMap["bounty_reward_cell.check"]
-	self.rewardCell1:addClickListener(function()
+	self.fragment = uiMap["bounty_reward_cell.fragment"]
-		if self.idx == nil then
+	self.light = uiMap["bounty_reward_cell.light"]
-			return
+	self.lock = uiMap["bounty_reward_cell.lock"]
-		end
+
-		local iCslaimed = DataManager.BountyData:getLevelState(self.idx)
+	self:hideLight()
-		local lv = DataManager.BountyData:getLevel()
+	self.baseObject:addClickListener(function()
-		if not iCslaimed and lv >= self.idx then
+		if self.clickCallback then
-			ModuleManager.BountyManager:claimReward(self.idx, false)
+			self.clickCallback()
-		else
+		elseif self.rewardId ~= nil then
-			local bountyInfo = DataManager.BountyData:getSeasonInfoByLevel(self.idx)
+			local desc = self:getRewardDesc(self.rewardId, self.rewardType)
-			ModuleManager.TipsManager:showRewardTips(bountyInfo.reward.id, bountyInfo.reward.type, self.rewardCell1:getBaseObject())
+			ModuleManager.TipsManager:showDescTips(desc, self.baseObject)
-		end
-	end)
-	self.rewardCell2:addClickListener(function()
-		if self.idx == nil then
-			return
-		end
-		local isBought = DataManager.BountyData:getBought()
-		local iCslaimed = DataManager.BountyData:getProLevelState(self.idx)
-		local lv = DataManager.BountyData:getLevel()
-		if isBought and not iCslaimed and lv >= self.idx then
-			ModuleManager.BountyManager:claimReward(self.idx, true)
-		else
-			local bountyInfo = DataManager.BountyData:getSeasonInfoByLevel(self.idx)
-			ModuleManager.TipsManager:showRewardTips(bountyInfo.reward_pro.id, bountyInfo.reward_pro.type, self.rewardCell2:getBaseObject())
 		end
 	end)
 end
 
-function BountyRewardCell:refresh(idx)
+function BountyRewardCell:refresh(reward, isPro, isLock, showCheck)
-	self.idx = idx
+	self:showCheck(showCheck)
-	local bountyInfo = DataManager.BountyData:getSeasonInfoByLevel(idx)
+	if isPro then
-	local lv = DataManager.BountyData:getLevel()
+		self.bg:setSprite(GConst.ATLAS_PATH.BOUNTY, "bounty_board_1")
-	local state = DataManager.BountyData:getLevelState(idx)
-	local proState = DataManager.BountyData:getProLevelState(idx)
-	local isBought = DataManager.BountyData:getBought()
-
-	self.rewardCell1:refreshByConfig(bountyInfo.reward, state, state)
-	self.rewardCell2:refreshByConfig(bountyInfo.reward_pro, proState, proState)
-	if lv >= idx then
-		self.maskImg:setVisible(false)
-		if state then -- 已经领过了
-			self.rewardCell1:hideFrameAnimation()
-		else
-			self.rewardCell1:showFrameAnimation(bountyInfo.reward)
-		end
-		if isBought and not proState then
-			self.rewardCell2:showFrameAnimation(bountyInfo.reward_pro.type)
-		else
-			self.rewardCell2:hideFrameAnimation()
-		end
 	else
-		self.maskImg:setVisible(true)
+		self.bg:setSprite(GConst.ATLAS_PATH.BOUNTY, "bounty_board_2")
-		self.rewardCell1:hideFrameAnimation()
-		self.rewardCell2:hideFrameAnimation()
 	end
-	-- self.lockImg:setVisible(not isBought, 1.5)
+	if isLock then
-	-- self.rewardBg:setVisible(false)
+		self.lock:setVisible(true)
-	-- self.bg:setSprite(GConst.ATLAS_PATH.UI_BOUNTY, "bounty_board_7")
+	else
-	-- if lv >= idx then
+		self.lock:setVisible(false)
-	-- 	self.lvBg:setSprite(GConst.ATLAS_PATH.UI_BOUNTY, "bounty_board_5", function ()
+	end
-	-- 		self.lvBg:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
+	if reward.type == GConst.REWARD_TYPE.ITEM then
-	-- 	end)
+		self:_refreshItem(reward)
-	-- else
+		self.rewardId = reward.id
-	-- 	self.lvBg:setSprite(GConst.ATLAS_PATH.UI_BOUNTY, "bounty_board_6", function ()
+		self.rewardType = reward.type
-	-- 		self.lvBg:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
+	else
-	-- 	end)
+		self.rewardId = nil
-	-- end
+	end
-	-- self.rewardCell1:setLocalScale(0.65, 0.65, 1)
+end
-	-- self.rewardCell2:setLocalScale(0.65, 0.65, 1)
+
+function BountyRewardCell:_refreshItem(item)
+	local info = ConfigManager:getConfig("item")[item.id]
+	if info == nil then
+		return
+	end
+	self.numTx:setText(item.count or item.num)
+	if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then
+		local heroInfo = ConfigManager:getConfig("hero")[info.parameter]
+		if heroInfo then
+			self.icon:setLocalScale(0.86, 0.86, 0.86)
+			self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon)
+		else
+			self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha")
+		end
+		self.fragment:setVisible(true)
+	else
+		self.icon:setLocalScale(1, 1, 1)
+		self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon)
+		self.fragment:setVisible(false)
+	end
+end
+
+function BountyRewardCell:showCheck(show)
+	self.check:setVisible(show == true)
 end
 
 function BountyRewardCell:setVisible(visible)
-	self.baseObject:setVisible(visible)
+	self.baseObject:setActive(visible)
+end
+
+function BountyRewardCell:setAnchoredPositionX(x)
+	self.baseObject:setAnchoredPositionX(x)
+end
+
+function BountyRewardCell:setTouchEnable(enable)
+	self.baseObject:setTouchEnable(enable)
+end
+
+function BountyRewardCell:addClickListener(callback)
+	self.clickCallback = callback
+end
+
+function BountyRewardCell:getRewardDesc(id, rewardType)
+	if rewardType == GConst.REWARD_TYPE.ITEM then
+		local item18NInfo = I18N:getConfig("item")[id]
+		if item18NInfo then
+			return item18NInfo.desc
+		end
+	end
+	return GConst.EMPTY_STRING
+end
+
+function BountyRewardCell:showLight()
+	self.light:setVisible(true)
+end
+
+function BountyRewardCell:hideLight()
+	self.light:setVisible(false)
 end
 
 return BountyRewardCell

lua/app/ui/ui_manager.lua

@@ -541,7 +541,6 @@ function UIManager:closeUnderUI(uiObj)
 				curUIObj:_onExitAnimationComplete()
 				closeFlag = true
 			end
-
 			break
 		end
 	end

lua/app/userdata/bag/item_data.lua

@@ -194,13 +194,18 @@ function ItemData:_addItemNumById(id, num)
 	if num > 0 and self.items[id]:getItemType() == ItemConst.ITEM_TYPE.HERO_FRAGMENT then
 		ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_HERO_FRAGMENT_GOT, num)
 	end
-	if id == ItemConst.ITEM_ID_VIT and isFull then
+	if id == ItemConst.ITEM_ID_VIT then
-		local maxVit = DataManager.PlayerData:getMaxVit()
+		DataManager.PlayerData:setVit(self.items[id]:getNum())
-		local currentCount = DataManager.PlayerData:getVit()
+		if isFull then
-		local isNewFull = currentCount >= maxVit
+			local maxVit = DataManager.PlayerData:getMaxVit()
-		if not isNewFull then
+			local currentCount = DataManager.PlayerData:getVit()
-			self:resetItemRecoveryTime(ItemConst.ITEM_ID_VIT)
+			local isNewFull = currentCount >= maxVit
+			if not isNewFull then
+				self:resetItemRecoveryTime(ItemConst.ITEM_ID_VIT)
+			end
 		end
+	elseif id == ItemConst.ITEM_ID_BOUNTY_EXP then
+		DataManager.BountyData:addExp(num)
 	end
 	self:setDirty()
 end

lua/app/userdata/bag/item_entity.lua

@@ -37,9 +37,6 @@ end
 -- 加减道具数量
 function ItemEntity:addNum(num)
 	self.data.num = self.data.num + num
-	if self.data.id == GConst.ItemConst.ITEM_ID_VIT then
-		DataManager.PlayerData:setVit(self.data.num)
-	end
 	self:setDirty()
 end
 

lua/app/userdata/bounty/bounty_data.lua

@@ -15,9 +15,20 @@ function BountyData:init(data)
     self.bought = data.bought
     self.claimed = data.claimed or {}
     self.proClaimed = data.pro_claimed or {}
+    self.endTime = 0
+    self:initBountyTime()
     self:initBountyLevelCfg()
 end
 
+function BountyData:initBountyTime()
+    local info = ConfigManager:getConfig("bounty_time")[self.season]
+    if info == nil then
+        self.endTime = 0
+        return
+    end
+    self.endTime = Time:getCertainTimeByStr(info.end_time)
+end
+
 function BountyData:initBountyLevelCfg()
     self.bountyLevelCfg = {}
     local cfg = ConfigManager:getConfig("bounty_level")
@@ -33,8 +44,11 @@ function BountyData:getBought()
     return self.bought
 end
 
-function BountyData:setBought(bought, level)
+function BountyData:setBought(season, level)
-    self.bought = bought
+    if self.season ~= season then
+        return
+    end
+    self.bought = true
     self.level = level or self.level
     self:markDirty()
 end
@@ -43,9 +57,38 @@ function BountyData:getLevel()
     return self.level
 end
 
+function BountyData:getExp()
+    return self.exp
+end
+
+function BountyData:addExp(num)
+    self.exp = self.exp + num
+    local lvUpExp = self:getLvUpExp()
+    local maxLv = self:getMaxLevel()
+    while self.exp >= lvUpExp do
+        self.exp = self.exp - lvUpExp
+        self.level = self.level + 1
+        if self.level >= maxLv then
+            self.level = maxLv
+            break
+        end
+    end
+    self:markDirty()
+end
+
+function BountyData:getLvUpExp()
+    local info = self:getSeasonInfoByLevel(self.level)
+    if info == nil then
+        return 1
+    end
+    return info.exp
+end
+
 function BountyData:getIsOpen()
-    -- 开启条件和任务一样
+    if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.BOUNTY_OPEN, true) and self.endTime > Time:getServerTime() then
-    return ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TASK, true)
+        return true
+    end
+    return false
 end
 
 function BountyData:getBannerName()
@@ -64,10 +107,6 @@ function BountyData:getMaxLevel()
     return #self.bountyLevelCfg
 end
 
-function BountyData:getMainLevelCount()
-    return #self.bountyLevelCfg - 1
-end
-
 function BountyData:getLevelState(lv)
     return self.claimed[lv]
 end
@@ -118,4 +157,18 @@ function BountyData:markDirty()
     self.data.dirty = not self.data.dirty
 end
 
+function BountyData:getRemainTime()
+    local nowTime = Time:getServerTime()
+    return self.endTime - nowTime
+end
+
+function BountyData:getExpItemIcon()
+    local id = GConst.ItemConst.ITEM_ID_BOUNTY_EXP
+    local info = ConfigManager:getConfig("item")[id]
+    if info == nil then
+        return GConst.EMPTY_STRING
+    end
+    return info.icon
+end
+
 return BountyData