config

lua/app/common/data_manager.lua

@@ -145,7 +145,7 @@ function DataManager:initWithServerData(data)
 	self.CollectionData:init(data.collection)
 	self.TutorialData:init(data.guide)
 	self.MailData:init(data.mail_info)
-	self.BountyData:init(data.bounty)
+	-- self.BountyData:init(data.bounty)
 	self.ArenaBountyData:init(data.arena_bounty)
 	self.ArenaData:initGiftInfo(data.act_arena_gift, true)
 	-- 任务要在BountyData之后初始化，依赖BountyData的数据

lua/app/config/act_exchange.lua

@@ -4,8 +4,8 @@ local act_exchange = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=1,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
@@ -17,62 +17,62 @@ local act_exchange = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=805001,
+			["id"]=1,
- 			["id_for_nothing"]="XghZA2VQ",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
 			["num"]=20,
  			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=3,
 		["limit"]=1,
-		["func_open"]="defenseline"
+		["func_open"]="daily_challenge"
 	},
 	[10103]={
 		["sort"]=6,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=805002,
+			["id"]=1,
- 			["id_for_nothing"]="XghZA2VT",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
 			["num"]=20,
  			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=3,
 		["limit"]=1,
-		["func_open"]="defenseline"
+		["func_open"]="daily_challenge"
 	},
 	[10104]={
 		["sort"]=7,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=904001,
+			["id"]=1,
- 			["id_for_nothing"]="XwhYA2VQ",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=15,
+			["num"]=20,
- 			["num_for_nothing"]="Vw0="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=3,
 		["limit"]=1
@@ -82,18 +82,18 @@ local act_exchange = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=904002,
+			["id"]=1,
- 			["id_for_nothing"]="XwhYA2VT",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=15,
+			["num"]=20,
- 			["num_for_nothing"]="Vw0="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=3,
 		["limit"]=1
@@ -103,146 +103,146 @@ local act_exchange = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=235,
+			["id"]=1,
- 			["id_for_nothing"]="VAtZ",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=15,
+			["num"]=20,
- 			["num_for_nothing"]="Vw0="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=2,
 		["limit"]=8,
-		["func_open"]="defenseline"
+		["func_open"]="daily_challenge"
 	},
 	[10107]={
 		["sort"]=11,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=237,
+			["id"]=1,
- 			["id_for_nothing"]="VAtb",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=10,
+			["num"]=20,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=2,
 		["limit"]=8
 	},
 	[10108]={
-		["sort"]=12,
+		["sort"]=14,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=5,
+			["id"]=1,
- 			["id_for_nothing"]="Uw==",
+ 			["id_for_nothing"]="Vw==",
-			["num"]=10,
+			["num"]=1,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=2,
+			["num"]=20,
- 			["num_for_nothing"]="VA=="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=2,
 		["limit"]=50
 	},
 	[10109]={
-		["sort"]=13,
+		["sort"]=15,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=68,
+			["id"]=1,
- 			["id_for_nothing"]="UAA=",
+ 			["id_for_nothing"]="Vw==",
-			["num"]=10,
+			["num"]=1,
- 			["num_for_nothing"]="Vwg="
+ 			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=3,
+			["num"]=20,
- 			["num_for_nothing"]="VQ=="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=2,
 		["limit"]=50,
-		["func_open"]="core_soul"
+		["func_open"]="arena_open"
 	},
 	[10110]={
 		["sort"]=2,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=905001,
+			["id"]=1,
- 			["id_for_nothing"]="XwhZA2VQ",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=30,
+			["num"]=20,
- 			["num_for_nothing"]="VQg="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=3,
 		["limit"]=1,
-		["force_id"]=4003
+		["force_id"]=15001
 	},
 	[10111]={
 		["sort"]=3,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=905002,
+			["id"]=1,
- 			["id_for_nothing"]="XwhZA2VT",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
-			["num"]=30,
+			["num"]=20,
- 			["num_for_nothing"]="VQg="
+ 			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=3,
 		["limit"]=1,
-		["force_id"]=4004
+		["force_id"]=25001
 	},
 	[10112]={
 		["sort"]=10,
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=238,
+			["id"]=1,
- 			["id_for_nothing"]="VAtU",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
 			["num"]=20,
  			["num_for_nothing"]="VAg="
 		},
@@ -254,25 +254,69 @@ local act_exchange = {
 		["reward"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=805003,
+			["id"]=1,
- 			["id_for_nothing"]="XghZA2VS",
+ 			["id_for_nothing"]="Vw==",
 			["num"]=1,
  			["num_for_nothing"]="Vw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
-			["id"]=209,
+			["id"]=2,
- 			["id_for_nothing"]="VAhV",
+ 			["id_for_nothing"]="VA==",
 			["num"]=20,
  			["num_for_nothing"]="VAg="
 		},
 		["refresh_type"]=3,
 		["limit"]=1,
-		["func_open"]="defenseline"
+		["func_open"]="daily_challenge"
+	},
+	[10114]={
+		["sort"]=12,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=20,
+		["func_open"]="talent_open"
+	},
+	[10115]={
+		["sort"]=13,
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=1,
+ 			["id_for_nothing"]="Vw==",
+			["num"]=1,
+ 			["num_for_nothing"]="Vw=="
+		},
+		["cost"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		},
+		["refresh_type"]=2,
+		["limit"]=50,
+		["func_open"]="talent_open"
 	}
 }
 local config = {
-data=act_exchange,count=13
+data=act_exchange,count=15
 }
 return config

lua/app/config/activity.lua

@@ -1,279 +1,27 @@
 local activity = {
-	[11101]={
-		["act_type"]=1,
-		["parameter"]={
-			4003,
-			4004
-		},
-		["time_type"]=1,
-		["start_time_1"]=8,
-		["end_time_1"]=22,
-		["version"]=2,
-		["act_gift"]={
-			110102,
-			110202,
-			110302,
-			110402,
-			110502,
-			110602,
-			110702,
-			1108302
-		},
-		["act_name"]="ACT_HERO_SUIT_DESC_1",
-		["act_banner_bg"]=11101
-	},
-	[11201]={
-		["act_type"]=1,
-		["parameter"]={
-			4001,
-			4002
-		},
-		["time_type"]=1,
-		["start_time_1"]=22,
-		["end_time_1"]=36,
-		["version"]=2,
-		["act_gift"]={
-			114302,
-			114402,
-			114502,
-			114602,
-			114702,
-			114802,
-			114902,
-			1108402
-		},
-		["act_name"]="ACT_HERO_SUIT_DESC_11",
-		["act_banner_bg"]=11201
-	},
-	[12301]={
-		["act_type"]=1,
-		["parameter"]={
-			4005,
-			4006
-		},
-		["time_type"]=1,
-		["start_time_1"]=36,
-		["end_time_1"]=50,
-		["version"]=2,
-		["act_gift"]={
-			1104102,
-			1104202,
-			1104302,
-			1104402,
-			1104502,
-			1104602,
-			1104702,
-			1108502
-		},
-		["act_name"]="ACT_HERO_SUIT_DESC_17",
-		["act_banner_bg"]=12301
-	},
-	[11301]={
-		["act_type"]=2,
-		["time_type"]=1,
-		["start_time_1"]=1,
-		["end_time_1"]=8,
-		["func_open"]="summon_force",
-		["version"]=1,
-		["act_gift"]={
-			118502,
-			118602,
-			118702,
-			118802,
-			118902,
-			119002,
-			119102,
-			119202,
-			119302
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=231,
- 				["id_for_nothing"]="VAtd",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=37,
- 				["id_for_nothing"]="VQ8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_21"
-	},
-	[11401]={
-		["act_type"]=3,
-		["time_type"]=1,
-		["start_time_1"]=8,
-		["end_time_1"]=15,
-		["func_open"]="core_box",
-		["version"]=1,
-		["act_gift"]={
-			119402,
-			119502,
-			119602,
-			119702,
-			119802,
-			119902,
-			120002,
-			120102,
-			120202
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=228,
- 				["id_for_nothing"]="VApU",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=68,
- 				["id_for_nothing"]="UAA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=222,
- 				["id_for_nothing"]="VApe",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_22"
-	},
-	[11501]={
-		["act_type"]=4,
-		["time_type"]=1,
-		["start_time_1"]=15,
-		["end_time_1"]=22,
-		["func_open"]="summon_force",
-		["version"]=1,
-		["act_gift"]={
-			1100102,
-			1100202,
-			1100302,
-			1100402,
-			1100502,
-			1100602,
-			1100702,
-			1100802,
-			1100902
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=231,
- 				["id_for_nothing"]="VAtd",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=37,
- 				["id_for_nothing"]="VQ8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_21"
-	},
-	[11601]={
-		["act_type"]=5,
-		["time_type"]=1,
-		["start_time_1"]=22,
-		["end_time_1"]=29,
-		["func_open"]="core_box",
-		["version"]=1,
-		["act_gift"]={
-			1101002,
-			1101102,
-			1101202,
-			1101302,
-			1101402,
-			1101502,
-			1101602,
-			1101702,
-			1101802
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=228,
- 				["id_for_nothing"]="VApU",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=68,
- 				["id_for_nothing"]="UAA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=222,
- 				["id_for_nothing"]="VApe",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_22"
-	},
 	[11701]={
 		["act_type"]=2,
 		["time_type"]=1,
 		["start_time_1"]=1,
 		["end_time_1"]=8,
-		["func_open"]="activity_open",
+		["func_open"]="summon_open",
-		["version"]=3,
+		["version"]=1,
 		["act_gift"]={
-			1104802,
+			1060000001,
-			1104902,
+			1062000001,
-			1105002,
+			1062000101,
-			1105102,
+			1062000201,
-			1105202,
+			1062000301,
-			1105302,
+			1063000001,
-			1105402
+			1063000101,
+			1064000001
 		},
 		["show_reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=231,
+				["id"]=2,
- 				["id_for_nothing"]="VAtd",
+ 				["id_for_nothing"]="VA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -288,421 +36,16 @@ local activity = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=209,
+				["id"]=6,
- 				["id_for_nothing"]="VAhV",
+ 				["id_for_nothing"]="UA==",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			}
 		},
 		["act_name"]="ACT_GOGOGO_DESC_21"
-	},
-	[11801]={
-		["act_type"]=3,
-		["time_type"]=1,
-		["start_time_1"]=8,
-		["end_time_1"]=15,
-		["func_open"]="core_box",
-		["version"]=3,
-		["act_gift"]={
-			1105502,
-			1105602,
-			1105702,
-			1105802,
-			1105902,
-			1106002,
-			1106102
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=228,
- 				["id_for_nothing"]="VApU",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=68,
- 				["id_for_nothing"]="UAA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=209,
- 				["id_for_nothing"]="VAhV",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_22"
-	},
-	[11901]={
-		["act_type"]=4,
-		["time_type"]=1,
-		["start_time_1"]=15,
-		["circle"]={
-			7,
-			14
-		},
-		["func_open"]="summon_force",
-		["version"]=3,
-		["act_gift"]={
-			1106202,
-			1106302,
-			1106402,
-			1106502,
-			1106602,
-			1106702,
-			1106802
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=231,
- 				["id_for_nothing"]="VAtd",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=209,
- 				["id_for_nothing"]="VAhV",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_21"
-	},
-	[12001]={
-		["act_type"]=5,
-		["time_type"]=1,
-		["start_time_1"]=22,
-		["circle"]={
-			7,
-			14
-		},
-		["func_open"]="core_box",
-		["version"]=3,
-		["act_gift"]={
-			1106902,
-			1107002,
-			1107102,
-			1107202,
-			1107302,
-			1107402,
-			1107502
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=228,
- 				["id_for_nothing"]="VApU",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=68,
- 				["id_for_nothing"]="UAA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=209,
- 				["id_for_nothing"]="VAhV",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_22"
-	},
-	[12101]={
-		["act_type"]=6,
-		["time_type"]=1,
-		["start_time_1"]=29,
-		["circle"]={
-			7,
-			14
-		},
-		["version"]=3,
-		["act_gift"]={
-			1107602,
-			1107702,
-			1107802,
-			1107902,
-			1108002,
-			1108102,
-			1108202
-		},
-		["show_reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=19,
- 				["id_for_nothing"]="VwE=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=28,
- 				["id_for_nothing"]="VAA=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=209,
- 				["id_for_nothing"]="VAhV",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			}
-		},
-		["act_name"]="ACT_GOGOGO_DESC_23"
-	},
-	[12201]={
-		["act_type"]=8,
-		["parameter"]={
-			11901
-		},
-		["time_type"]=1,
-		["start_time_1"]=15,
-		["circle"]={
-			14,
-			7
-		},
-		["version"]=3,
-		["act_gift"]={
-			1500102,
-			1500202,
-			1500302,
-			1500402,
-			1500502,
-			1500602,
-			1500702,
-			1500802,
-			1500902,
-			1501002,
-			1501102,
-			1501202,
-			1501302,
-			1501402,
-			1501502,
-			1501602,
-			1501702,
-			1501802,
-			1501902,
-			1502002,
-			1502102,
-			1502202,
-			1502302,
-			1502402,
-			1502502,
-			1502602,
-			1502702,
-			1502802
-		}
-	},
-	[12401]={
-		["act_type"]=9,
-		["parameter"]={
-			12001
-		},
-		["time_type"]=1,
-		["start_time_1"]=22,
-		["circle"]={
-			14,
-			7
-		},
-		["version"]=3,
-		["act_gift"]={
-			1502902,
-			1503002,
-			1503102,
-			1503202,
-			1503302,
-			1503402,
-			1503502,
-			1503602,
-			1503702,
-			1503802,
-			1503902,
-			1504002,
-			1504102,
-			1504202,
-			1504302,
-			1504402,
-			1504502,
-			1504602,
-			1504702,
-			1504802,
-			1504902,
-			1505002,
-			1505102,
-			1505202,
-			1505302,
-			1505402,
-			1505502,
-			1505602
-		}
-	},
-	[12501]={
-		["act_type"]=7,
-		["parameter"]={
-			12101
-		},
-		["time_type"]=1,
-		["start_time_1"]=29,
-		["circle"]={
-			14,
-			7
-		},
-		["version"]=3,
-		["act_gift"]={
-			1505702,
-			1505802,
-			1505902,
-			1506002,
-			1506102,
-			1506202,
-			1506302,
-			1506402,
-			1506502,
-			1506602,
-			1506702,
-			1506802,
-			1506902,
-			1507002,
-			1507102,
-			1507202,
-			1507302,
-			1507402,
-			1507502,
-			1507602,
-			1507702,
-			1507802,
-			1507902,
-			1508002,
-			1508102,
-			1508202,
-			1508302,
-			1508402
-		}
-	},
-	[12601]={
-		["act_type"]=1,
-		["parameter"]={
-			4003,
-			4004
-		},
-		["time_type"]=1,
-		["start_time_1"]=8,
-		["end_time_1"]=22,
-		["version"]=3,
-		["act_gift"]={
-			1108602,
-			1108702,
-			1108802,
-			1108902,
-			1109002,
-			1109102,
-			1109202,
-			1109302
-		},
-		["act_name"]="ACT_HERO_SUIT_DESC_1",
-		["act_banner_bg"]=11101
-	},
-	[12701]={
-		["act_type"]=1,
-		["parameter"]={
-			4001,
-			4002
-		},
-		["time_type"]=1,
-		["start_time_1"]=22,
-		["end_time_1"]=36,
-		["version"]=3,
-		["act_gift"]={
-			1111402,
-			1111502,
-			1111602,
-			1111702,
-			1111802,
-			1111902,
-			1112002,
-			1112102
-		},
-		["act_name"]="ACT_HERO_SUIT_DESC_11",
-		["act_banner_bg"]=11201
-	},
-	[12801]={
-		["act_type"]=1,
-		["parameter"]={
-			4005,
-			4006
-		},
-		["time_type"]=1,
-		["start_time_1"]=36,
-		["end_time_1"]=50,
-		["version"]=3,
-		["act_gift"]={
-			1116202,
-			1116302,
-			1116402,
-			1116502,
-			1116602,
-			1116702,
-			1116802,
-			1116902
-		},
-		["act_name"]="ACT_HERO_SUIT_DESC_17",
-		["act_banner_bg"]=12301
-	},
-	[12901]={
-		["act_type"]=1,
-		["parameter"]={
-			4007,
-			4008
-		},
-		["time_type"]=1,
-		["start_time_1"]=50,
-		["end_time_1"]=64,
-		["version"]=3,
-		["act_gift"]={
-			1119002,
-			1119102,
-			1119202,
-			1119302,
-			1119402,
-			1119502,
-			1119602,
-			1119702
-		},
-		["act_name"]="ACT_HERO_SUIT_DESC_18",
-		["act_banner_bg"]=12901
 	}
 }
 local config = {
-data=activity,count=19
+data=activity,count=1
 }
 return config

lua/app/config/buff.lua

@@ -983,7 +983,8 @@ local buff = {
 		["name"]="forever_uncontrolled",
 		["buff_type"]=7,
 		["decr"]=1,
-		["icon"]="immune"
+		["icon"]="immune",
+		["show_name"]=true
 	}
 }
 local keys = {

lua/app/config/chapter_board.lua

@@ -10965,15 +10965,15 @@ local chapter_board = {
 				0
 			},
 			{
-				13,
+				0,
 				5
 			},
 			{
-				13,
+				0,
 				1
 			},
 			{
-				13,
+				0,
 				2
 			},
 			{

lua/app/config/const.lua

@@ -32,69 +32,6 @@ local const = {
 	["crit_dmg"]={
 		["value"]=15000
 	},
-	["act_gold_pig_cd"]={
-		["value"]=12
-	},
-	["act_gold_pig_buy_cd"]={
-		["value"]=1
-	},
-	["act_gold_pig_first_id"]={
-		["value"]=201
-	},
-	["act_gold_pig_full_cd"]={
-		["value"]=12
-	},
-	["summon_core_adtimes_1"]={
-		["value"]=3.0
-	},
-	["mall_daily_free_refresh"]={
-		["value"]=1.0
-	},
-	["mall_daily_ad_refresh"]={
-		["value"]=2.0
-	},
-	["mall_daily_refresh"]={
-		["value"]=2.0
-	},
-	["mall_daily_refresh_cost"]={
-		["cost"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=1000,
- 				["num_for_nothing"]="VwhcAw=="
-			}
-		}
-	},
-	["bounty_buy_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			}
-		}
-	},
-	["bounty_chapter_exp"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=1,
- 				["id_for_nothing"]="Vw==",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			}
-		}
-	},
-	["bounty_senior_rise"]={
-		["value"]=10
-	},
 	["idle_maxtime"]={
 		["value"]=57600
 	},
@@ -146,21 +83,6 @@ local const = {
 	["diamond_refresh_skill"]={
 		["value"]=1
 	},
-	["mall_daily_diamond_refresh"]={
-		["value"]=2
-	},
-	["mall_daily_diamond_refresh_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
-			}
-		}
-	},
 	["summn_first"]={
 		["value"]=52001
 	},
@@ -179,54 +101,9 @@ local const = {
 	["daily_challenge_limit"]={
 		["value"]=2
 	},
-	["act_gift_downshift_time"]={
-		["value"]=72
-	},
-	["act_gift_downshift_number"]={
-		["value"]=15
-	},
-	["act_sevenday_time"]={
-		["value"]=7
-	},
 	["model_daily_challenge"]={
 		["value"]=8000
 	},
-	["level_fund_hero_1"]={
-		["value"]=24001
-	},
-	["level_fund_hero_2"]={
-		["value"]=54001
-	},
-	["dungeon_gold_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		}
-	},
-	["dungeon_gold_limit"]={
-		["value"]=2
-	},
-	["dungeon_shards_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		}
-	},
-	["dungeon_shards_limit"]={
-		["value"]=2
-	},
 	["change_name_cost"]={
 		["reward"]={
 			{
@@ -353,242 +230,6 @@ local const = {
 	["arena_lose_adbox_limit"]={
 		["value"]=2
 	},
-	["dungeon_equip_limit"]={
-		["value"]=8
-	},
-	["dungeon_armor_limit"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	["dungeon_equip_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=3,
- 				["id_for_nothing"]="VQ==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	["activity_bounty_day"]={
-		["value"]=6
-	},
-	["activity_bounty_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
-			}
-		}
-	},
-	["bounty_click"]={
-		["value"]=4
-	},
-	["activity_boss_rush_time"]={
-		["value"]=1
-	},
-	["activity_boss_rush_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	["activity_boss_rush_costadd"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	["activity_boss_rush_hp_add_1"]={
-		["value"]=1750
-	},
-	["activity_boss_rush_atk_add_1"]={
-		["value"]=1370
-	},
-	["activity_boss_rush_hp_add_2"]={
-		["value"]=2700
-	},
-	["activity_boss_rush_atk_add_2"]={
-		["value"]=2200
-	},
-	["activity_boss_rush_hp_add_3"]={
-		["value"]=4100
-	},
-	["activity_boss_rush_atk_add_3"]={
-		["value"]=3500
-	},
-	["activity_recurring_day"]={
-		["value"]=5
-	},
-	["runes_cost_base"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	["runes_cost_add"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
-			}
-		}
-	},
-	["runes_red_point"]={
-		["value"]=1000
-	},
-	["dungeon_rune_lvlimit"]={
-		["value"]=20
-	},
-	["dungeon_rune_revival"]={
-		["value"]=5
-	},
-	["dungeon_rune_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=200,
- 				["num_for_nothing"]="VAhc"
-			}
-		}
-	},
-	["act_gogogo_round_limit_5"]={
-		["value"]=5.0
-	},
-	["act_gogogo_round_reward_5"]={
-		["cost"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=231,
- 				["id_for_nothing"]="VAtd",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=37,
- 				["id_for_nothing"]="VQ8=",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
-			}
-		}
-	},
-	["act_bounty_buy_cost"]={
-		["cost"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
-			}
-		}
-	},
-	["dungeon_rune_buylimit"]={
-		["value"]=5
-	},
-	["act_sevenday_duration"]={
-		["value"]=14.0
-	},
-	["activity_pvp_time"]={
-		["value"]=1
-	},
-	["activity_pvp_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	["activity_pvp_costadd"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
-			}
-		}
-	},
-	["activity_pvp_win_times"]={
-		["value"]=10
-	},
-	["activity_pvp_lose_times"]={
-		["value"]=2
-	},
-	["activity_pvp_bounty_point"]={
-		["value"]=10
-	},
-	["activity_pvp_refresh_ad_times"]={
-		["value"]=1
-	},
-	["activity_pvp_refresh_cost"]={
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=2,
- 				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
-			}
-		}
-	},
-	["act_tourn_rank_free"]={
-		["value"]=90
-	},
-	["act_tourn_rank_pay"]={
-		["value"]=10
-	},
 	["stamina_diamond_buy"]={
 		["reward"]={
 			{
@@ -643,17 +284,135 @@ local const = {
 	["dungeon_gold_times"]={
 		["value"]=2
 	},
-	["bounty_duration"]={
-		["value"]=30.0
-	},
-	["bounty_point"]={
-		["value"]=1.0
-	},
 	["dungeon_res_times"]={
 		["value"]=2
+	},
+	["card_monthly_dailyreward"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=4,
+ 				["id_for_nothing"]="Ug==",
+				["num"]=20,
+ 				["num_for_nothing"]="VAg="
+			}
+		}
+	},
+	["card_monthly_days"]={
+		["value"]=30
+	},
+	["card_monthly_refresh"]={
+		["value"]=1
+	},
+	["card_free_dailyreward"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=30,
+ 				["num_for_nothing"]="VQg="
+			}
+		}
+	},
+	["mall_daily_free_refresh"]={
+		["value"]=1
+	},
+	["mall_daily_ad_refresh"]={
+		["value"]=2
+	},
+	["mall_daily_refresh"]={
+		["value"]=2
+	},
+	["mall_daily_refresh_cost"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		}
+	},
+	["dungeon_ticket_1"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=44,
+ 				["id_for_nothing"]="Ugw=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	["dungeon_ticket_2"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=45,
+ 				["id_for_nothing"]="Ug0=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			}
+		}
+	},
+	["act_bounty_buy_unlock"]={
+		["value"]=2
+	},
+	["act_bounty_buy_cost"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			}
+		}
+	},
+	["act_sevenday_duration"]={
+		["value"]=14
+	},
+	["act_gogogo_round_reward_1"]={
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=50,
+ 				["num_for_nothing"]="Uwg="
+			}
+		}
+	},
+	["act_gogogo_round_limit_1"]={
+		["value"]=5
 	}
 }
 local config = {
-data=const,count=109
+data=const,count=72
 }
 return config

lua/app/config/func_open.lua

@@ -1,32 +1,8 @@
 local func_open = {
-	["act_gold_pig"]={
-		["stage"]=3,
-		["pop_ups"]=1
-	},
-	["bounty_open"]={
-		["stage"]=3,
-		["pop_ups"]=1
-	},
-	["bounty"]={
-		["stage"]=3,
-		["pop_ups"]=1
-	},
-	["signin_bounty"]={
-		["stage"]=3,
-		["pop_ups"]=1
-	},
 	["task"]={
 		["stage"]=3,
 		["icon"]="module_unlock_task"
 	},
-	["act_level_gift"]={
-		["level"]=1,
-		["icon"]="module_unlock_fund"
-	},
-	["fund_chapter"]={
-		["level"]=1,
-		["icon"]="module_unlock_fund"
-	},
 	["idle_drop"]={
 		["stage"]=2,
 		["icon"]="module_unlock_idle"
@@ -36,12 +12,8 @@ local func_open = {
 		["pop_ups"]=1
 	},
 	["mall_daily"]={
-		["stage"]=1,
-		["icon"]="module_unlock_dailyshop"
-	},
-	["store_box_open"]={
 		["stage"]=2,
-		["pop_ups"]=1
+		["icon"]="module_unlock_dailyshop"
 	},
 	["store_box_3_open"]={
 		["stage"]=5,
@@ -51,30 +23,10 @@ local func_open = {
 		["stage"]=11,
 		["icon"]="module_unlock_dailychallenge"
 	},
-	["act_gift_show_open"]={
-		["stage"]=2,
-		["pop_ups"]=1
-	},
-	["first_charge"]={
-		["stage"]=2,
-		["pop_ups"]=1
-	},
-	["new_player_gift"]={
-		["stage"]=2,
-		["pop_ups"]=1
-	},
 	["mail_open"]={
 		["stage"]=2,
 		["pop_ups"]=1
 	},
-	["dungeon_gold_open"]={
-		["stage"]=6,
-		["pop_ups"]=1
-	},
-	["dungeon_shards_open"]={
-		["stage"]=6,
-		["pop_ups"]=1
-	},
 	["arena_open"]={
 		["stage"]=15,
 		["icon"]="module_unlock_arena"
@@ -83,49 +35,6 @@ local func_open = {
 		["stage"]=15,
 		["pop_ups"]=1
 	},
-	["equip_weapon_open"]={
-		["stage"]=999,
-		["icon"]="module_unlock_weapon"
-	},
-	["equip_armor_open"]={
-		["stage"]=999,
-		["icon"]="module_unlock_equip"
-	},
-	["collection_open"]={
-		["stage"]=5,
-		["pop_ups"]=1
-	},
-	["dungeon_weapon_open"]={
-		["stage"]=8,
-		["pop_ups"]=1
-	},
-	["act_sevenday"]={
-		["stage"]=2
-	},
-	["act_sevenday_2"]={
-		["stage"]=2,
-		["time"]=8
-	},
-	["dungeon_armor_open"]={
-		["stage"]=10,
-		["pop_ups"]=1
-	},
-	["skin_open"]={
-		["stage"]=4,
-		["pop_ups"]=1
-	},
-	["activity_open"]={
-		["stage"]=4,
-		["pop_ups"]=1
-	},
-	["runes_open"]={
-		["stage"]=12,
-		["pop_ups"]=1
-	},
-	["hero_equip"]={
-		["stage"]=4,
-		["icon"]="module_unlock_arena"
-	},
 	["company_open"]={
 		["stage"]=2,
 		["pop_ups"]=1
@@ -141,9 +50,57 @@ local func_open = {
 	["summon_open"]={
 		["stage"]=1,
 		["pop_ups"]=1
+	},
+	["first_charge_1"]={
+		["stage"]=1
+	},
+	["first_charge_2"]={
+		["stage"]=1,
+		["time"]=2
+	},
+	["first_charge_3"]={
+		["stage"]=18,
+		["time"]=3
+	},
+	["card_ad"]={
+		["stage"]=2
+	},
+	["card_monthly"]={
+		["level"]=4
+	},
+	["act_sevenday"]={
+		["stage"]=2
+	},
+	["dungeon_gold"]={
+		["stage"]=6,
+		["pop_ups"]=1,
+		["icon"]="module_5"
+	},
+	["dungeon_res"]={
+		["stage"]=6
+	},
+	["signin_bounty"]={
+		["stage"]=8
+	},
+	["signin_30"]={
+		["stage"]=3
+	},
+	["act_gogogo"]={
+		["stage"]=2
+	},
+	["hero_equip"]={
+		["stage"]=13,
+		["pop_ups"]=1,
+		["icon"]="module_9"
+	},
+	["act_level_gift"]={
+		["level"]=3
+	},
+	["fund_chapter"]={
+		["stage"]=2
 	}
 }
 local config = {
-data=func_open,count=32
+data=func_open,count=27
 }
 return config

lua/app/config/fund_level.lua.meta

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

lua/app/config/fx.lua

@@ -739,6 +739,26 @@ local fx = {
 		["res"]="sfx_c1_p33001_05",
 		["bind"]="root"
 	},
+	[300069]={
+		["res"]="sfx_c1_p45001_01",
+		["bind"]="root"
+	},
+	[300070]={
+		["res"]="sfx_c1_p45001_02",
+		["bind"]="root"
+	},
+	[300071]={
+		["res"]="sfx_c1_p45001_03",
+		["bind"]="root"
+	},
+	[300072]={
+		["res"]="sfx_c1_p45001_04",
+		["bind"]="root"
+	},
+	[300073]={
+		["res"]="sfx_c1_p45001_05",
+		["bind"]="root"
+	},
 	[400001]={
 		["res"]="sfx_c1_p45002_01",
 		["bind"]="root",
@@ -1048,9 +1068,34 @@ local fx = {
 		["res"]="sfx_c1_p33001_05",
 		["bind"]="root",
 		["flip"]=1
+	},
+	[400069]={
+		["res"]="sfx_c1_p45001_01",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400070]={
+		["res"]="sfx_c1_p45001_02",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400071]={
+		["res"]="sfx_c1_p45001_03",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400072]={
+		["res"]="sfx_c1_p45001_04",
+		["bind"]="root",
+		["flip"]=1
+	},
+	[400073]={
+		["res"]="sfx_c1_p45001_05",
+		["bind"]="root",
+		["flip"]=1
 	}
 }
 local config = {
-data=fx,count=243
+data=fx,count=253
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -752,6 +752,30 @@ local LocalizationGlobalConst =
 	EQUIP_QLT_SELECT_ALL_1 = "EQUIP_QLT_SELECT_ALL_1",
 	EQUIP_QLT_SELECT_ALL_2 = "EQUIP_QLT_SELECT_ALL_2",
 	REBACK_MATERIAL_DESC = "REBACK_MATERIAL_DESC",
+	ACT_GOGOGO_DESC_1 = "ACT_GOGOGO_DESC_1",
+	ACT_GOGOGO_DESC_2 = "ACT_GOGOGO_DESC_2",
+	ACT_GOGOGO_DESC_3 = "ACT_GOGOGO_DESC_3",
+	ACT_GOGOGO_DESC_4 = "ACT_GOGOGO_DESC_4",
+	ACT_GOGOGO_DESC_5 = "ACT_GOGOGO_DESC_5",
+	ACT_GOGOGO_DESC_6 = "ACT_GOGOGO_DESC_6",
+	ACT_GOGOGO_DESC_7 = "ACT_GOGOGO_DESC_7",
+	ACT_GOGOGO_DESC_8 = "ACT_GOGOGO_DESC_8",
+	ACT_GOGOGO_DESC_9 = "ACT_GOGOGO_DESC_9",
+	ACT_GOGOGO_DESC_10 = "ACT_GOGOGO_DESC_10",
+	ACT_GOGOGO_DESC_11 = "ACT_GOGOGO_DESC_11",
+	ACT_GOGOGO_DESC_12 = "ACT_GOGOGO_DESC_12",
+	ACT_GOGOGO_DESC_13 = "ACT_GOGOGO_DESC_13",
+	ACT_GOGOGO_DESC_14 = "ACT_GOGOGO_DESC_14",
+	ACT_GOGOGO_DESC_15 = "ACT_GOGOGO_DESC_15",
+	ACT_GOGOGO_DESC_16 = "ACT_GOGOGO_DESC_16",
+	ACT_GOGOGO_DESC_17 = "ACT_GOGOGO_DESC_17",
+	ACT_GOGOGO_DESC_18 = "ACT_GOGOGO_DESC_18",
+	ACT_GOGOGO_DESC_19 = "ACT_GOGOGO_DESC_19",
+	ACT_GOGOGO_DESC_20 = "ACT_GOGOGO_DESC_20",
+	ACT_GOGOGO_DESC_21 = "ACT_GOGOGO_DESC_21",
+	ACT_GOGOGO_DESC_22 = "ACT_GOGOGO_DESC_22",
+	ACT_GOGOGO_DESC_23 = "ACT_GOGOGO_DESC_23",
+	ACT_GOGOGO_DESC_24 = "ACT_GOGOGO_DESC_24",
 	DAILY_CHALLENGE_DESC_9 = "DAILY_CHALLENGE_DESC_9",
 	FIRST_CHARGE_TITLE_1 = "FIRST_CHARGE_TITLE_1",
 	FIRST_CHARGE_TITLE_2 = "FIRST_CHARGE_TITLE_2",
@@ -763,19 +787,18 @@ local LocalizationGlobalConst =
 	FIRST_CHARGE_2 = "FIRST_CHARGE_2",
 	FIRST_CHARGE_3 = "FIRST_CHARGE_3",
 	FIRST_CHARGE_4 = "FIRST_CHARGE_4",
-	FUND_DESC_1 = "FUND_DESC_1",
 	FUND_CHAPTER_DESC_1 = "FUND_CHAPTER_DESC_1",
 	FUND_CHAPTER_DESC_2 = "FUND_CHAPTER_DESC_2",
 	FUND_CHAPTER_DESC_3 = "FUND_CHAPTER_DESC_3",
 	FUND_CHAPTER_DESC_4 = "FUND_CHAPTER_DESC_4",
 	FUND_CHAPTER_DESC_5 = "FUND_CHAPTER_DESC_5",
 	FUND_CHAPTER_DESC_6 = "FUND_CHAPTER_DESC_6",
+	FUND_DESC_1 = "FUND_DESC_1",
 	FUND_DESC_2 = "FUND_DESC_2",
 	FUND_DESC_3 = "FUND_DESC_3",
 	FUND_DESC_4 = "FUND_DESC_4",
 	FUND_DESC_5 = "FUND_DESC_5",
 	FUND_DESC_6 = "FUND_DESC_6",
-	FUND_DESC_7 = "FUND_DESC_7",
 	FUND_TAG_DESC_1 = "FUND_TAG_DESC_1",
 	FUND_TAG_DESC_2 = "FUND_TAG_DESC_2",
 	FUND_TAG_DESC_3 = "FUND_TAG_DESC_3",
@@ -833,26 +856,6 @@ local LocalizationGlobalConst =
 	GIFT_ROUTINE_DESC_18 = "GIFT_ROUTINE_DESC_18",
 	GIFT_ROUTINE_DESC_19 = "GIFT_ROUTINE_DESC_19",
 	FREE_DESC = "FREE_DESC",
-	ACT_GOGOGO_DESC_1 = "ACT_GOGOGO_DESC_1",
-	ACT_GOGOGO_DESC_2 = "ACT_GOGOGO_DESC_2",
-	ACT_GOGOGO_DESC_3 = "ACT_GOGOGO_DESC_3",
-	ACT_GOGOGO_DESC_4 = "ACT_GOGOGO_DESC_4",
-	ACT_GOGOGO_DESC_5 = "ACT_GOGOGO_DESC_5",
-	ACT_GOGOGO_DESC_6 = "ACT_GOGOGO_DESC_6",
-	ACT_GOGOGO_DESC_7 = "ACT_GOGOGO_DESC_7",
-	ACT_GOGOGO_DESC_8 = "ACT_GOGOGO_DESC_8",
-	ACT_GOGOGO_DESC_9 = "ACT_GOGOGO_DESC_9",
-	ACT_GOGOGO_DESC_10 = "ACT_GOGOGO_DESC_10",
-	ACT_GOGOGO_DESC_11 = "ACT_GOGOGO_DESC_11",
-	ACT_GOGOGO_DESC_12 = "ACT_GOGOGO_DESC_12",
-	ACT_GOGOGO_DESC_13 = "ACT_GOGOGO_DESC_13",
-	ACT_GOGOGO_DESC_14 = "ACT_GOGOGO_DESC_14",
-	ACT_GOGOGO_DESC_15 = "ACT_GOGOGO_DESC_15",
-	ACT_GOGOGO_DESC_16 = "ACT_GOGOGO_DESC_16",
-	ACT_GOGOGO_DESC_17 = "ACT_GOGOGO_DESC_17",
-	ACT_GOGOGO_DESC_18 = "ACT_GOGOGO_DESC_18",
-	ACT_GOGOGO_DESC_19 = "ACT_GOGOGO_DESC_19",
-	ACT_GOGOGO_DESC_20 = "ACT_GOGOGO_DESC_20",
 }
 
 return LocalizationGlobalConst

lua/app/config/mall_gold.lua

@@ -5,19 +5,19 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=5500,
+			["num"]=1500,
- 			["num_for_nothing"]="Uw1cAw=="
+ 			["num_for_nothing"]="Vw1cAw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=25,
+			["num"]=60,
- 			["num_for_nothing"]="VA0="
+ 			["num_for_nothing"]="UAg="
 		},
-		["free_times"]=1,
+		["daily_ad"]=2,
-		["ad_times"]=1
+		["daily_free"]=1
 	},
 	[2]={
 		["gold"]={
@@ -25,16 +25,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=22000,
+			["num"]=7500,
- 			["num_for_nothing"]="VApcA2U="
+ 			["num_for_nothing"]="UQ1cAw=="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=100,
+			["num"]=300,
- 			["num_for_nothing"]="Vwhc"
+ 			["num_for_nothing"]="VQhc"
 		}
 	},
 	[3]={
@@ -43,16 +43,16 @@ local mall_gold = {
  			["type_for_nothing"]="Vw==",
 			["id"]=1,
  			["id_for_nothing"]="Vw==",
-			["num"]=110000,
+			["num"]=75000,
- 			["num_for_nothing"]="VwlcA2VR"
+ 			["num_for_nothing"]="UQ1cA2U="
 		},
 		["cost"]={
 			["type"]=1,
  			["type_for_nothing"]="Vw==",
 			["id"]=2,
  			["id_for_nothing"]="VA==",
-			["num"]=450,
+			["num"]=3000,
- 			["num_for_nothing"]="Ug1c"
+ 			["num_for_nothing"]="VQhcAw=="
 		}
 	}
 }

lua/app/config/mall_treasure.lua

@@ -7,28 +7,28 @@ local mall_treasure = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=80,
+				["num"]=120,
- 				["num_for_nothing"]="Xgg="
+ 				["num_for_nothing"]="Vwpc"
 			}
 		},
 		["limit"]=1
 	},
 	[2]={
-		["recharge_id"]=4,
+		["recharge_id"]=5,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=500,
+				["num"]=600,
- 				["num_for_nothing"]="Uwhc"
+ 				["num_for_nothing"]="UAhc"
 			}
 		},
 		["limit"]=1
 	},
 	[3]={
-		["recharge_id"]=5,
+		["recharge_id"]=10,
 		["reward"]={
 			{
 				["type"]=1,
@@ -39,49 +39,49 @@ local mall_treasure = {
  				["num_for_nothing"]="VwpcAw=="
 			}
 		},
-		["limit"]=2
+		["limit"]=1
 	},
 	[4]={
-		["recharge_id"]=7,
+		["recharge_id"]=13,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=2500,
+				["num"]=2400,
- 				["num_for_nothing"]="VA1cAw=="
+ 				["num_for_nothing"]="VAxcAw=="
 			}
 		},
-		["limit"]=2
+		["limit"]=1
 	},
 	[5]={
-		["recharge_id"]=10,
+		["recharge_id"]=16,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=6500,
+				["num"]=6000,
- 				["num_for_nothing"]="UA1cAw=="
+ 				["num_for_nothing"]="UAhcAw=="
 			}
 		},
-		["limit"]=3
+		["limit"]=1
 	},
 	[6]={
-		["recharge_id"]=12,
+		["recharge_id"]=18,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=14000,
+				["num"]=12000,
- 				["num_for_nothing"]="VwxcA2U="
+ 				["num_for_nothing"]="VwpcA2U="
 			}
 		},
-		["limit"]=3
+		["limit"]=1
 	}
 }
 local config = {

lua/app/config/skill.lua

@@ -864,7 +864,10 @@ local skill = {
 		["sound_delay"]=0.0,
 		["name_act"]="skill01",
 		["name_hit"]={
-			"suffer01，suffer02，suffer01，suffer03"
+			"suffer01",
+			"suffer02",
+			"suffer01",
+			"suffer03"
 		},
 		["fx_self"]=300043,
 		["bullet_time"]={
@@ -5113,7 +5116,8 @@ local skill = {
 		["name_hit"]={
 			"suffer01"
 		},
-		["fx_self_mirror"]=100000
+		["fx_self"]=300069,
+		["fx_self_mirror"]=400069
 	},
 	[4500111]={
 		["position"]=4,
@@ -5141,7 +5145,8 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self_mirror"]=100000
+		["fx_self"]=300070,
+		["fx_self_mirror"]=400070
 	},
 	[4500112]={
 		["position"]=4,
@@ -5169,7 +5174,8 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self_mirror"]=100000
+		["fx_self"]=300071,
+		["fx_self_mirror"]=400071
 	},
 	[4500113]={
 		["position"]=4,
@@ -5197,7 +5203,8 @@ local skill = {
 		["name_hit"]={
 			"suffer02"
 		},
-		["fx_self_mirror"]=100000
+		["fx_self"]=300072,
+		["fx_self_mirror"]=400072
 	},
 	[4500120]={
 		["buff_id"]={
@@ -5241,12 +5248,13 @@ local skill = {
 		["name_hit"]={
 			"suffer03"
 		},
+		["fx_self"]=300073,
 		["bullet_time"]={
 			2211,
 			3000,
 			400
 		},
-		["fx_self_mirror"]=100000
+		["fx_self_mirror"]=400073
 	},
 	[4500121]={
 		["position"]=4,
@@ -7200,8 +7208,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			2,
+			1,
-			0
+			140
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -7227,8 +7235,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			2,
+			1,
-			0
+			140
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,
@@ -7254,8 +7262,8 @@ local skill = {
 		},
 		["obj"]=2,
 		["skill_position"]={
-			2,
+			1,
-			0
+			140
 		},
 		["shake_time"]=100,
 		["shake_type"]=1,

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

@@ -331,12 +331,12 @@ local attr = {
 	},
 	[67]={
 		["id"]=67,
-		["desc"]="攻击",
+		["desc"]="全体攻击",
 		["name"]="atk_all"
 	},
 	[68]={
 		["id"]=68,
-		["desc"]="生命",
+		["desc"]="全体生命",
 		["name"]="attr_hp_all"
 	},
 	[69]={
@@ -371,23 +371,28 @@ local attr = {
 	},
 	[75]={
 		["id"]=75,
-		["desc"]="通用个人攻击",
+		["desc"]="攻击",
 		["name"]="attr_atk"
 	},
 	[76]={
 		["id"]=76,
-		["desc"]="通用个人生命",
+		["desc"]="生命",
 		["name"]="attr_hp"
 	},
 	[77]={
 		["id"]=77,
-		["desc"]="通用个人普攻伤害增加",
+		["desc"]="普攻伤害",
 		["name"]="attr_normal_hurt"
 	},
 	[78]={
 		["id"]=78,
-		["desc"]="通用个人技能伤害增加",
+		["desc"]="技能伤害",
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["desc"]="减伤",
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -469,12 +474,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/cn/buff.lua

@@ -327,6 +327,19 @@ local buff = {
 		["desc"]="反伤：反弹{0}对方伤害，怪物特性不可被移除。",
 		["tips_desc"]="反伤：反弹{0}对方伤害，怪物特性不可被移除。",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="亢奋",
+		["desc"]="亢奋：普攻次数+{0}。",
+		["tips_desc"]="亢奋：普攻次数增加。",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["show_name"]="概率免控",
+		["desc"]="免控：50%概率免疫所有控制",
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +393,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -634,7 +634,7 @@ local localization_global =
     ["EVENT_COUNTDOWN"] = "活动倒计时：",
     ["SUMMON_FREE_TIME"] = "{0}后免费",
     ["SUMMON_FORCE_4"] = "<color=#ff9c00>{0}</color>次内必出<color=#ffa729>传说英雄</color>",
-    ["ITEM_NOT_ENOUGH_DESC"] = "是否使用<color=#c40e0e>钻石*{0}</color>补充<color=#c45f0e>{1}*{2}</color>，进行召唤？",
+    ["ITEM_NOT_ENOUGH_DESC"] = "是否使用<color=#ff9b59>钻石*{0}</color>补充<color=#df70ff>{1}*{2}</color>，进行召唤？",
     ["SUMMON_ONE"] = "召唤1次",
     ["SUMMON_TEN"] = "召唤10次",
     ["FREE_DESC_1"] = "本次免费",
@@ -752,6 +752,30 @@ local localization_global =
     ["EQUIP_QLT_SELECT_ALL_1"] = "所有品质",
     ["EQUIP_QLT_SELECT_ALL_2"] = "所有部位",
     ["REBACK_MATERIAL_DESC"] = "分解获得",
+    ["ACT_GOGOGO_DESC_1"] = "限时冲刺",
+    ["ACT_GOGOGO_DESC_2"] = "{0}冲刺",
+    ["ACT_GOGOGO_DESC_3"] = "冲刺商店",
+    ["ACT_GOGOGO_DESC_4"] = "冲刺星星兑换",
+    ["ACT_GOGOGO_DESC_5"] = "每日限购：{0}/{1}",
+    ["ACT_GOGOGO_DESC_6"] = "每周限购：{0}/{1}",
+    ["ACT_GOGOGO_DESC_7"] = "永久限购：{0}/{1}",
+    ["ACT_GOGOGO_DESC_8"] = "已售罄",
+    ["ACT_GOGOGO_DESC_9"] = "当前轮次",
+    ["ACT_GOGOGO_DESC_10"] = "冲刺礼包",
+    ["ACT_GOGOGO_DESC_11"] = "冲刺任务",
+    ["ACT_GOGOGO_DESC_12"] = "完成本轮获得",
+    ["ACT_GOGOGO_DESC_13"] = "已完成",
+    ["ACT_GOGOGO_DESC_14"] = "前往",
+    ["ACT_GOGOGO_DESC_15"] = "活动剩余时间",
+    ["ACT_GOGOGO_DESC_16"] = "消耗{0}，获取奖励",
+    ["ACT_GOGOGO_DESC_17"] = "1. 完成任务，可获得奖励。\n2. 所有任务全部完成，视为完成一轮，可领取轮次奖励。\n3. 轮次奖励有领取上限，达到上限后任务不再计数。",
+    ["ACT_GOGOGO_DESC_18"] = "消耗金钥匙，获得奖励",
+    ["ACT_GOGOGO_DESC_19"] = "召唤英雄，获得奖励",
+    ["ACT_GOGOGO_DESC_20"] = "冲刺签到",
+    ["ACT_GOGOGO_DESC_21"] = "普通召唤冲刺",
+    ["ACT_GOGOGO_DESC_22"] = "芯魂宝箱冲刺",
+    ["ACT_GOGOGO_DESC_23"] = "钻石冲刺",
+    ["ACT_GOGOGO_DESC_24"] = "消耗钻石，获得奖励",
     ["DAILY_CHALLENGE_DESC_9"] = "难度：{0}",
     ["FIRST_CHARGE_TITLE_1"] = "启程助力",
     ["FIRST_CHARGE_TITLE_2"] = "特惠臻选",
@@ -832,27 +856,6 @@ local localization_global =
     ["GIFT_ROUTINE_DESC_18"] = "精彩活动",
     ["GIFT_ROUTINE_DESC_19"] = "必买",
     ["FREE_DESC"] = "免费",
-    ["ACT_GOGOGO_DESC_1"] = "限时冲刺",
-    ["ACT_GOGOGO_DESC_2"] = "{0}冲刺",
-    ["ACT_GOGOGO_DESC_3"] = "冲刺商店",
-    ["ACT_GOGOGO_DESC_4"] = "冲刺星星兑换",
-    ["ACT_GOGOGO_DESC_5"] = "每日限购：{0}/{1}",
-    ["ACT_GOGOGO_DESC_6"] = "每周限购：{0}/{1}",
-    ["ACT_GOGOGO_DESC_7"] = "永久限购：{0}/{1}",
-    ["ACT_GOGOGO_DESC_8"] = "已售罄",
-    ["ACT_GOGOGO_DESC_9"] = "当前轮次",
-    ["ACT_GOGOGO_DESC_10"] = "冲刺礼包",
-    ["ACT_GOGOGO_DESC_11"] = "冲刺任务",
-    ["ACT_GOGOGO_DESC_12"] = "完成本轮获得",
-    ["ACT_GOGOGO_DESC_13"] = "已完成",
-    ["ACT_GOGOGO_DESC_14"] = "前往",
-    ["ACT_GOGOGO_DESC_15"] = "活动剩余时间",
-    ["ACT_GOGOGO_DESC_16"] = "消耗{0}，获取奖励",
-    ["ACT_GOGOGO_DESC_17"] = "1. 完成任务，可获得奖励。\n2. 所有任务全部完成，视为完成一轮，可领取轮次奖励。\n3. 轮次奖励有领取上限，达到上限后任务不再计数。",
-    ["ACT_GOGOGO_DESC_18"] = "消耗金钥匙，获得奖励",
-    ["ACT_GOGOGO_DESC_19"] = "召唤英雄，获得奖励",
-    ["ACT_GOGOGO_DESC_20"] = "冲刺签到",
-    
 }
 
 return localization_global

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

@@ -310,6 +310,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -391,12 +395,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/de/buff.lua

@@ -198,6 +198,14 @@ local buff = {
 	[97]={
 		["id"]=97,
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -251,12 +259,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/en/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="Damage Counter: Reflects {0} of the enemy's damage. Monster buff cannot be removed.",
 		["tips_desc"]="Damage Counter: Reflects {0} of the enemy's damage. Monster buff cannot be removed.",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="Rage",
+		["desc"]="Rage: Normal attack +<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Rage: More normal attacks.",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -635,6 +635,30 @@ local localization_global =
     ["MAIN_BTN_1"] = "Shop",
     ["MAIN_BTN_2"] = "Hero",
     ["MAIN_BTN_3"] = "Fight",
+    ["ACT_GOGOGO_DESC_1"] = "Limited-time Sprint",
+    ["ACT_GOGOGO_DESC_2"] = "{0} Sprint",
+    ["ACT_GOGOGO_DESC_3"] = "Sprint Shop",
+    ["ACT_GOGOGO_DESC_4"] = "Sprint Star Exchange",
+    ["ACT_GOGOGO_DESC_5"] = "Daily Limit: {0}/{1}",
+    ["ACT_GOGOGO_DESC_6"] = "Weekly Limit: {0}/{1}",
+    ["ACT_GOGOGO_DESC_7"] = "Permanent Limit: {0}/{1}",
+    ["ACT_GOGOGO_DESC_8"] = "Sold Out",
+    ["ACT_GOGOGO_DESC_9"] = "Current Round",
+    ["ACT_GOGOGO_DESC_10"] = "Sprint Pack",
+    ["ACT_GOGOGO_DESC_11"] = "Sprint Mission",
+    ["ACT_GOGOGO_DESC_12"] = "Complete this round to get",
+    ["ACT_GOGOGO_DESC_13"] = "Completed",
+    ["ACT_GOGOGO_DESC_14"] = "Go",
+    ["ACT_GOGOGO_DESC_15"] = "Event Time Left",
+    ["ACT_GOGOGO_DESC_16"] = "Spend {0} for rewards",
+    ["ACT_GOGOGO_DESC_17"] = "1.Complete missions for rewards.\n2. Finishing all missions completes a round, granting round rewards.\n3. Round rewards have claim limits. Missions stop counting after limit reached.",
+    ["ACT_GOGOGO_DESC_18"] = "Consume Gold Keys to receive rewards",
+    ["ACT_GOGOGO_DESC_19"] = "Summon heroes to receive rewards",
+    ["ACT_GOGOGO_DESC_20"] = "Sprint Sign-in",
+    ["ACT_GOGOGO_DESC_21"] = "Normal Summon Sprint",
+    ["ACT_GOGOGO_DESC_22"] = "Core Chest Sprint",
+    ["ACT_GOGOGO_DESC_23"] = "Diamond Sprint",
+    ["ACT_GOGOGO_DESC_24"] = "Spend diamonds to receive rewards",
 }
 
 return localization_global

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/es/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="Daño Reflexivo: refleja {0} de daño del oponente. Los atributos de monstruos no pueden ser removidos.",
 		["tips_desc"]="Daño Reflexivo: refleja {0} de daño del oponente. Los atributos de monstruos no pueden ser removidos.",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="Excitado",
+		["desc"]="Excitado: número de ataques comunes + <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Excitado: aumenta el número de ATQ común.",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -310,6 +310,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -391,12 +395,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/fr/buff.lua

@@ -198,6 +198,14 @@ local buff = {
 	[97]={
 		["id"]=97,
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -251,12 +259,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/id/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="DMG Balik: Memantulkan {0} dari kerusakan musuh. Monster buff tidak dapat dihilangkan.",
 		["tips_desc"]="DMG Balik: Memantulkan {0} dari kerusakan musuh. Monster buff tidak dapat dihilangkan.",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="Excited",
+		["desc"]="Excited: ATK Normal +<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Excited: Jumlah ATK Normal bertambah.",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/ja/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="反射：{0}のダメージを反射する。モンスターの特性は削除できない。",
 		["tips_desc"]="反射：{0}のダメージを反射する。モンスターの特性は削除できない。",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="興奮",
+		["desc"]="興奮：通常攻撃の回数が<color=#3cff28>+{0}</color>。",
+		["tips_desc"]="興奮：通常攻撃の回数が増加する。",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/ko/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="피해 반사: 상대의 대미지를 반사하며 몬스터 특성은 제거될 수 없습니다.",
 		["tips_desc"]="피해 반사: 상대의 대미지를 반사하며 몬스터 특성은 제거될 수 없습니다.",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="과열 상태",
+		["desc"]="과열 상태: 일반 공격 횟수+<color=#3cff28>{0}</color>",
+		["tips_desc"]="과열 상태: 일반 공격 횟수가 증가합니다.",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/pt/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="Reflexão: reflete {0} do dano do oponente. O atributo do monstro não pode ser removido.",
 		["tips_desc"]="Reflexão: reflete {0} do dano do oponente. O atributo do monstro não pode ser removido.",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="Excitado",
+		["desc"]="Excitado: número de golpes comuns + <color=#3cff28>{0}</color>.",
+		["tips_desc"]="Excitação: aumenta o número de ataques básicos.",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -310,6 +310,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -391,12 +395,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/ru/buff.lua

@@ -198,6 +198,14 @@ local buff = {
 	[97]={
 		["id"]=97,
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -251,12 +259,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/th/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="สะท้อนดาเมจ: สะท้อนดาเมจ{0}ของฝ่ายตรงข้าม และคุณสมบัติเฉพาะมอนสเตอร์ไม่สามารถถูกลบได้",
 		["tips_desc"]="สะท้อนดาเมจ: สะท้อนดาเมจ{0}ของฝ่ายตรงข้าม และคุณสมบัติเฉพาะมอนสเตอร์ไม่สามารถถูกลบได้",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="ตื่นเต้น",
+		["desc"]="ตื่นเต้น:จำนวนโจมตีทั่วไป+<color=#3cff28>{0}</color>",
+		["tips_desc"]="ตื่นเต้น: จำนวนโจมตีทั่วไปเพิ่มขึ้น",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/vi/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="Phản ST: Phản đòn {0} sát thương lên đối phương, đặc tính Quái không thể bị xóa đi.",
 		["tips_desc"]="Phản ST: Phản đòn {0} sát thương lên đối phương, đặc tính Quái không thể bị xóa đi.",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="Phấn Khởi",
+		["desc"]="Phấn Khởi: Lượt đánh thường +<color=#3cff28>{0}</color>.",
+		["tips_desc"]="Phấn Khởi: Tăng lượt đánh thường.",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

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

@@ -371,6 +371,10 @@ local attr = {
 	[78]={
 		["id"]=78,
 		["name"]="attr_skill_hurt"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="dmgdec"
 	}
 }
 local keys = {
@@ -452,12 +456,13 @@ local keys = {
 		["attr_atk"]=attr[75],
 		["attr_hp"]=attr[76],
 		["attr_normal_hurt"]=attr[77],
-		["attr_skill_hurt"]=attr[78]
+		["attr_skill_hurt"]=attr[78],
+		["dmgdec"]=attr[79]
 	}
 }
 local config = {
 data=attr,
 keys=keys,
-count=78
+count=79
 }
 return config

lua/app/config/strings/zh/buff.lua

@@ -327,6 +327,17 @@ local buff = {
 		["desc"]="反傷：反彈{0}對方傷害，怪物特性不可被移除。",
 		["tips_desc"]="反傷：反彈{0}對方傷害，怪物特性不可被移除。",
 		["name"]="forever_thorns"
+	},
+	[98]={
+		["id"]=98,
+		["show_name"]="亢奮",
+		["desc"]="亢奮：普攻次數+<color=#3cff28>{0}</color>。",
+		["tips_desc"]="亢奮：普攻次數增加。",
+		["name"]="forever_normal_attack_add"
+	},
+	[99]={
+		["id"]=99,
+		["name"]="forever_uncontrolled"
 	}
 }
 local keys = {
@@ -380,12 +391,14 @@ local keys = {
 		["forever_dec_dmg_blue_add"]=buff[94],
 		["forever_dec_dmg_purple_add"]=buff[95],
 		["forever_dec_dmg_all_add"]=buff[96],
-		["forever_thorns"]=buff[97]
+		["forever_thorns"]=buff[97],
+		["forever_normal_attack_add"]=buff[98],
+		["forever_uncontrolled"]=buff[99]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=50
+count=52
 }
 return config

lua/app/module/activity/act_sprint/act_sprint_const.lua

@@ -77,7 +77,7 @@ ActSprintConst.ACT_ROUND_LIMIT = {
 	-- [ActSprintConst.ACT_ID.SUMMON_V2] = GFunc.getConstIntValue("act_gogogo_round_limit_3"),
 	-- [ActSprintConst.ACT_ID.CORE_SOUL_BOX_V2] = GFunc.getConstIntValue("act_gogogo_round_limit_4"),
 
-	[ActSprintConst.ACT_ID.SUMMON_ALL] = GFunc.getConstIntValue("act_gogogo_round_limit_5"),
+	[ActSprintConst.ACT_ID.SUMMON_ALL] = GFunc.getConstIntValue("act_gogogo_round_limit_1"),
 	-- [ActSprintConst.ACT_ID.CORE_SOUL_BOX_ALL] = GFunc.getConstIntValue("act_gogogo_round_limit_6"),
 	-- [ActSprintConst.ACT_ID.SUMMON_LOOP] = GFunc.getConstIntValue("act_gogogo_round_limit_7"),
 	-- [ActSprintConst.ACT_ID.CORE_SOUL_BOX_LOOP] = GFunc.getConstIntValue("act_gogogo_round_limit_8"),
@@ -90,7 +90,7 @@ ActSprintConst.ACT_ROUND_REWARD = {
 	-- [ActSprintConst.ACT_ID.SUMMON_V2] = GFunc.getConstCost("act_gogogo_round_reward_3", true),
 	-- [ActSprintConst.ACT_ID.CORE_SOUL_BOX_V2] = GFunc.getConstCost("act_gogogo_round_reward_4", true),
 
-	[ActSprintConst.ACT_ID.SUMMON_ALL] = GFunc.getConstCost("act_gogogo_round_reward_5", true),
+	[ActSprintConst.ACT_ID.SUMMON_ALL] = GFunc.getConstCost("act_gogogo_round_reward_1", true),
 	-- [ActSprintConst.ACT_ID.CORE_SOUL_BOX_ALL] = GFunc.getConstCost("act_gogogo_round_reward_6", true),
 	-- [ActSprintConst.ACT_ID.SUMMON_LOOP] = GFunc.getConstCost("act_gogogo_round_reward_7", true),
 	-- [ActSprintConst.ACT_ID.CORE_SOUL_BOX_LOOP] = GFunc.getConstCost("act_gogogo_round_reward_8", true),

lua/app/module/sign/sign_const.lua

@@ -1,8 +1,8 @@
 local SignConst = {}
 
 SignConst.GIFT_ID = {
-	[1] = 50102,
+	[1] = 1004000001,
-	[2] = 50202,
+	[2] = 1004000101,
 }
 
 SignConst.REWARD_TYPE = {

lua/app/ui/shop/shop_comp.lua

@@ -97,9 +97,9 @@ function ShopComp:init()
 	self:bind(DataManager.ShopData, "isDirty", function()
 		self:refresh(nil, true)
 	end)
-	self:bind(DataManager.HeroData, "isDirty", function()
+	-- self:bind(DataManager.HeroData, "isDirty", function()
-		self:refresh(nil, true)
+	-- 	self:refresh(nil, true)
-	end)
+	-- end)
 
 	-- self:bind(DataManager.ForceEquipData, "isDirty", function()
 	-- 	self:refresh(nil, true)

lua/app/userdata/chapter/chapter_data.lua

@@ -561,6 +561,15 @@ function ChapterData:getChapterStage(chapterId)
 	end
 	return info.stage
 end
+
+-- 返回x-x格式的章节关卡名称
+function ChapterData:getChapterNameXYMode(chapterId)
+    local chapterCfg = self:getChapterCfg()[chapterId]
+    if chapterCfg then
+        return string.format("%s-%s",chapterCfg.chapter_id, chapterCfg.stage_num)
+    end
+    return chapterId
+end
 --@endregion
 
 --@region 红点

lua/app/userdata/shop/shop_data.lua

@@ -104,7 +104,8 @@ function ShopData:showRedPoint()
     if not self:isOpen() then
         return false
     end
-    return self:hasCoreSoulRedPoint() or self:hasDailyRedPoint() or self:hasGoldRedPoint(true) -- or DataManager.CollectionData:hasSummonRedPoint()
+    -- return self:hasCoreSoulRedPoint() or self:hasDailyRedPoint() or self:hasGoldRedPoint(true) or DataManager.CollectionData:hasSummonRedPoint()
+    return self:hasDailyRedPoint() or self:hasGoldRedPoint(true)
 end
 
 function ShopData:hasDailyRedPoint()
@@ -244,6 +245,7 @@ end
 function ShopData:getCoreSoulAdTimes()
     return self.coreSoulAdTimes or 0
 end
+
 -- 魂芯广告剩余次数
 function ShopData:getCoreSoulAdRemainTimes()
     local remainTimes = self:getCoreSoulAdMaxTimes() - self:getCoreSoulAdTimes()
@@ -252,15 +254,18 @@ function ShopData:getCoreSoulAdRemainTimes()
     end
     return remainTimes
 end
+
 -- 魂芯广告上限次数
 function ShopData:getCoreSoulAdMaxTimes()
     return GFunc.getConstIntValue("summon_core_adtimes_1")
 end
+
 -- 魂芯大奖配置需要次数
 function ShopData:getCoreSoulBigRewardConstTimes(idx)
     local cfg = ConfigManager:getConfig("summon_core")
     return cfg[idx].guarantee_times or 0
 end
+
 -- 魂芯大奖需要次数
 function ShopData:getCoreSoulBigRewardTimes(idx)
     local limit = self:getCoreSoulBigRewardConstTimes(idx)
@@ -273,18 +278,21 @@ function ShopData:getCoreSoulBigRewardTimes(idx)
         return limit - (self.coreSoulEliteRewardTimes or 0)
     end
 end
+
 --- 魂芯抽奖消耗道具id
 function ShopData:getCoreSoulCostItemId(idx)
     local cfgInfo = ConfigManager:getConfig("summon_core")[idx]
     local cost = cfgInfo.item_cost
     return cost and cost.id
 end
+
 --- 魂芯抽奖单抽消耗钻石数量
 function ShopData:getCoreSoulSingleCostGemNum(idx)
     local cfgInfo = ConfigManager:getConfig("summon_core")[idx]
     local cost = cfgInfo.cost
     return cost and cost.num
 end
+
 --- 魂芯抽奖10连抽消耗钻石数量
 function ShopData:getCoreSoulMultiCostGemNum(idx)
     local cfgInfo = ConfigManager:getConfig("summon_core")[idx]