主界面

lua/app/config/act_gift.lua

@@ -1,4 +1,376 @@
 local act_gift = {
+	[100102]={
+		["type"]=1,
+		["parameter"]=3,
+		["recharge_id"]=1,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=120,
+ 				["num_for_nothing"]="Vwpc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[100202]={
+		["type"]=1,
+		["parameter"]=4,
+		["recharge_id"]=1,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=120,
+ 				["num_for_nothing"]="Vwpc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[100302]={
+		["type"]=1,
+		["parameter"]=5,
+		["recharge_id"]=2,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=240,
+ 				["num_for_nothing"]="VAxc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=95
+	},
+	[100402]={
+		["type"]=1,
+		["parameter"]=6,
+		["recharge_id"]=3,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=360,
+ 				["num_for_nothing"]="VQ5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[100502]={
+		["type"]=1,
+		["parameter"]=7,
+		["recharge_id"]=3,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=360,
+ 				["num_for_nothing"]="VQ5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
+				["num"]=300,
+ 				["num_for_nothing"]="VQhc"
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[100602]={
+		["type"]=1,
+		["parameter"]=8,
+		["recharge_id"]=2,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=240,
+ 				["num_for_nothing"]="VAxc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=51,
+ 				["id_for_nothing"]="Uwk=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=95
+	},
+	[100702]={
+		["type"]=1,
+		["parameter"]=9,
+		["recharge_id"]=3,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=360,
+ 				["num_for_nothing"]="VQ5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=23,
+ 				["id_for_nothing"]="VAs=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[100802]={
+		["type"]=1,
+		["parameter"]=10,
+		["recharge_id"]=3,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=360,
+ 				["num_for_nothing"]="VQ5c"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=23,
+ 				["id_for_nothing"]="VAs=",
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[100902]={
+		["type"]=1,
+		["parameter"]=11,
+		["recharge_id"]=4,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=480,
+ 				["num_for_nothing"]="UgBc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=54,
+ 				["id_for_nothing"]="Uww=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=95
+	},
+	[101002]={
+		["type"]=1,
+		["parameter"]=12,
+		["recharge_id"]=6,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=720,
+ 				["num_for_nothing"]="UQpc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=23,
+ 				["id_for_nothing"]="VAs=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[101102]={
+		["type"]=1,
+		["parameter"]=13,
+		["recharge_id"]=6,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=720,
+ 				["num_for_nothing"]="UQpc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=23,
+ 				["id_for_nothing"]="VAs=",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
+	[101202]={
+		["type"]=1,
+		["parameter"]=14,
+		["recharge_id"]=4,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=480,
+ 				["num_for_nothing"]="UgBc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=54,
+ 				["id_for_nothing"]="Uww=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=95
+	},
+	[101302]={
+		["type"]=1,
+		["parameter"]=15,
+		["recharge_id"]=10,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1200,
+ 				["num_for_nothing"]="VwpcAw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=28,
+ 				["id_for_nothing"]="VAA=",
+				["num"]=30,
+ 				["num_for_nothing"]="VQg="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=167,
+ 				["id_for_nothing"]="Vw5b",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		},
+		["time_type"]=1,
+		["limit_time"]=999999,
+		["limit_time_2"]=3,
+		["limit"]=1,
+		["value"]=90
+	},
 	[70102]={
 		["type"]=7,
 		["recharge_id"]=13,
@@ -30,7 +402,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=1,
-		["cd"]=6,
+		["limit_time_2"]=6,
 		["limit"]=1,
 		["value"]=1000
 	},
@@ -53,7 +425,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=1,
-		["cd"]=6,
+		["limit_time_2"]=6,
 		["limit"]=1,
 		["value"]=1200
 	},
@@ -76,7 +448,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=1,
-		["cd"]=6,
+		["limit_time_2"]=6,
 		["limit"]=1,
 		["value"]=1500
 	},
@@ -585,7 +957,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=24,
-		["cd"]=0,
+		["limit_time_2"]=0,
 		["value"]=200
 	},
 	[90202]={
@@ -627,7 +999,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=24,
-		["cd"]=0,
+		["limit_time_2"]=0,
 		["value"]=260
 	},
 	[90302]={
@@ -669,7 +1041,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=24,
-		["cd"]=0,
+		["limit_time_2"]=0,
 		["value"]=400
 	},
 	[90402]={
@@ -711,7 +1083,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=24,
-		["cd"]=0,
+		["limit_time_2"]=0,
 		["value"]=800
 	},
 	[100102]={
@@ -767,7 +1139,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[110202]={
@@ -809,7 +1181,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[110302]={
@@ -851,7 +1223,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[110402]={
@@ -893,7 +1265,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[110502]={
@@ -935,7 +1307,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[110602]={
@@ -977,7 +1349,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[110702]={
@@ -1019,7 +1391,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[110802]={
@@ -1061,7 +1433,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[110902]={
@@ -1103,7 +1475,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[111002]={
@@ -1145,7 +1517,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[120102]={
@@ -1187,7 +1559,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[120202]={
@@ -1229,7 +1601,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[120302]={
@@ -1271,7 +1643,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[120402]={
@@ -1313,7 +1685,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[120502]={
@@ -1355,7 +1727,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[120602]={
@@ -1397,7 +1769,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[120702]={
@@ -1439,7 +1811,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[120802]={
@@ -1481,7 +1853,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[120902]={
@@ -1523,7 +1895,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[121002]={
@@ -1565,7 +1937,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=12,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=1000
 	},
 	[130002]={
@@ -1738,7 +2110,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150202]={
@@ -1776,7 +2148,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150302]={
@@ -1814,7 +2186,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150402]={
@@ -1852,7 +2224,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150502]={
@@ -1898,7 +2270,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150602]={
@@ -1944,7 +2316,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150702]={
@@ -1990,7 +2362,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150802]={
@@ -2036,7 +2408,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[150902]={
@@ -2082,7 +2454,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[151002]={
@@ -2128,7 +2500,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160102]={
@@ -2166,7 +2538,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160202]={
@@ -2204,7 +2576,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160302]={
@@ -2242,7 +2614,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160402]={
@@ -2280,7 +2652,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160502]={
@@ -2326,7 +2698,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160602]={
@@ -2372,7 +2744,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160702]={
@@ -2418,7 +2790,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160802]={
@@ -2464,7 +2836,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[160902]={
@@ -2510,7 +2882,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[161002]={
@@ -2556,7 +2928,7 @@ local act_gift = {
 		},
 		["time_type"]=1,
 		["limit_time"]=6,
-		["cd"]=1,
+		["limit_time_2"]=1,
 		["value"]=800
 	},
 	[170102]={
@@ -6142,6 +6514,6 @@ local act_gift = {
 	}
 }
 local config = {
-data=act_gift,count=134
+data=act_gift,count=147
 }
 return config

lua/app/config/arena_time.lua

@@ -106,9 +106,81 @@ local arena_time = {
 		["start_time"]="2024-12-15 00:00:00",
 		["end_time"]="2025-1-15 00:00:00",
 		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[19]={
+		["season"]=19,
+		["start_time"]="2025-1-15 00:00:00",
+		["end_time"]="2025-2-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_5"
+	},
+	[20]={
+		["season"]=20,
+		["start_time"]="2025-2-15 00:00:00",
+		["end_time"]="2025-3-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner_6"
+	},
+	[21]={
+		["season"]=21,
+		["start_time"]="2025-3-16 00:00:00",
+		["end_time"]="2025-4-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[22]={
+		["season"]=22,
+		["start_time"]="2025-4-15 00:00:00",
+		["end_time"]="2025-5-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[23]={
+		["season"]=23,
+		["start_time"]="2025-5-16 00:00:00",
+		["end_time"]="2025-6-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[24]={
+		["season"]=24,
+		["start_time"]="2025-6-15 00:00:00",
+		["end_time"]="2025-7-16 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[25]={
+		["season"]=25,
+		["start_time"]="2025-7-16 00:00:00",
+		["end_time"]="2025-8-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[26]={
+		["season"]=26,
+		["start_time"]="2025-8-15 00:00:00",
+		["end_time"]="2025-9-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[27]={
+		["season"]=27,
+		["start_time"]="2025-9-15 00:00:00",
+		["end_time"]="2025-10-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[28]={
+		["season"]=28,
+		["start_time"]="2025-10-15 00:00:00",
+		["end_time"]="2025-11-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[29]={
+		["season"]=29,
+		["start_time"]="2025-11-15 00:00:00",
+		["end_time"]="2025-12-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
+	},
+	[30]={
+		["season"]=30,
+		["start_time"]="2025-12-15 00:00:00",
+		["end_time"]="2025-1-15 00:00:00",
+		["ui_banner"]="ui_arena_bounty_banner"
 	}
 }
 local config = {
-data=arena_time,count=18
+data=arena_time,count=30
 }
 return config

lua/app/config/attr.lua

@@ -262,6 +262,38 @@ local attr = {
 	[66]={
 		["id"]=66,
 		["name"]="attr_atkp_purple_all"
+	},
+	[67]={
+		["id"]=67,
+		["name"]="atk_all"
+	},
+	[68]={
+		["id"]=68,
+		["name"]="attr_hp_all"
+	},
+	[69]={
+		["id"]=69,
+		["name"]="attr_dmgdec_all"
+	},
+	[70]={
+		["id"]=70,
+		["name"]="attr_crit_all"
+	},
+	[71]={
+		["id"]=71,
+		["name"]="attr_crit_time_all"
+	},
+	[72]={
+		["id"]=72,
+		["name"]="attr_normal_hurtp_all"
+	},
+	[73]={
+		["id"]=73,
+		["name"]="attr_skill_hurtp_all"
+	},
+	[74]={
+		["id"]=74,
+		["name"]="attr_atkp_all"
 	}
 }
 local keys = {
@@ -331,12 +363,20 @@ local keys = {
 		["attr_atkp_yellow_all"]=attr[63],
 		["attr_atkp_green_all"]=attr[64],
 		["attr_atkp_blue_all"]=attr[65],
-		["attr_atkp_purple_all"]=attr[66]
+		["attr_atkp_purple_all"]=attr[66],
+		["atk_all"]=attr[67],
+		["attr_hp_all"]=attr[68],
+		["attr_dmgdec_all"]=attr[69],
+		["attr_crit_all"]=attr[70],
+		["attr_crit_time_all"]=attr[71],
+		["attr_normal_hurtp_all"]=attr[72],
+		["attr_skill_hurtp_all"]=attr[73],
+		["attr_atkp_all"]=attr[74]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=66
+count=74
 }
 return config

lua/app/config/chapter_daily_challenge.lua

@@ -1,5 +1,6 @@
 local chapter_daily_challenge = {
 	[1]={
+		["max_chapter"]=1,
 		["scene"]="bg_11",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_2",
@@ -229,6 +230,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[2]={
+		["max_chapter"]=2,
 		["scene"]="bg_15",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_1",
@@ -458,6 +460,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[3]={
+		["max_chapter"]=3,
 		["scene"]="bg_16",
 		["block_icon"]="battle_hinder_7",
 		["chess_board"]="chessboard_1",
@@ -687,6 +690,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[4]={
+		["max_chapter"]=4,
 		["scene"]="bg_22",
 		["block_icon"]="battle_hinder_8",
 		["chess_board"]="chessboard_1",
@@ -916,6 +920,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[5]={
+		["max_chapter"]=5,
 		["scene"]="bg_24",
 		["block_icon"]="battle_hinder_9",
 		["chess_board"]="chessboard_3",
@@ -1145,6 +1150,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[6]={
+		["max_chapter"]=6,
 		["scene"]="bg_25",
 		["block_icon"]="battle_hinder_10",
 		["chess_board"]="chessboard_3",
@@ -1374,6 +1380,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[7]={
+		["max_chapter"]=7,
 		["scene"]="bg_25",
 		["block_icon"]="battle_hinder_11",
 		["chess_board"]="chessboard_3",
@@ -1603,6 +1610,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[8]={
+		["max_chapter"]=8,
 		["scene"]="bg_27",
 		["block_icon"]="battle_hinder_27",
 		["chess_board"]="chessboard_1",
@@ -1832,6 +1840,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[9]={
+		["max_chapter"]=9,
 		["scene"]="bg_30",
 		["block_icon"]="battle_hinder_29",
 		["chess_board"]="chessboard_3",
@@ -2061,6 +2070,7 @@ local chapter_daily_challenge = {
 		}
 	},
 	[10]={
+		["max_chapter"]=10,
 		["scene"]="bg_35",
 		["block_icon"]="battle_hinder_35",
 		["chess_board"]="chessboard_2",

lua/app/config/const.lua

@@ -7,6 +7,7 @@ local const = {
 	},
 	["chapter_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -14,6 +15,7 @@ local const = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
+		}
 	},
 	["shake_level_1"]={
 		["value"]=10
@@ -44,6 +46,7 @@ local const = {
 	},
 	["bounty_buy_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -51,9 +54,11 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["bounty_chapter_exp"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
@@ -61,6 +66,7 @@ local const = {
 				["num"]=2,
  				["num_for_nothing"]="VA=="
 			}
+		}
 	},
 	["bounty_senior_rise"]={
 		["value"]=10
@@ -88,6 +94,7 @@ local const = {
 	},
 	["idle_drop_fast_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -95,9 +102,11 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["refresh_skill_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -105,6 +114,7 @@ local const = {
 				["num"]=20,
  				["num_for_nothing"]="VAg="
 			}
+		}
 	},
 	["ad_refresh_skill"]={
 		["value"]=2
@@ -120,6 +130,7 @@ local const = {
 	},
 	["mall_daily_diamond_refresh_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -127,12 +138,14 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["summn_first"]={
 		["value"]=52001
 	},
 	["daily_challenge_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -140,6 +153,7 @@ local const = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
+		}
 	},
 	["daily_challenge_limit"]={
 		["value"]=2
@@ -164,6 +178,7 @@ local const = {
 	},
 	["dungeon_gold_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -171,12 +186,14 @@ local const = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
+		}
 	},
 	["dungeon_gold_limit"]={
 		["value"]=2
 	},
 	["dungeon_shards_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -184,12 +201,14 @@ local const = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
+		}
 	},
 	["dungeon_shards_limit"]={
 		["value"]=2
 	},
 	["change_name_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -197,6 +216,7 @@ local const = {
 				["num"]=200,
  				["num_for_nothing"]="VAhc"
 			}
+		}
 	},
 	["arena_odds_min"]={
 		["value"]=4500
@@ -218,6 +238,7 @@ local const = {
 	},
 	["arena_fight_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=22,
@@ -225,9 +246,11 @@ local const = {
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
+		}
 	},
 	["arena_notes_diamond_buy"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=22,
@@ -235,9 +258,11 @@ local const = {
 				["num"]=3,
  				["num_for_nothing"]="VQ=="
 			}
+		}
 	},
 	["arena_notes_diamond_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -245,12 +270,14 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["arena_notes_diamond_times"]={
 		["value"]=3
 	},
 	["arena_notes_ad_buy"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=22,
@@ -258,6 +285,7 @@ local const = {
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
+		}
 	},
 	["arena_notes_ad_times"]={
 		["value"]=5
@@ -267,6 +295,7 @@ local const = {
 	},
 	["arena_bounty_buy_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -274,6 +303,7 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["arena_bounty_senior_rise"]={
 		["value"]=10
@@ -307,6 +337,7 @@ local const = {
 	},
 	["dungeon_armor_limit"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -314,9 +345,11 @@ local const = {
 				["num"]=5,
  				["num_for_nothing"]="Uw=="
 			}
+		}
 	},
 	["dungeon_equip_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=3,
@@ -324,12 +357,14 @@ local const = {
 				["num"]=5,
  				["num_for_nothing"]="Uw=="
 			}
+		}
 	},
 	["activity_bounty_day"]={
 		["value"]=6
 	},
 	["activity_bounty_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -337,6 +372,7 @@ local const = {
 				["num"]=50,
  				["num_for_nothing"]="Uwg="
 			}
+		}
 	},
 	["bounty_click"]={
 		["value"]=4
@@ -346,6 +382,7 @@ local const = {
 	},
 	["activity_boss_rush_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -353,9 +390,11 @@ local const = {
 				["num"]=20,
  				["num_for_nothing"]="VAg="
 			}
+		}
 	},
 	["activity_boss_rush_costadd"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -363,6 +402,7 @@ local const = {
 				["num"]=20,
  				["num_for_nothing"]="VAg="
 			}
+		}
 	},
 	["activity_boss_rush_hp_add_1"]={
 		["value"]=1750
@@ -387,6 +427,7 @@ local const = {
 	},
 	["runes_cost_base"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=55,
@@ -394,9 +435,11 @@ local const = {
 				["num"]=5,
  				["num_for_nothing"]="Uw=="
 			}
+		}
 	},
 	["runes_cost_add"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=55,
@@ -404,6 +447,7 @@ local const = {
 				["num"]=5,
  				["num_for_nothing"]="Uw=="
 			}
+		}
 	},
 	["runes_red_point"]={
 		["value"]=1000
@@ -416,6 +460,7 @@ local const = {
 	},
 	["dungeon_rune_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -423,6 +468,7 @@ local const = {
 				["num"]=200,
  				["num_for_nothing"]="VAhc"
 			}
+		}
 	},
 	["dungeon_rune_buylimit"]={
 		["value"]=5
@@ -432,6 +478,7 @@ local const = {
 	},
 	["activity_pvp_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -439,9 +486,11 @@ local const = {
 				["num"]=20,
  				["num_for_nothing"]="VAg="
 			}
+		}
 	},
 	["activity_pvp_costadd"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -449,6 +498,7 @@ local const = {
 				["num"]=20,
  				["num_for_nothing"]="VAg="
 			}
+		}
 	},
 	["activity_pvp_win_times"]={
 		["value"]=10
@@ -464,6 +514,7 @@ local const = {
 	},
 	["activity_pvp_refresh_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -471,6 +522,7 @@ local const = {
 				["num"]=10,
  				["num_for_nothing"]="Vwg="
 			}
+		}
 	},
 	["act_tourn_rank_free"]={
 		["value"]=90
@@ -480,6 +532,7 @@ local const = {
 	},
 	["stamina_diamond_buy"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
@@ -487,9 +540,11 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["stamina_diamond_cost"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
@@ -497,12 +552,14 @@ local const = {
 				["num"]=100,
  				["num_for_nothing"]="Vwhc"
 			}
+		}
 	},
 	["stamina_diamond_times"]={
 		["value"]=2
 	},
 	["stamina_ad_buy"]={
 		["reward"]={
+			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=4,
@@ -510,6 +567,7 @@ local const = {
 				["num"]=30,
  				["num_for_nothing"]="VQg="
 			}
+		}
 	},
 	["stamina_ad_times"]={
 		["value"]=2

lua/app/config/item.lua

@@ -21,31 +21,31 @@ local item = {
 		["hero_drop"]={
 			{
 				["type"]=1,
-				["id"]=12001,
+				["id"]=13001,
 				["num"]=1,
 				["weight"]=100
 			},
 			{
 				["type"]=1,
-				["id"]=22001,
+				["id"]=23001,
 				["num"]=1,
 				["weight"]=100
 			},
 			{
 				["type"]=1,
-				["id"]=32001,
+				["id"]=33001,
 				["num"]=1,
 				["weight"]=100
 			},
 			{
 				["type"]=1,
-				["id"]=42001,
+				["id"]=43001,
 				["num"]=1,
 				["weight"]=100
 			},
 			{
 				["type"]=1,
-				["id"]=52001,
+				["id"]=53001,
 				["num"]=1,
 				["weight"]=100
 			}

lua/app/config/mall_daily_store.lua.meta

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

lua/app/config/mall_gold.lua

@@ -5,8 +5,8 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=600,
+			["num"]=5500,
- 			["num_for_nothing"]="UAhc"
+ 			["num_for_nothing"]="Uw1cAw=="
 		},
 		["cost"]={
 			["type"]=1,
@@ -16,7 +16,8 @@ local mall_gold = {
 			["num"]=25,
  			["num_for_nothing"]="VA0="
 		},
-		["daily"]=2
+		["free_times"]=1,
+		["ad_times"]=1
 	},
 	[2]={
 		["gold"]={
@@ -24,16 +25,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=3000,
+			["num"]=22000,
- 			["num_for_nothing"]="VQhcAw=="
+ 			["num_for_nothing"]="VApcA2U="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=99,
+			["num"]=100,
- 			["num_for_nothing"]="XwE="
+ 			["num_for_nothing"]="Vwhc"
 		}
 	},
 	[3]={
@@ -42,16 +43,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=30000,
+			["num"]=110000,
- 			["num_for_nothing"]="VQhcA2U="
+ 			["num_for_nothing"]="VwlcA2VR"
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=500,
+			["num"]=450,
- 			["num_for_nothing"]="Uwhc"
+ 			["num_for_nothing"]="Ug1c"
 		}
 	}
 }

lua/app/config/mall_treasure.lua

@@ -1,27 +1,28 @@
 local mall_treasure = {
 	[1]={
+		["recharge_id"]=1,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=6,
+				["num"]=80,
- 				["num_for_nothing"]="UA=="
+ 				["num_for_nothing"]="Xgg="
 			}
 		},
-		["daily"]=5
+		["limit"]=1
 	},
 	[2]={
-		["recharge_id"]=2,
+		["recharge_id"]=4,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=60,
+				["num"]=500,
- 				["num_for_nothing"]="UAg="
+ 				["num_for_nothing"]="Uwhc"
 			}
 		},
 		["limit"]=1
@@ -34,13 +35,27 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=150,
+				["num"]=1200,
- 				["num_for_nothing"]="Vw1c"
+ 				["num_for_nothing"]="VwpcAw=="
 			}
 		},
-		["limit"]=1
+		["limit"]=2
 	},
 	[4]={
+		["recharge_id"]=7,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=2500,
+ 				["num_for_nothing"]="VA1cAw=="
+			}
+		},
+		["limit"]=2
+	},
+	[5]={
 		["recharge_id"]=10,
 		["reward"]={
 			{
@@ -48,84 +63,28 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=500,
+				["num"]=6500,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="UA1cAw=="
 			}
 		},
-		["limit"]=2
+		["limit"]=3
-	},
-	[5]={
-		["recharge_id"]=13,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=1000,
- 				["num_for_nothing"]="VwhcAw=="
-			}
-		},
-		["limit"]=2
 	},
 	[6]={
-		["recharge_id"]=15,
+		["recharge_id"]=12,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=1500,
+				["num"]=14000,
- 				["num_for_nothing"]="Vw1cAw=="
+ 				["num_for_nothing"]="VwxcA2U="
-			}
-		},
-		["limit"]=2
-	},
-	[7]={
-		["recharge_id"]=16,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=2600,
- 				["num_for_nothing"]="VA5cAw=="
-			}
-		},
-		["limit"]=3
-	},
-	[8]={
-		["recharge_id"]=18,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=5800,
- 				["num_for_nothing"]="UwBcAw=="
-			}
-		},
-		["limit"]=3
-	},
-	[9]={
-		["recharge_id"]=19,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=12000,
- 				["num_for_nothing"]="VwpcA2U="
 			}
 		},
 		["limit"]=3
 	}
 }
 local config = {
-data=mall_treasure,count=9
+data=mall_treasure,count=6
 }
 return config

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

@@ -1,6 +1,6 @@
 local localization_global = 
 {
-    ["MAIN_BTN_1"] = "战斗",
+    ["MAIN_BTN_1"] = "商城",
     ["QLT_DESC_1"] = "普通",
     ["QLT_DESC_2"] = "优秀",
     ["QLT_DESC_3"] = "稀有",
@@ -142,7 +142,7 @@ local localization_global =
     ["DAY_X_UNLOCK"] = "第{0}天解锁",
     ["SEVEN_DAY_DESC_2"] = "已完成任务数:<color=#8DFF81>{0}</color>/{1}",
     ["FUNC_UNLOCK"] = "解锁新功能",
-    ["MAIN_BTN_3"] = "商城",
+    ["MAIN_BTN_3"] = "战斗",
     ["SHOP_DESC_1"] = "普通宝箱",
     ["SHOP_DESC_2"] = "精致宝箱",
     ["SHOP_DESC_3"] = "珍贵宝箱",

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="符文洗练{0}次"
+	},
+	[43]={
+		["desc"]="获得{0}个神话英雄"
+	},
+	[44]={
+		["desc"]="获得{0}个传说英雄"
+	},
+	[45]={
+		["desc"]="获得{0}个史诗英雄"
+	},
+	[46]={
+		["desc"]="获得{0}个稀有英雄"
+	},
+	[47]={
+		["desc"]="招聘{0}次"
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="Refine runes {0} times"
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="Forje {0} runas."
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="Refine Rune {0} kali"
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="ルーンを{0}回精製する"
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="룬을 {0}번 다듬기"
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="ล้างรูน {0} ครั้ง"
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="Forjar {0} runas."
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="Tẩy luyện Phù Văn {0} lần"
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

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

@@ -124,9 +124,24 @@ local task_type = {
 	},
 	[42]={
 		["desc"]="符文洗鍊{0}次"
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

lua/app/config/struct.lua

@@ -40,9 +40,19 @@ local struct = {
 		["parameter1"]="pos:int",
 		["parameter2"]="type:int",
 		["parameter3"]="direction:int"
+	},
+	["summon"]={
+		["parameter1"]="id:int",
+		["parameter2"]="weight:int"
+	},
+	["drop_item"]={
+		["parameter1"]="type:int",
+		["parameter2"]="id:int",
+		["parameter3"]="num:int",
+		["parameter4"]="probability:int"
 	}
 }
 local config = {
-data=struct,count=8
+data=struct,count=10
 }
 return config

lua/app/config/talent.lua

@@ -0,0 +1,130 @@
+local talent = {
+	[1]={
+		["qlt"]=1,
+		["attr"]={
+			{
+				["type"]="atk_all",
+				["num"]=500000
+			}
+		}
+	},
+	[2]={
+		["qlt"]=1,
+		["attr"]={
+			{
+				["type"]="attr_hp_all",
+				["num"]=500000
+			}
+		}
+	},
+	[3]={
+		["qlt"]=1,
+		["attr"]={
+			{
+				["type"]="attr_dmgdec_all",
+				["num"]=100000
+			}
+		}
+	},
+	[4]={
+		["qlt"]=2,
+		["attr"]={
+			{
+				["type"]="atk_all",
+				["num"]=1000000
+			}
+		}
+	},
+	[5]={
+		["qlt"]=2,
+		["attr"]={
+			{
+				["type"]="attr_hp_all",
+				["num"]=1000000
+			}
+		}
+	},
+	[6]={
+		["qlt"]=2,
+		["attr"]={
+			{
+				["type"]="attr_dmgdec_all",
+				["num"]=200000
+			}
+		}
+	},
+	[7]={
+		["qlt"]=2,
+		["attr"]={
+			{
+				["type"]="attr_crit_all",
+				["num"]=100
+			}
+		}
+	},
+	[8]={
+		["qlt"]=2,
+		["attr"]={
+			{
+				["type"]="attr_crit_time_all",
+				["num"]=100
+			}
+		}
+	},
+	[9]={
+		["qlt"]=3,
+		["value"]=1,
+		["fight"]=1000
+	},
+	[10]={
+		["qlt"]=3,
+		["value"]=50,
+		["fight"]=500
+	},
+	[11]={
+		["qlt"]=3,
+		["value"]=1,
+		["fight"]=1000
+	},
+	[12]={
+		["qlt"]=3,
+		["value"]=1000,
+		["fight"]=1000
+	},
+	[13]={
+		["qlt"]=3,
+		["attr"]={
+			{
+				["type"]="attr_normal_hurtp_all",
+				["num"]=100
+			}
+		}
+	},
+	[14]={
+		["qlt"]=3,
+		["attr"]={
+			{
+				["type"]="attr_skill_hurtp_all",
+				["num"]=100
+			}
+		}
+	},
+	[15]={
+		["qlt"]=3,
+		["attr"]={
+			{
+				["type"]="attr_atkp_all",
+				["num"]=500
+			}
+		}
+	},
+	[16]={
+		["qlt"]=3,
+		["value"]=1000,
+		["fight"]=1000
+	}
+}
+local config = {
+data=talent,count=16
+}
+return config

lua/app/config/talent.lua.meta

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

lua/app/config/task_achievement.lua.meta

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

lua/app/config/task_daily.lua

@@ -1,680 +1,46 @@
 local task_daily = {
-	[1]={
+	[101]={
-		["type"]=1,
+		["task_type"]=21,
-		["reset"]=2,
+		["number"]=1,
-		["task"]={
+		["value"]=20
-			{
+	},
-				1,
+	[102]={
-				100
+		["task_type"]=9,
-			}
+		["number"]=1,
-		}
+		["value"]=10
-	},
+	},
-	[2]={
+	[103]={
-		["type"]=1,
+		["task_type"]=15,
-		["reset"]=1,
+		["number"]=10,
-		["task"]={
+		["value"]=20
-			{
+	},
-				2,
+	[104]={
-				100
+		["task_type"]=18,
-			}
+		["number"]=5,
-		}
+		["value"]=20
-	},
+	},
-	[3]={
+	[105]={
-		["type"]=1,
+		["task_type"]=10,
-		["reset"]=1,
+		["number"]=1,
-		["task"]={
+		["value"]=10
-			{
+	},
-				4,
+	[106]={
-				100
+		["task_type"]=26,
-			},
+		["number"]=60,
-			{
+		["value"]=20
-				5,
+	},
-				100
+	[107]={
-			},
+		["task_type"]=12,
-			{
+		["number"]=5,
-				6,
+		["value"]=10
-				100
+	},
-			},
+	[108]={
-			{
+		["task_type"]=13,
-				8,
+		["number"]=20,
-				100
+		["value"]=10
-			},
-			{
-				9,
-				100
-			},
-			{
-				10,
-				100
-			}
-		},
-		["ad_task"]={
-			{
-				7,
-				100
-			},
-			{
-				11,
-				100
-			},
-			{
-				14,
-				100
-			},
-			{
-				15,
-				100
-			},
-			{
-				18,
-				100
-			},
-			{
-				19,
-				100
-			},
-			{
-				34,
-				100
-			},
-			{
-				35,
-				100
-			},
-			{
-				74,
-				100
-			},
-			{
-				75,
-				100
-			},
-			{
-				58,
-				100
-			},
-			{
-				59,
-				100
-			},
-			{
-				62,
-				100
-			},
-			{
-				63,
-				100
-			},
-			{
-				70,
-				100
-			},
-			{
-				71,
-				100
-			},
-			{
-				54,
-				100
-			},
-			{
-				55,
-				100
-			}
-		},
-		["ad_refresh"]=true
-	},
-	[4]={
-		["type"]=1,
-		["reset"]=1,
-		["task"]={
-			{
-				12,
-				100
-			},
-			{
-				13,
-				100
-			},
-			{
-				14,
-				100
-			},
-			{
-				16,
-				100
-			},
-			{
-				17,
-				100
-			},
-			{
-				18,
-				100
-			}
-		},
-		["ad_task"]={
-			{
-				6,
-				100
-			},
-			{
-				7,
-				100
-			},
-			{
-				10,
-				100
-			},
-			{
-				11,
-				100
-			},
-			{
-				15,
-				100
-			},
-			{
-				19,
-				100
-			},
-			{
-				34,
-				100
-			},
-			{
-				35,
-				100
-			},
-			{
-				74,
-				100
-			},
-			{
-				75,
-				100
-			},
-			{
-				58,
-				100
-			},
-			{
-				59,
-				100
-			},
-			{
-				62,
-				100
-			},
-			{
-				63,
-				100
-			},
-			{
-				70,
-				100
-			},
-			{
-				71,
-				100
-			},
-			{
-				54,
-				100
-			},
-			{
-				55,
-				100
-			}
-		},
-		["ad_refresh"]=true
-	},
-	[5]={
-		["type"]=1,
-		["reset"]=1,
-		["task"]={
-			{
-				32,
-				100
-			},
-			{
-				33,
-				100
-			},
-			{
-				34,
-				100
-			},
-			{
-				72,
-				100
-			},
-			{
-				73,
-				100
-			},
-			{
-				74,
-				100
-			}
-		},
-		["ad_task"]={
-			{
-				6,
-				100
-			},
-			{
-				7,
-				100
-			},
-			{
-				10,
-				100
-			},
-			{
-				11,
-				100
-			},
-			{
-				14,
-				100
-			},
-			{
-				15,
-				100
-			},
-			{
-				18,
-				100
-			},
-			{
-				19,
-				100
-			},
-			{
-				35,
-				100
-			},
-			{
-				75,
-				100
-			},
-			{
-				58,
-				100
-			},
-			{
-				59,
-				100
-			},
-			{
-				62,
-				100
-			},
-			{
-				63,
-				100
-			},
-			{
-				70,
-				100
-			},
-			{
-				71,
-				100
-			},
-			{
-				54,
-				100
-			},
-			{
-				55,
-				100
-			}
-		},
-		["ad_refresh"]=true
-	},
-	[6]={
-		["type"]=1,
-		["reset"]=1,
-		["task"]={
-			{
-				56,
-				100
-			},
-			{
-				57,
-				100
-			},
-			{
-				58,
-				100
-			},
-			{
-				60,
-				100
-			},
-			{
-				61,
-				100
-			},
-			{
-				62,
-				100
-			}
-		},
-		["ad_task"]={
-			{
-				6,
-				100
-			},
-			{
-				7,
-				100
-			},
-			{
-				10,
-				100
-			},
-			{
-				11,
-				100
-			},
-			{
-				14,
-				100
-			},
-			{
-				15,
-				100
-			},
-			{
-				18,
-				100
-			},
-			{
-				19,
-				100
-			},
-			{
-				34,
-				100
-			},
-			{
-				35,
-				100
-			},
-			{
-				74,
-				100
-			},
-			{
-				75,
-				100
-			},
-			{
-				59,
-				100
-			},
-			{
-				63,
-				100
-			},
-			{
-				70,
-				100
-			},
-			{
-				71,
-				100
-			},
-			{
-				54,
-				100
-			},
-			{
-				55,
-				100
-			}
-		},
-		["ad_refresh"]=true
-	},
-	[7]={
-		["type"]=1,
-		["reset"]=1,
-		["task"]={
-			{
-				3,
-				100
-			}
-		}
-	},
-	[8]={
-		["type"]=1,
-		["reset"]=1,
-		["task"]={
-			{
-				68,
-				100
-			},
-			{
-				69,
-				100
-			},
-			{
-				70,
-				100
-			},
-			{
-				52,
-				100
-			},
-			{
-				53,
-				100
-			},
-			{
-				54,
-				100
-			}
-		},
-		["ad_task"]={
-			{
-				6,
-				100
-			},
-			{
-				7,
-				100
-			},
-			{
-				10,
-				100
-			},
-			{
-				11,
-				100
-			},
-			{
-				14,
-				100
-			},
-			{
-				15,
-				100
-			},
-			{
-				18,
-				100
-			},
-			{
-				19,
-				100
-			},
-			{
-				34,
-				100
-			},
-			{
-				35,
-				100
-			},
-			{
-				74,
-				100
-			},
-			{
-				75,
-				100
-			},
-			{
-				58,
-				100
-			},
-			{
-				59,
-				100
-			},
-			{
-				62,
-				100
-			},
-			{
-				63,
-				100
-			},
-			{
-				71,
-				100
-			},
-			{
-				55,
-				100
-			}
-		},
-		["ad_refresh"]=true,
-		["bounty"]=true
-	},
-	[9]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				76,
-				100
-			},
-			{
-				46,
-				100
-			}
-		}
-	},
-	[10]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				39,
-				100
-			},
-			{
-				78,
-				50
-			}
-		}
-	},
-	[11]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				50,
-				100
-			},
-			{
-				91,
-				100
-			}
-		}
-	},
-	[12]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				67,
-				100
-			},
-			{
-				77,
-				50
-			}
-		}
-	},
-	[13]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				31,
-				100
-			}
-		}
-	},
-	[14]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				87,
-				100
-			},
-			{
-				42,
-				100
-			}
-		}
-	},
-	[15]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				88,
-				100
-			},
-			{
-				89,
-				50
-			},
-			{
-				34,
-				100
-			},
-			{
-				82,
-				50
-			}
-		},
-		["bounty"]=true
-	},
-	[16]={
-		["type"]=2,
-		["reset"]=1,
-		["task"]={
-			{
-				92,
-				100
-			},
-			{
-				22,
-				100
-			}
-		},
-		["bounty"]=true
 	}
 }
 local config = {
-data=task_daily,count=16
+data=task_daily,count=8
 }
 return config

lua/app/config/task_daily_challenge.lua

@@ -90,7 +90,7 @@ local task_daily_challenge = {
 	},
 	[5]={
 		["rand_type"]=2,
-		["param"]=5,
+		["param"]=3,
 		["reward"]={
 			{
 				["type"]=1,
@@ -178,7 +178,7 @@ local task_daily_challenge = {
 			44003,
 			54003
 		},
-		["param"]=2500,
+		["param"]=2000,
 		["reward"]={
 			{
 				["type"]=1,
@@ -209,7 +209,7 @@ local task_daily_challenge = {
 	},
 	[8]={
 		["rand_type"]=2,
-		["param"]=2500,
+		["param"]=2000,
 		["reward"]={
 			{
 				["type"]=1,

lua/app/config/task_daily_stage.lua

@@ -0,0 +1,111 @@
+local task_daily_stage = {
+	[101]={
+		["point"]=40,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
+	},
+	[102]={
+		["point"]=80,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=21,
+ 				["num_for_nothing"]="VAk="
+			}
+		}
+	},
+	[103]={
+		["point"]=120,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=22,
+ 				["num_for_nothing"]="VAo="
+			}
+		}
+	},
+	[104]={
+		["point"]=160,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=23,
+ 				["num_for_nothing"]="VAs="
+			}
+		}
+	},
+	[105]={
+		["point"]=200,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=600,
+ 				["num_for_nothing"]="UAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=24,
+ 				["num_for_nothing"]="VAw="
+			}
+		}
+	}
+}
+local config = {
+data=task_daily_stage,count=5
+}
+return config

lua/app/config/task_daily_stage.lua.meta

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

lua/app/config/task_type.lua

@@ -1,132 +1,147 @@
 local task_type = {
 	[1]={
-		["icon"]="10"
+
 	},
 	[2]={
-		["icon"]="1"
+
 	},
 	[3]={
-		["icon"]="2"
+
 	},
 	[4]={
-		["icon"]="1"
+
 	},
 	[5]={
-		["icon"]="2"
+
 	},
 	[6]={
-		["icon"]="3"
+
 	},
 	[7]={
-		["icon"]="4"
+
 	},
 	[8]={
-		["icon"]="5"
+
 	},
 	[9]={
-		["icon"]="7"
+
 	},
 	[10]={
-		["icon"]="7"
+
 	},
 	[11]={
-		["icon"]="7"
+
 	},
 	[12]={
-		["icon"]="9"
+
 	},
 	[13]={
-		["icon"]="9"
+
 	},
 	[14]={
-		["icon"]="8"
+
 	},
 	[15]={
-		["icon"]="8"
+
 	},
 	[16]={
-		["icon"]="8"
+
 	},
 	[17]={
-		["icon"]="8"
+
 	},
 	[18]={
-		["icon"]="8"
+
 	},
 	[19]={
-		["icon"]="20"
+
 	},
 	[20]={
-		["icon"]="1"
+
 	},
 	[21]={
-		["icon"]="10"
+
 	},
 	[22]={
-		["icon"]="11"
+
 	},
 	[23]={
-		["icon"]="6"
+
 	},
 	[24]={
-		["icon"]="20"
+
 	},
 	[25]={
-		["icon"]="6"
+
 	},
 	[26]={
-		["icon"]="11"
+
 	},
 	[27]={
-		["icon"]="7"
+
 	},
 	[28]={
-		["icon"]="21"
+
 	},
 	[29]={
-		["icon"]="4"
+
 	},
 	[30]={
-		["icon"]="13"
+
 	},
 	[31]={
 
 	},
 	[32]={
-		["icon"]="16"
+
 	},
 	[33]={
-		["icon"]="17"
+
 	},
 	[34]={
-		["icon"]="18"
+
 	},
 	[35]={
-		["icon"]="19"
+
 	},
 	[36]={
-		["icon"]="20"
+
 	},
 	[37]={
-		["icon"]="21"
+
 	},
 	[38]={
-		["icon"]="22"
+
 	},
 	[39]={
-		["icon"]="23"
+
 	},
 	[40]={
-		["icon"]="25"
+
 	},
 	[41]={
-		["icon"]="24"
+
 	},
 	[42]={
-		["icon"]="26"
+
+	},
+	[43]={
+
+	},
+	[44]={
+
+	},
+	[45]={
+
+	},
+	[46]={
+
+	},
+	[47]={
+
 	}
 }
 local config = {
-data=task_type,count=42
+data=task_type,count=47
 }
 return config

lua/app/global/global_func.lua

@@ -610,7 +610,10 @@ end
 
 function GFunc.getConstReward(key)
 	local ConstCfg = ConfigManager:getConfig("const")
-	return ConstCfg[key] and ConstCfg[key].reward
+	if not ConstCfg[key] or not ConstCfg[key].reward then
+		return
+	end
+	return ConstCfg[key].reward[1]
 end
 
 function GFunc.getTargetAnchoredPosition(targetGo, parent)

lua/app/module/maincity/maincity_const.lua

@@ -3,9 +3,11 @@ local MainCityConst = {}
 MainCityConst.SIDE_BAR_MIN_COUNT = 3
 
 MainCityConst.BOTTOM_PAGE = {
-	MAIN = 1,
+	SHOP = 1,
 	HERO = 2,
-	SHOP = 3,
+	MAIN = 3,
+	DUNGEON = 4,
+	MAIN_5 = 5,
 }
 
 MainCityConst.BOTTOM_ICON = {

lua/app/ui/main_city/component/main_comp.lua

@@ -9,7 +9,6 @@ local BOTTOM_HEIGHT = 120
 function MainComp:init()
 	self.uiMap = self:getBaseObject():genAllChildren()
 
-	self:initStageFormation()
 	self:refreshModule(ModuleManager.MaincityManager:getCurModule())
 end
 
@@ -79,7 +78,6 @@ function MainComp:refreshModule(selectModule)
 			-- 切换到竞技场
 			ModuleManager.ArenaManager:reqArenaInfo()
 		end
-		self:refreshHeroFormationVisible()
 		EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_COMP_MODULE, self.curModuleType)
 	end
 
@@ -184,7 +182,7 @@ function MainComp:refreshFightBtn()
 	if isShowFight then
 		self.fightBtn:setActive(true)
 		self.fightBtn:addClickListener(moduleCell.onClickFight)
-		self.fightBtn:setAnchoredPositionY(self.btnPosY)
+		-- self.fightBtn:setAnchoredPositionY(self.btnPosY)
 	else
 		self.fightBtn:setActive(false)
 	end
@@ -192,7 +190,6 @@ end
 
 -- 刷新左侧活动模块入口
 function MainComp:refreshLeftBtn()
-
 	local showCount = 0
 	local leftIdxList = self:getCurLeftModuleIdxList()
 	for module, entrance in pairs(self.leftEntrance) do
@@ -207,12 +204,12 @@ function MainComp:refreshLeftBtn()
 	end
 
 	if showCount >= 2 then
-		self.uiMap["main_comp.left"]:setAnchoredPositionY(self.btnPosY - 20)
+		-- self.uiMap["main_comp.left"]:setAnchoredPositionY(self.btnPosY - 20)
 		table.foreach(self.leftEntrance, function(idx, entrance)
 			entrance:setLocalScale(0.8,0.8)
 		end)
 	else
-		self.uiMap["main_comp.left"]:setAnchoredPositionY(self.btnPosY)
+		-- self.uiMap["main_comp.left"]:setAnchoredPositionY(self.btnPosY)
 		table.foreach(self.leftEntrance, function(idx, entrance)
 			entrance:setLocalScale(1,1)
 		end)
@@ -221,7 +218,6 @@ end
 
 -- 刷新右侧活动模块入口
 function MainComp:refreshRightBtn()
-
 	local showCount = 0
 	local rightIdxList = self:getCurRightModuleIdxList()
 	for module, entrance in pairs(self.rightEntrance) do
@@ -236,12 +232,12 @@ function MainComp:refreshRightBtn()
 	end
 
 	if showCount >= 2 then
-		self.uiMap["main_comp.right"]:setAnchoredPositionY(self.btnPosY - 20)
+		-- self.uiMap["main_comp.right"]:setAnchoredPositionY(self.btnPosY - 20)
 		table.foreach(self.rightEntrance, function(idx, entrance)
 			entrance:setLocalScale(0.8,0.8)
 		end)
 	else
-		self.uiMap["main_comp.right"]:setAnchoredPositionY(self.btnPosY)
+		-- self.uiMap["main_comp.right"]:setAnchoredPositionY(self.btnPosY)
 		table.foreach(self.rightEntrance, function(idx, entrance)
 			entrance:setLocalScale(1,1)
 		end)
@@ -330,21 +326,7 @@ function MainComp:getCurRightModuleIdxList()
 	return rightIdx
 end
 
-function MainComp:initStageFormation()
-	self.heroCells = self.uiMap["main_comp.hero_formation_comp"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_FORMATION_COMP)
-
-	local heroBgPosY = self.heroCells:getFormationPosY()
-	local sWidth, sHeight = GFunc.getUIExpandScreenSize()
-	local hSHeight = sHeight / 2
-	self.btnPosY = (heroBgPosY + (BOTTOM_HEIGHT / 2 - hSHeight)) / 2
-end
-
-function MainComp:refreshHeroFormationVisible()
-	self.heroCells:setFormationActive(self.moduleMap[self.curModuleType]:isShowHeroFormation())
-end
-
 function MainComp:refresh()
-	self:refreshStageFormaion()
 	self:refreshChallenge()
 	self:refreshDungeon()
 	self:refreshArena()
@@ -385,11 +367,6 @@ function MainComp:refreshArena()
 	self.arenaComp:refreshShow()
 end
 
-function MainComp:refreshStageFormaion()
-	self.heroCells:refresh()
-	self:refreshHeroFormationVisible()
-end
-
 function MainComp:getDailyChallengeIconPos()
 	local idx = table.indexof(self:getCurLeftModuleIdxList(), GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE)
 	if idx and self.leftEntrance[idx] then

lua/app/ui/main_city/main_city_ui.lua

@@ -214,10 +214,6 @@ function MainCityUI:_bind()
             if self.subComps[self.selectedIndex] then
                 self.subComps[self.selectedIndex]:refresh(GConst.BattleConst.BATTLE_TYPE.STAGE)
             end
-        elseif self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then
-            if self.subComps[self.selectedIndex] then
-                self.subComps[self.selectedIndex]:refreshStageFormaion()
-            end
         end
         self:refreshBottomRp()
     end)
@@ -229,7 +225,6 @@ function MainCityUI:_bind()
     self:bind(DataManager.BagData.ItemData, "dirty", function(binder, value)
         if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN and self.subComps[self.selectedIndex] then
             if self.subComps[self.selectedIndex] then
-                self.subComps[self.selectedIndex]:refreshStageFormaion()
                 self.subComps[self.selectedIndex]:refreshBtns()
             end
         end
@@ -299,10 +294,10 @@ function MainCityUI:initBottomUI()
     local uiMap = self.root:genAllChildren()
     self.bottomBtnCells = {}
     self.bottomBtnSpines = {}
-    for i = 1, 3 do
+    for i = 1, 5 do
         local cellCom = CellManager:addCellComp(uiMap["main_ui.bottom_node.bottom_btn_cell_" .. i], BOTTOM_BTN_CELL)
         cellCom:addClickListener(function()
-            if i == 3 then -- 商城有开启条件
+            if i == 1 then -- 商城有开启条件
                 if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then
                     return
                 end

lua/app/userdata/arena/arena_data.lua

@@ -15,10 +15,8 @@ end
 function ArenaData:init(data)
     data = data or GConst.EMPTY_TABLE
 
-    -- self.season = data.season_number
+    self.season = data.season_number
-    -- self.score = data.current_score
+    self.score = data.current_score
-    self.season = 1
-    self.score = 1000
     self.lastScore = data.last_score
     self.lastChallengeCount = data.last_challenge_count-- 上赛季挑战次数
     self.seasonRewardGot = data.settle_reward_season-- 最近领取过奖励的赛季