Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-lua into dev_20230815

lua/app/common/bi_report.lua

@@ -276,6 +276,10 @@ BIReport.BOX_OPEN_OPEN_TYPE = {
 	ARENA_BOUNTY = "ArenaBounty",
 }
 
+BIReport.ACTIVITY_SUMMER = {
+	TASK_REWARD = "TaskReward",
+	BUY_LEVEL_UP = "BuyLevelUp",
+}
 
 -- b6
 local EVENT_NAME_EXIT = "client_exit"
@@ -307,6 +311,7 @@ local EVENT_NAME_DAILY_CHALLENGE_OPT = "client_daily_challenge_opt"
 local EVENT_NAME_ARENA_OPT = "client_arena_opt"-- 竞技场
 local EVENT_NAME_MISCELLANEOUS_OPT = "event_name_miscellaneous_opt" -- 一些杂项
 local EVENT_BOX_OPEN = "client_box_open"
+local EVENT_ACT_OPT = "client_act_opt"
 
 function BIReport:setIsNewPlayer(isNewPlayer)
 	self.isNewPlayer = isNewPlayer
@@ -1648,4 +1653,15 @@ function BIReport:postBoxOpen(id, boxType, openType, box_level, rewards)
 	self:report(EVENT_BOX_OPEN, args)
 end
 
+function BIReport:postActOpt(event_type, actId, level, exp, buyLevelCost)
+	local args = {
+		event_type = event_type,
+		act_id = actId,
+		cur_level = level,
+		cur_exp = exp,
+		buy_level_cost = buyLevelCost,
+	}
+	self:report(EVENT_ACT_OPT, args)
+end
+
 return BIReport

lua/app/config/act_chapter_store.lua

@@ -1190,9 +1190,409 @@ local act_chapter_store = {
 		["original"]=19,
 		["recharge_id"]=16,
 		["value"]=10
+	},
+	[3103]={
+		["chapter"]=31,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=900,
+ 				["num_for_nothing"]="Xwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=28,
+ 				["num_for_nothing"]="VAA="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=16,
+		["value"]=11
+	},
+	[3203]={
+		["chapter"]=32,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=900,
+ 				["num_for_nothing"]="Xwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=28,
+ 				["num_for_nothing"]="VAA="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=16,
+		["value"]=11
+	},
+	[3303]={
+		["chapter"]=33,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=900,
+ 				["num_for_nothing"]="Xwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=28,
+ 				["num_for_nothing"]="VAA="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=16,
+		["value"]=11
+	},
+	[3403]={
+		["chapter"]=34,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=900,
+ 				["num_for_nothing"]="Xwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=28,
+ 				["num_for_nothing"]="VAA="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=16,
+		["value"]=11
+	},
+	[3503]={
+		["chapter"]=35,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=900,
+ 				["num_for_nothing"]="Xwhc"
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=28,
+ 				["num_for_nothing"]="VAA="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=16,
+		["value"]=11
+	},
+	[3603]={
+		["chapter"]=36,
+		["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"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=42,
+ 				["num_for_nothing"]="Ugo="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=17,
+		["value"]=12
+	},
+	[3703]={
+		["chapter"]=37,
+		["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"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=42,
+ 				["num_for_nothing"]="Ugo="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=17,
+		["value"]=12
+	},
+	[3803]={
+		["chapter"]=38,
+		["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"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=42,
+ 				["num_for_nothing"]="Ugo="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=17,
+		["value"]=12
+	},
+	[3903]={
+		["chapter"]=39,
+		["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"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=42,
+ 				["num_for_nothing"]="Ugo="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=17,
+		["value"]=12
+	},
+	[4003]={
+		["chapter"]=40,
+		["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"]=1,
+ 				["id_for_nothing"]="Vw==",
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=42,
+ 				["num_for_nothing"]="Ugo="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=15,
+ 				["id_for_nothing"]="Vw0=",
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
+			}
+		},
+		["original"]=19,
+		["recharge_id"]=17,
+		["value"]=12
 	}
 }
 local config = {
-data=act_chapter_store,count=30
+data=act_chapter_store,count=40
 }
 return config

lua/app/config/arena_rank.lua

@@ -2069,8 +2069,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=2000,
- 				["num_for_nothing"]="VAhcAw=="
+				["num"]=3000,
+ 				["num_for_nothing"]="VQhcAw=="
 			},
 			{
 				["type"]=1,
@@ -2227,8 +2227,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=3500,
- 				["num_for_nothing"]="VQ1cAw=="
+				["num"]=5000,
+ 				["num_for_nothing"]="UwhcAw=="
 			},
 			{
 				["type"]=1,
@@ -2393,8 +2393,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
+				["num"]=7000,
+ 				["num_for_nothing"]="UQhcAw=="
 			},
 			{
 				["type"]=1,
@@ -2557,8 +2557,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=45,
- 				["id_for_nothing"]="Ug0=",
+				["id"]=24,
+ 				["id_for_nothing"]="VAw=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -2567,24 +2567,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=7000,
- 				["num_for_nothing"]="UQhcAw=="
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
 				["num"]=50,
  				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=25,
- 				["num_for_nothing"]="VA0="
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["win_reward"]={
@@ -2731,8 +2731,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=45,
- 				["id_for_nothing"]="Ug0=",
+				["id"]=24,
+ 				["id_for_nothing"]="VAw=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -2741,24 +2741,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
+				["num"]=15000,
+ 				["num_for_nothing"]="Vw1cA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
 				["num"]=60,
  				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
 			}
 		},
 		["win_reward"]={
@@ -2905,8 +2905,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=45,
- 				["id_for_nothing"]="Ug0=",
+				["id"]=24,
+ 				["id_for_nothing"]="VAw=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -2915,24 +2915,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=15000,
- 				["num_for_nothing"]="Vw1cA2U="
+				["num"]=18000,
+ 				["num_for_nothing"]="VwBcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
 				["num"]=80,
  				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=35,
- 				["num_for_nothing"]="VQ0="
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
 			}
 		},
 		["win_reward"]={
@@ -3079,8 +3079,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=45,
- 				["id_for_nothing"]="Ug0=",
+				["id"]=24,
+ 				["id_for_nothing"]="VAw=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -3089,24 +3089,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
+				["num"]=20000,
+ 				["num_for_nothing"]="VAhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["win_reward"]={
@@ -3253,8 +3253,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=46,
- 				["id_for_nothing"]="Ug4=",
+				["id"]=25,
+ 				["id_for_nothing"]="VA0=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -3263,24 +3263,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=20000,
- 				["num_for_nothing"]="VAhcA2U="
+				["num"]=25000,
+ 				["num_for_nothing"]="VA1cA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["num"]=120,
+ 				["num_for_nothing"]="Vwpc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
 			}
 		},
 		["win_reward"]={
@@ -3427,8 +3427,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=46,
- 				["id_for_nothing"]="Ug4=",
+				["id"]=25,
+ 				["id_for_nothing"]="VA0=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -3437,24 +3437,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=25000,
- 				["num_for_nothing"]="VA1cA2U="
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
+				["num"]=140,
+ 				["num_for_nothing"]="Vwxc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
 			}
 		},
 		["win_reward"]={
@@ -3601,8 +3601,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=46,
- 				["id_for_nothing"]="Ug4=",
+				["id"]=25,
+ 				["id_for_nothing"]="VA0=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -3611,24 +3611,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
+				["num"]=35000,
+ 				["num_for_nothing"]="VQ1cA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=40,
- 				["num_for_nothing"]="Ugg="
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
+				["num"]=7,
+ 				["num_for_nothing"]="UQ=="
 			}
 		},
 		["win_reward"]={
@@ -3775,8 +3775,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=46,
- 				["id_for_nothing"]="Ug4=",
+				["id"]=25,
+ 				["id_for_nothing"]="VA0=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -3785,24 +3785,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=35000,
- 				["num_for_nothing"]="VQ1cA2U="
+				["num"]=40000,
+ 				["num_for_nothing"]="UghcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
+				["num"]=180,
+ 				["num_for_nothing"]="VwBc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=8,
+ 				["num_for_nothing"]="Xg=="
 			}
 		},
 		["win_reward"]={
@@ -3949,8 +3949,8 @@ local arena_rank = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=46,
- 				["id_for_nothing"]="Ug4=",
+				["id"]=25,
+ 				["id_for_nothing"]="VA0=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
@@ -3959,24 +3959,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=40000,
- 				["num_for_nothing"]="UghcA2U="
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
 			}
 		},
 		["win_reward"]={
@@ -4123,8 +4123,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=2000,
- 				["num_for_nothing"]="VAhcAw=="
+				["num"]=3000,
+ 				["num_for_nothing"]="VQhcAw=="
 			},
 			{
 				["type"]=1,
@@ -4279,8 +4279,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=3500,
- 				["num_for_nothing"]="VQ1cAw=="
+				["num"]=5000,
+ 				["num_for_nothing"]="UwhcAw=="
 			},
 			{
 				["type"]=1,
@@ -4443,8 +4443,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
+				["num"]=7000,
+ 				["num_for_nothing"]="UQhcAw=="
 			},
 			{
 				["type"]=1,
@@ -4615,24 +4615,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=7000,
- 				["num_for_nothing"]="UQhcAw=="
+				["num"]=10000,
+ 				["num_for_nothing"]="VwhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
 				["num"]=50,
  				["num_for_nothing"]="Uwg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=25,
- 				["num_for_nothing"]="VA0="
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
 			}
 		},
 		["win_reward"]={
@@ -4787,24 +4787,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
+				["num"]=15000,
+ 				["num_for_nothing"]="Vw1cA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
 				["num"]=60,
  				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=2,
+ 				["num_for_nothing"]="VA=="
 			}
 		},
 		["win_reward"]={
@@ -4959,24 +4959,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=15000,
- 				["num_for_nothing"]="Vw1cA2U="
+				["num"]=18000,
+ 				["num_for_nothing"]="VwBcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=4,
- 				["id_for_nothing"]="Ug==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
 				["num"]=80,
  				["num_for_nothing"]="Xgg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=35,
- 				["num_for_nothing"]="VQ0="
+				["id"]=47,
+ 				["id_for_nothing"]="Ug8=",
+				["num"]=3,
+ 				["num_for_nothing"]="VQ=="
 			}
 		},
 		["win_reward"]={
@@ -5131,24 +5131,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
+				["num"]=20000,
+ 				["num_for_nothing"]="VAhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=10,
- 				["num_for_nothing"]="Vwg="
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=4,
+ 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["win_reward"]={
@@ -5303,24 +5303,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=20000,
- 				["num_for_nothing"]="VAhcA2U="
+				["num"]=25000,
+ 				["num_for_nothing"]="VA1cA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["num"]=120,
+ 				["num_for_nothing"]="Vwpc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=5,
+ 				["num_for_nothing"]="Uw=="
 			}
 		},
 		["win_reward"]={
@@ -5475,24 +5475,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=25000,
- 				["num_for_nothing"]="VA1cA2U="
+				["num"]=30000,
+ 				["num_for_nothing"]="VQhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=30,
- 				["num_for_nothing"]="VQg="
+				["num"]=140,
+ 				["num_for_nothing"]="Vwxc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=6,
+ 				["num_for_nothing"]="UA=="
 			}
 		},
 		["win_reward"]={
@@ -5647,24 +5647,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
+				["num"]=35000,
+ 				["num_for_nothing"]="VQ1cA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=40,
- 				["num_for_nothing"]="Ugg="
+				["num"]=160,
+ 				["num_for_nothing"]="Vw5c"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
+				["num"]=7,
+ 				["num_for_nothing"]="UQ=="
 			}
 		},
 		["win_reward"]={
@@ -5819,24 +5819,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=35000,
- 				["num_for_nothing"]="VQ1cA2U="
+				["num"]=40000,
+ 				["num_for_nothing"]="UghcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=50,
- 				["num_for_nothing"]="Uwg="
+				["num"]=180,
+ 				["num_for_nothing"]="VwBc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=8,
+ 				["num_for_nothing"]="Xg=="
 			}
 		},
 		["win_reward"]={
@@ -5991,24 +5991,24 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=40000,
- 				["num_for_nothing"]="UghcA2U="
+				["num"]=50000,
+ 				["num_for_nothing"]="UwhcA2U="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=60,
- 				["num_for_nothing"]="UAg="
+				["num"]=200,
+ 				["num_for_nothing"]="VAhc"
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=47,
  				["id_for_nothing"]="Ug8=",
-				["num"]=5,
- 				["num_for_nothing"]="Uw=="
+				["num"]=10,
+ 				["num_for_nothing"]="Vwg="
 			}
 		},
 		["win_reward"]={

lua/app/config/fx.lua

@@ -1994,7 +1994,12 @@ local fx = {
 		["bind"]="root"
 	},
 	[300148]={
-		["res"]="sfx_p0031_b05",
+		["res"]="sfx_p0032_b06",
+		["bind"]="root",
+		["bg"]=1
+	},
+	[300149]={
+		["res"]="sfx_p0033_b06",
 		["bind"]="root",
 		["bg"]=1
 	},
@@ -2739,13 +2744,19 @@ local fx = {
 		["flip"]=1
 	},
 	[400148]={
-		["res"]="sfx_p0031_b05",
+		["res"]="sfx_p0032_b06",
+		["bind"]="root",
+		["flip"]=1,
+		["bg"]=1
+	},
+	[400149]={
+		["res"]="sfx_p0033_b06",
 		["bind"]="root",
 		["flip"]=1,
 		["bg"]=1
 	}
 }
 local config = {
-data=fx,count=645
+data=fx,count=647
 }
 return config

lua/app/config/skill.lua

@@ -127,7 +127,6 @@ local skill = {
 		},
 		["name_act"]="attack01",
 		["fx_self"]=300018,
-		["fx_bg"]=400148,
 		["fx_self_mirror"]=400068
 	},
 	[1200111]={
@@ -154,7 +153,6 @@ local skill = {
 		},
 		["name_act"]="attack02",
 		["fx_self"]=300019,
-		["fx_bg"]=400148,
 		["fx_self_mirror"]=400069
 	},
 	[1200112]={
@@ -181,7 +179,6 @@ local skill = {
 		},
 		["name_act"]="attack03",
 		["fx_self"]=300020,
-		["fx_bg"]=400148,
 		["fx_self_mirror"]=400070
 	},
 	[1200113]={
@@ -208,7 +205,6 @@ local skill = {
 		},
 		["name_act"]="attack04",
 		["fx_self"]=300021,
-		["fx_bg"]=400148,
 		["fx_self_mirror"]=400071
 	},
 	[1200120]={
@@ -6418,7 +6414,7 @@ local skill = {
 		["shake_time"]=200,
 		["shake_type"]=6,
 		["sound"]=4400314,
-		["sound_delay"]=0.5,
+		["sound_delay"]=0.0,
 		["name_act"]="skill01",
 		["fx_self"]=300134,
 		["bullet_time"]={

lua/app/config/skin_skill.lua

@@ -145,9 +145,9 @@ local skin_skill = {
 			3000,
 			400
 		},
-		["fx_bg"]=300148,
+		["fx_bg"]=300149,
 		["fx_self_mirror"]=400146,
-		["fx_bg_mirror"]=400148
+		["fx_bg_mirror"]=400149
 	},
 	[53001011]={
 		["skill_position"]={
@@ -225,9 +225,7 @@ local skin_skill = {
 			3000,
 			400
 		},
-		["fx_bg"]=300148,
-		["fx_self_mirror"]=400029,
-		["fx_bg_mirror"]=400148
+		["fx_self_mirror"]=400029
 	},
 	[54001011]={
 		["skill_position"]={

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。"
 	},
 	[3400220]={
-		["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color></color>效果，<color=#3cff28>2</color>回合。"
+		["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>2</color>回合。"
 	},
 	[4200120]={
 		["desc"]="元素链接：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="绝命啃咬:额外造成多次技能伤害，并随机消除<color=#3cff28>3</color>个元素。"
 	},
 	[4400320]={
-		["desc"]="旋转月轮:额外造成多次技能伤害，<color=#3cff28>50%</color>概率附加<color=#3cff28><u>冻结</u></color></color>效果，<color=#3cff28>1</color>回合。"
+		["desc"]="旋转月轮:额外造成多次技能伤害，<color=#3cff28>50%</color>概率附加<color=#3cff28><u>冻结</u></color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[5400320]={
 		["desc"]="堕落之剑:额外造成一次大量技能伤害，附加<color=#3cff28><u>腐败</u></color>效果，<color=#3cff28>1</color>回合。"

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="炼狱扳机可恢复一定量生命。"
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>:皮侍普攻对<color=#3cff28>虚弱</color>敌人额外增伤。"
+		["desc"]="<color=#fcff28>Combo</color>:恶魔侍者普攻对<color=#3cff28>虚弱</color>敌人额外增伤。"
 	},
 	[1400303]={
 		["desc"]="炼狱扳机附加的易伤效果提升。"
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>:皮侍普攻<color=#3cff28>易伤</color>敌人将恢复生命。"
+		["desc"]="<color=#fcff28>Combo</color>:恶魔侍者普攻<color=#3cff28>易伤</color>敌人将恢复生命。"
 	},
 	[1400305]={
 		["desc"]="炼狱扳机释放后为团队附加<color=#3cff28>重生</color>效果，1回合。"
 	},
 	[1400306]={
-		["desc"]="皮侍攻击提升<color=#3cff28>15%</color>。"
+		["desc"]="恶魔侍者攻击提升<color=#3cff28>15%</color>。"
 	},
 	[1400307]={
 		["desc"]="炼狱扳机附加的<color=#3cff28>重生</color>效果恢复能力增强，回合数<color=#3cff28>+1</color>。"

lua/app/config/strings/en/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="Ancient Healer Lumen"
 	},
 	[20044]={
-
+		["name"]="Shark Leader"
 	},
 	[20045]={
-
+		["name"]="Dimness"
 	},
 	[20046]={
-
+		["name"]="Glowing Seacrab"
 	},
 	[20047]={
-
+		["name"]="Lord of the Sea"
 	},
 	[20048]={
-
+		["name"]="Ruin Guard"
 	},
 	[30001]={
 		["name"]="Onion"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="Moon Chaser: Increase damage and deal significantly skill damage once."
 	},
 	[3400220]={
-		["desc"]="Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict <color=#3cff28><color=#fcb501><u>Drowsy</u></color></color> that lasts <color=#3cff28>2</color> turns."
+		["desc"]="Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict <color=#3cff28><color=#fcb501><u>Drowsy</u></color> that lasts <color=#3cff28>2</color> turns."
 	},
 	[4200120]={
 		["desc"]="Elemental Link: Clear <color=#3cff28>3</color> random elements and deal skill damage once."
@@ -87,7 +87,7 @@ local skill = {
 		["desc"]="Rotating Chakram: Deal skill damage multiple times and has a <color=#3cff28>50%</color> of chance to inflict <color=#3cff28><u>Frozen</u></color> for <color=#3cff28>1</color> turn."
 	},
 	[5400320]={
-		["desc"]="Fallen Sword: Deal one additional hit of massive skill damage and inflict <color=#3cff28><u>Corrupt</u></color> for <color=#3cff28>1</color> turn."
+		["desc"]="Fallen Sword: Deal one additional hit of massive skill damage and inflict <color=#3cff28><u>Corruption</u></color> for <color=#3cff28>1</color> turn."
 	}
 }
 local config = {

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="Hellfire Trigger can restore HP."
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>:Shadow Samurai's normal attacks deal increased damage to <color=#3cff28>Weak</color> enemies."
+		["desc"]="<color=#fcff28>Combo</color>:Devil Waiter's normal attacks deal increased damage to <color=#3cff28>Weak</color> enemies."
 	},
 	[1400303]={
 		["desc"]="Vulnerable effect of Hellfire Trigger increases."
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>:Shadow Samurai's normal attacks on <color=#3cff28>Vulnerable</color> enemies will restore HP for him."
+		["desc"]="<color=#fcff28>Combo</color>: Devil Waiter's normal attacks on <color=#3cff28>Vulnerable</color> enemies will restore HP for him."
 	},
 	[1400305]={
 		["desc"]="Hellfire Trigger will grant <color=#3cff28>Resurrection</color> to the team for 1 turn."
 	},
 	[1400306]={
-		["desc"]="Shadow Samurai's attack increases by <color=#3cff28>15%</color>."
+		["desc"]="Devil Waiter's attack increases by <color=#3cff28>15%</color>."
 	},
 	[1400307]={
 		["desc"]="<color=#3cff28>Resurrection</color> effect of Hellfire Trigger increases and lasts +<color=#3cff28>1</color> turns."
@@ -828,7 +828,7 @@ local skill_rogue = {
 		["desc"]="When Rotating Chakram links to <color=#3cff28>6</color> or more elements, deal one additional hit of skill damage."
 	},
 	[5400300]={
-		["desc"]="Unlock Fallen Sword: Deal one additional hit of massive skill damage and inflict <color=#3cff28><u>Corrupt</u></color> for <color=#3cff28>1</color> turn."
+		["desc"]="Unlock Fallen Sword: Deal one additional hit of massive skill damage and inflict <color=#3cff28><u>Corruption</u></color> for <color=#3cff28>1</color> turn."
 	},
 	[5400301]={
 		["desc"]="Fallen Sword can clear additional <color=#3cff28>4</color> grids in the X direction."
@@ -837,7 +837,7 @@ local skill_rogue = {
 		["desc"]="Fallen Knight's normal attack has a <color=#3cff28>10%</color> chance of inflicting <color=#3cff28>Poisoned</color> for <color=#3cff28>2</color> turns."
 	},
 	[5400303]={
-		["desc"]="Fallen Sword <color=#3cff28>Poisoned</color> effect lasts +<color=#3cff28>1</color> turns."
+		["desc"]="Fallen Sword <color=#3cff28>Corruption</color> effect lasts +<color=#3cff28>1</color> turns."
 	},
 	[5400304]={
 		["desc"]="Fallen Sword can clear additional <color=#3cff28>4</color> grids in the X direction."

lua/app/config/strings/en/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="Initial"
 	},
 	[13001]={
-
+		["value"]="Initial"
 	},
 	[13002]={
-
+		["value"]="Initial"
 	},
 	[14001]={
-
+		["value"]="Initial"
 	},
 	[14002]={
-
+		["value"]="Initial"
 	},
 	[1400201]={
-
+		["value"]="Beach Champion"
 	},
 	[14003]={
-
+		["value"]="Initial"
 	},
 	[22001]={
-
+		["value"]="Initial"
 	},
 	[23001]={
-
+		["value"]="Initial"
 	},
 	[23002]={
-
+		["value"]="Initial"
 	},
 	[24001]={
-
+		["value"]="Initial"
 	},
 	[24002]={
-
+		["value"]="Initial"
 	},
 	[24003]={
-
+		["value"]="Initial"
 	},
 	[32001]={
-
+		["value"]="Initial"
 	},
 	[33001]={
-
+		["value"]="Initial"
 	},
 	[33002]={
-
+		["value"]="Initial"
 	},
 	[34001]={
-
+		["value"]="Initial"
 	},
 	[3400101]={
-
+		["value"]="Radiant Morning Dew"
 	},
 	[34002]={
-
+		["value"]="Initial"
 	},
 	[34003]={
-
+		["value"]="Initial"
 	},
 	[42001]={
-
+		["value"]="Initial"
 	},
 	[43001]={
-
+		["value"]="Initial"
 	},
 	[43002]={
-
+		["value"]="Initial"
 	},
 	[44001]={
-
+		["value"]="Initial"
 	},
 	[44002]={
-
+		["value"]="Initial"
 	},
 	[44003]={
-
+		["value"]="Initial"
 	},
 	[52001]={
-
+		["value"]="Initial"
 	},
 	[53001]={
-
+		["value"]="Initial"
 	},
 	[5300101]={
-
+		["value"]="Little Red Riding Hood"
 	},
 	[53002]={
-
+		["value"]="Initial"
 	},
 	[54001]={
-
+		["value"]="Initial"
 	},
 	[5400101]={
-
+		["value"]="Graceful Dance"
 	},
 	[54002]={
-
+		["value"]="Initial"
 	},
 	[54003]={
-
+		["value"]="Initial"
 	}
 }
 local config = {

lua/app/config/strings/es/activity_bounty_task.lua

@@ -1,6 +1,6 @@
 local activity_bounty_task = {
 	[1]={
-		["desc"]="Dias de login acumulados"
+		["desc"]="Días de login acumulados"
 	},
 	[2]={
 		["desc"]="Anuncios vistos"
@@ -12,7 +12,7 @@ local activity_bounty_task = {
 		["desc"]="Mata al jefe"
 	},
 	[5]={
-		["desc"]="Desafios da Arena"
+		["desc"]="Desafíos de Arena"
 	},
 	[6]={
 		["desc"]="Ondas de combates completadas"

lua/app/config/strings/es/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="Genio de Médico Antiguo"
 	},
 	[20044]={
-
+		["name"]="Jefe Tiburón"
 	},
 	[20045]={
-
+		["name"]="Oscuridad"
 	},
 	[20046]={
-
+		["name"]="Cangrejo Fluorescente"
 	},
 	[20047]={
-
+		["name"]="Rey del Mar"
 	},
 	[20048]={
-
+		["name"]="Guardián de Reliquia"
 	},
 	[30001]={
 		["name"]="Cabeza de Cebolla"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="Danza de Meteoro: aumenta el daño y causa un golpe adicional de enorme daño de habilidad."
 	},
 	[3400220]={
-		["desc"]="Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar <color=#3cff28><color=#fcb501><u>Dormido</u></color></color> durante <color=#3cff28>2</color> rondas."
+		["desc"]="Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar <color=#3cff28><color=#fcb501><u>Dormido</u></color> durante <color=#3cff28>2</color> rondas."
 	},
 	[4200120]={
 		["desc"]="Enlace de Elementos: elimina <color=#3cff28>3</color> elementos aleatorios y causa un daño de habilidad."
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="Mordedura Fatal: causa daño de habilidad adicional varias veces, y elimina aleatoriamente <color=#3cff28>3</color> elementos."
 	},
 	[4400320]={
-		["desc"]="Rueda Lunar Giratoria: causa daño de habilidad adicional varias veces, con un <color=#3cff28>50%</color> de chance de aplicar <color=#3cff28><u>Congelado</u></color></color> durante < color=#3cff28>1</color> ronda."
+		["desc"]="Rueda Lunar Giratoria: causa daño de habilidad adicional varias veces, con un <color=#3cff28>50%</color> de chance de aplicar <color=#3cff28><u>Congelado</u></color> durante <color=#3cff28>1</color> ronda."
 	},
 	[5400320]={
 		["desc"]="Espada Caída: causa un masivo daño de habilidad adicional, con efecto de <color=#fcb501><u>Corrupto</u></color> durante <color=#3cff28>1</color> ronda."

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="Gatillo Infernal puede restaurar una cierta cantidad de HP."
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>: el ATQ común de Pish aumenta el daño extra a enemigos <color=#3cff28>débiles</color>."
+		["desc"]="<color=#fcff28>Combo</color>: el ATQ común de Sirviente Diablo aumenta el daño extra a enemigos <color=#3cff28>débiles</color>."
 	},
 	[1400303]={
 		["desc"]="Aumenta el efecto Vulnerabilidad de Gatillo Infernal."
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>: Al lanzar ATQ común a enemigos <color=#3cff28>vulnerables</color>, Pish restaura su HP."
+		["desc"]="<color=#fcff28>Combo</color>: Al lanzar ATQ común a enemigos <color=#3cff28>vulnerables</color>, Sirviente Diablo restaura su HP."
 	},
 	[1400305]={
 		["desc"]="Al usar Gatillo Infernal, se aplica <color=#3cff28>Resucitación</color> al equipo durante 1 ronda."
 	},
 	[1400306]={
-		["desc"]="Ataque de Pish aumenta un <color=#3cff28>15%</color>."
+		["desc"]="Ataque de Sirviente Diablo aumenta un <color=#3cff28>15%</color>."
 	},
 	[1400307]={
 		["desc"]="Aumenta el efecto <color=#3cff28>Resucitación</color> aplicado por Gatillo Infernal, y dura <color=#3cff28>+1</color> ronda."
@@ -804,7 +804,7 @@ local skill_rogue = {
 		["desc"]="Aumenta el efecto <color=#3cff28>Daño Reflexivo</color> aplicado por Mordedura Fatal."
 	},
 	[4400300]={
-		["desc"]="Desbloquea Rueda Lunar Giratoria: causa daño de habilidad adicional varias veces, con un <color=#3cff28>50%</color> de chance de aplicar <color=#3cff28><u>Congelado</u></color></color> durante < color=#3cff28>1</color> ronda."
+		["desc"]="Desbloquea Rueda Lunar Giratoria: causa daño de habilidad adicional varias veces, con un <color=#3cff28>50%</color> de chance de aplicar <color=#3cff28><u>Congelado</u></color> durante <color=#3cff28>1</color> ronda."
 	},
 	[4400301]={
 		["desc"]="Rueda Lunar Giratoria elimina <color=#3cff28>4</color> bloques extras verticalmente."

lua/app/config/strings/es/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="Inicial"
 	},
 	[13001]={
-
+		["value"]="Inicial"
 	},
 	[13002]={
-
+		["value"]="Inicial"
 	},
 	[14001]={
-
+		["value"]="Inicial"
 	},
 	[14002]={
-
+		["value"]="Inicial"
 	},
 	[1400201]={
-
+		["value"]="Rey de Playa"
 	},
 	[14003]={
-
+		["value"]="Inicial"
 	},
 	[22001]={
-
+		["value"]="Inicial"
 	},
 	[23001]={
-
+		["value"]="Inicial"
 	},
 	[23002]={
-
+		["value"]="Inicial"
 	},
 	[24001]={
-
+		["value"]="Inicial"
 	},
 	[24002]={
-
+		["value"]="Inicial"
 	},
 	[24003]={
-
+		["value"]="Inicial"
 	},
 	[32001]={
-
+		["value"]="Inicial"
 	},
 	[33001]={
-
+		["value"]="Inicial"
 	},
 	[33002]={
-
+		["value"]="Inicial"
 	},
 	[34001]={
-
+		["value"]="Inicial"
 	},
 	[3400101]={
-
+		["value"]="Sol y Rocío"
 	},
 	[34002]={
-
+		["value"]="Inicial"
 	},
 	[34003]={
-
+		["value"]="Inicial"
 	},
 	[42001]={
-
+		["value"]="Inicial"
 	},
 	[43001]={
-
+		["value"]="Inicial"
 	},
 	[43002]={
-
+		["value"]="Inicial"
 	},
 	[44001]={
-
+		["value"]="Inicial"
 	},
 	[44002]={
-
+		["value"]="Inicial"
 	},
 	[44003]={
-
+		["value"]="Inicial"
 	},
 	[52001]={
-
+		["value"]="Inicial"
 	},
 	[53001]={
-
+		["value"]="Inicial"
 	},
 	[5300101]={
-
+		["value"]="Caperucita Roja"
 	},
 	[53002]={
-
+		["value"]="Inicial"
 	},
 	[54001]={
-
+		["value"]="Inicial"
 	},
 	[5400101]={
-
+		["value"]="Danza Elegante"
 	},
 	[54002]={
-
+		["value"]="Inicial"
 	},
 	[54003]={
-
+		["value"]="Inicial"
 	}
 }
 local config = {

lua/app/config/strings/id/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="Lumen Dokter Kuno"
 	},
 	[20044]={
-
+		["name"]="Pemimpin Hiu"
 	},
 	[20045]={
-
+		["name"]="Remang"
 	},
 	[20046]={
-
+		["name"]="Kepiting Laut Bercahaya"
 	},
 	[20047]={
-
+		["name"]="Raja Laut"
 	},
 	[20048]={
-
+		["name"]="Penjaga Relik"
 	},
 	[30001]={
 		["name"]="Kepala Bawang"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="Pemburu Bulan: Meningkatkan DMG dan memberikan DMG skill yang besar sekali."
 	},
 	[3400220]={
-		["desc"]="Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28><color=#fcb501><u>Kantuk</u></color></color> selama <color=#3cff28>2</color> giliran."
+		["desc"]="Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28><color=#fcb501><u>Kantuk</u></color> selama <color=#3cff28>2</color> giliran."
 	},
 	[4200120]={
 		["desc"]="Link Elemen: Menghilangkan <color=#3cff28>3</color> elemen secara acak dan memberikan DMG skill."

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="Pemicu Api Neraka dapat memulihkan HP."
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>: ATK normal Bayangan Samurai memberikan peningkatan DMG pada musuh yang <color=#3cff28>lemah</color>."
+		["desc"]="<color=#fcff28>Combo</color>: ATK normal Pelayan Demon memberikan peningkatan DMG pada musuh yang <color=#3cff28>lemah</color>."
 	},
 	[1400303]={
 		["desc"]="Efek rentan dari Pemicu Api Neraka meningkat."
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>: ATK normal Bayangan Samurai pada musuh <color=#3cff28>rentan</color> akan memulihkan HP-nya."
+		["desc"]="<color=#fcff28>Combo</color>: ATK normal Pelayan Demon pada musuh <color=#3cff28>rentan</color> akan memulihkan HP-nya."
 	},
 	[1400305]={
 		["desc"]="Pemicu Api Neraka akan memberikan <color=#3cff28>Lahir Kembali</color> kepada tim selama 1 giliran."
 	},
 	[1400306]={
-		["desc"]="ATK Bayangan Samurai meningkat <color=#3cff28>15%</color>."
+		["desc"]="ATK Pelayan Demon meningkat <color=#3cff28>15%</color>."
 	},
 	[1400307]={
 		["desc"]="<color=#3cff28>Lahir Kembali</color> efek Pemicu Api Neraka meningkat dan berlangsung selama +<color=#3cff28>1</color> giliran."

lua/app/config/strings/id/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="Awal"
 	},
 	[13001]={
-
+		["value"]="Awal"
 	},
 	[13002]={
-
+		["value"]="Awal"
 	},
 	[14001]={
-
+		["value"]="Awal"
 	},
 	[14002]={
-
+		["value"]="Awal"
 	},
 	[1400201]={
-
+		["value"]="Juara Pantai"
 	},
 	[14003]={
-
+		["value"]="Awal"
 	},
 	[22001]={
-
+		["value"]="Awal"
 	},
 	[23001]={
-
+		["value"]="Awal"
 	},
 	[23002]={
-
+		["value"]="Awal"
 	},
 	[24001]={
-
+		["value"]="Awal"
 	},
 	[24002]={
-
+		["value"]="Awal"
 	},
 	[24003]={
-
+		["value"]="Awal"
 	},
 	[32001]={
-
+		["value"]="Awal"
 	},
 	[33001]={
-
+		["value"]="Awal"
 	},
 	[33002]={
-
+		["value"]="Awal"
 	},
 	[34001]={
-
+		["value"]="Awal"
 	},
 	[3400101]={
-
+		["value"]="Embun Matahari Pagi"
 	},
 	[34002]={
-
+		["value"]="Awal"
 	},
 	[34003]={
-
+		["value"]="Awal"
 	},
 	[42001]={
-
+		["value"]="Awal"
 	},
 	[43001]={
-
+		["value"]="Awal"
 	},
 	[43002]={
-
+		["value"]="Awal"
 	},
 	[44001]={
-
+		["value"]="Awal"
 	},
 	[44002]={
-
+		["value"]="Awal"
 	},
 	[44003]={
-
+		["value"]="Awal"
 	},
 	[52001]={
-
+		["value"]="Awal"
 	},
 	[53001]={
-
+		["value"]="Awal"
 	},
 	[5300101]={
-
+		["value"]="Tudung Merah"
 	},
 	[53002]={
-
+		["value"]="Awal"
 	},
 	[54001]={
-
+		["value"]="Awal"
 	},
 	[5400101]={
-
+		["value"]="Tarian Anggun"
 	},
 	[54002]={
-
+		["value"]="Awal"
 	},
 	[54003]={
-
+		["value"]="Awal"
 	}
 }
 local config = {

lua/app/config/strings/ja/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="医者の魔神"
 	},
 	[20044]={
-
+		["name"]="サメリーダー"
 	},
 	[20045]={
-
+		["name"]="ディムネス"
 	},
 	[20046]={
-
+		["name"]="蛍光海ガニ"
 	},
 	[20047]={
-
+		["name"]="海の王"
 	},
 	[20048]={
-
+		["name"]="遺跡の守護者"
 	},
 	[30001]={
 		["name"]="タマネギ"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="ムーンチェイサー：発動するターンダメージがアップ、特⼤ダメージを与えるスキルを1回発動する。"
 	},
 	[3400220]={
-		["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>2</color>ターン<color=#3cff28><color=#fcb501><u>昏睡</u></color></color>効果を付与する。"
+		["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>2</color>ターン<color=#3cff28><color=#fcb501><u>昏睡</u></color>効果を付与する。"
 	},
 	[4200120]={
 		["desc"]="元素連接：ランダムで<color=#3cff28>3</color>つの元素を消し、スキルを1回発動する。"
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="リーサルバイト：追加でスキルを複数回発動し、ランダムで<color=#3cff28>3</color>つの元素を消す。"
 	},
 	[4400320]={
-		["desc"]="回転チャクラム：追加でスキルを複数回発動し、<color=#3cff28>50%</color>の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28><u>凍結</u></color></color>効果を付与する。"
+		["desc"]="回転チャクラム：追加でスキルを複数回発動し、<color=#3cff28>50%</color>の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28><u>凍結</u></color>効果を付与する。"
 	},
 	[5400320]={
 		["desc"]="堕落の剣：追加で大ダメージを与えるスキルを1回発動し、敵に<color=#3cff28>1</color>ターン<color=#3cff28><u>腐敗</u></color>効果を付与する。"

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="「煉獄のトリガー」は一定量のHPを回復する。"
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>ヒット</color>:「影の侍の通常攻撃」は<color=#3cff28>弱体</color>状態の敵に与えるダメージが増加する。"
+		["desc"]="<color=#fcff28>ヒット</color>:「デビルウェイターの通常攻撃」は<color=#3cff28>弱体</color>状態の敵に与えるダメージが増加する。"
 	},
 	[1400303]={
 		["desc"]="「煉獄のトリガー」が付与する被ダメージアップ効果が上がる。"
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>ヒット</color>:「影の侍の通常攻撃」は<color=#3cff28>被ダメージアップ</color>状態の敵を攻撃する時、自身のHPを回復する。"
+		["desc"]="<color=#fcff28>ヒット</color>:「デビルウェイターの通常攻撃」は<color=#3cff28>被ダメージアップ</color>状態の敵を攻撃する時、自身のHPを回復する。"
 	},
 	[1400305]={
 		["desc"]="「煉獄のトリガー」は全員に1ターン<color=#3cff28>再生</color>効果を付与する。"
 	},
 	[1400306]={
-		["desc"]="影の侍の攻撃が<color=#3cff28>15%</color>アップ。"
+		["desc"]="デビルウェイターの攻撃が<color=#3cff28>15%</color>アップ。"
 	},
 	[1400307]={
 		["desc"]="「煉獄のトリガー」の<color=#3cff28>再生</color>効果の回復能力が上がり、ターン数が<color=#3cff28>+1</color>。"

lua/app/config/strings/ja/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="デフォルト"
 	},
 	[13001]={
-
+		["value"]="デフォルト"
 	},
 	[13002]={
-
+		["value"]="デフォルト"
 	},
 	[14001]={
-
+		["value"]="デフォルト"
 	},
 	[14002]={
-
+		["value"]="デフォルト"
 	},
 	[1400201]={
-
+		["value"]="ビーチチャンピオン"
 	},
 	[14003]={
-
+		["value"]="デフォルト"
 	},
 	[22001]={
-
+		["value"]="デフォルト"
 	},
 	[23001]={
-
+		["value"]="デフォルト"
 	},
 	[23002]={
-
+		["value"]="デフォルト"
 	},
 	[24001]={
-
+		["value"]="デフォルト"
 	},
 	[24002]={
-
+		["value"]="デフォルト"
 	},
 	[24003]={
-
+		["value"]="デフォルト"
 	},
 	[32001]={
-
+		["value"]="デフォルト"
 	},
 	[33001]={
-
+		["value"]="デフォルト"
 	},
 	[33002]={
-
+		["value"]="デフォルト"
 	},
 	[34001]={
-
+		["value"]="デフォルト"
 	},
 	[3400101]={
-
+		["value"]="輝く朝露"
 	},
 	[34002]={
-
+		["value"]="デフォルト"
 	},
 	[34003]={
-
+		["value"]="デフォルト"
 	},
 	[42001]={
-
+		["value"]="デフォルト"
 	},
 	[43001]={
-
+		["value"]="デフォルト"
 	},
 	[43002]={
-
+		["value"]="デフォルト"
 	},
 	[44001]={
-
+		["value"]="デフォルト"
 	},
 	[44002]={
-
+		["value"]="デフォルト"
 	},
 	[44003]={
-
+		["value"]="デフォルト"
 	},
 	[52001]={
-
+		["value"]="デフォルト"
 	},
 	[53001]={
-
+		["value"]="デフォルト"
 	},
 	[5300101]={
-
+		["value"]="赤ずきん"
 	},
 	[53002]={
-
+		["value"]="デフォルト"
 	},
 	[54001]={
-
+		["value"]="デフォルト"
 	},
 	[5400101]={
-
+		["value"]="グレイスフルダンス"
 	},
 	[54002]={
-
+		["value"]="デフォルト"
 	},
 	[54003]={
-
+		["value"]="デフォルト"
 	}
 }
 local config = {

lua/app/config/strings/ko/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="고대 의학 램프 정령"
 	},
 	[20044]={
-
+		["name"]="상어 두목"
 	},
 	[20045]={
-
+		["name"]="어둠의 이더"
 	},
 	[20046]={
-
+		["name"]="형광 꽃게"
 	},
 	[20047]={
-
+		["name"]="바다의 왕"
 	},
 	[20048]={
-
+		["name"]="유적 수호자"
 	},
 	[30001]={
 		["name"]="양파 헤드"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="유성과 달의 숨바꼭질: 사용 후, 이번 공격 대미지가 상승하며 엄청난 양의 스킬 피해를 한 번 입힙니다."
 	},
 	[3400220]={
-		["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>2</color>턴 동안 <color=#3cff28><color=#fcb501><u> 수면</u></color></color> 효과를 부여합니다."
+		["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>2</color>턴 동안 <color=#3cff28><color=#fcb501><u>수면</u></color> 효과를 부여합니다."
 	},
 	[4200120]={
 		["desc"]="원소 연결: 무작위로 <color=#3cff28>3</color>개의 원소를 소멸하고 스킬 피해를 한 번 입힙니다."
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="필사적인 물기: 추가로 여러 번 스킬 피해를 입히는 동시에 무작위로 <color=#3cff28>3</color>개의 원소를 소멸합니다."
 	},
 	[4400320]={
-		["desc"]="회전 달 바퀴: 추가로 여러 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 <color=#3cff28>50%</color> 확률로 <color=#3cff28><u>동결</u></color></color>효과를 부여합니다."
+		["desc"]="회전 달 바퀴: 추가로 여러 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 <color=#3cff28>50%</color> 확률로 <color=#3cff28><u>동결</u></color>효과를 부여합니다."
 	},
 	[5400320]={
 		["desc"]="타락한 검: 추가로 대량의 스킬 피해를 한 번 입히며 <color=#3cff28>1</color>턴 동안 <color=#3cff28><u>부패</u></color> 효과를 부여합니다."

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="연옥의 트리거는 일정한 HP를 회복시킬 수 있습니다."
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>: 피스의 일반 공격이 <color=#3cff28>탈진 상태</color>의 적에게 추가 피해를 입힙니다."
+		["desc"]="<color=#fcff28>Combo</color>: 악마 시종의 일반공격은 <color=#3cff28>탈진한</color> 적에게 추가 피해를 줍니다."
 	},
 	[1400303]={
 		["desc"]="연옥의 트리거가 부여하는 부상 효과가 강화됩니다."
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>: 피스가 <color=#3cff28>부상 상태</color>의 적에게 일반 공격을 가하면 HP를 회복합니다."
+		["desc"]="<color=#fcff28>Combo</color>:악마 시종이 <color=#3cff28>부상 상태</color>인 적에게 일반 공격을 가하면 HP를 회복합니다."
 	},
 	[1400305]={
 		["desc"]="연옥의 트리거를 사용하면 1턴 동안 팀에게 <color=#3cff28>부활</color> 효과를 부여합니다."
 	},
 	[1400306]={
-		["desc"]="피스의 공격력이 <color=#3cff28>15%</color> 상승합니다."
+		["desc"]="악마 시종의 공격력이 <color=#3cff28>15%</color> 증가합니다."
 	},
 	[1400307]={
 		["desc"]="연옥의 트리거가 부여한 <color=#3cff28>부활</color> 효과 회복 능력이 강화되는 턴 횟수 <color=#3cff28>+1</color>"

lua/app/config/strings/ko/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="초기"
 	},
 	[13001]={
-
+		["value"]="초기"
 	},
 	[13002]={
-
+		["value"]="초기"
 	},
 	[14001]={
-
+		["value"]="초기"
 	},
 	[14002]={
-
+		["value"]="초기"
 	},
 	[1400201]={
-
+		["value"]="해변의 왕자"
 	},
 	[14003]={
-
+		["value"]="초기"
 	},
 	[22001]={
-
+		["value"]="초기"
 	},
 	[23001]={
-
+		["value"]="초기"
 	},
 	[23002]={
-
+		["value"]="초기"
 	},
 	[24001]={
-
+		["value"]="초기"
 	},
 	[24002]={
-
+		["value"]="초기"
 	},
 	[24003]={
-
+		["value"]="초기"
 	},
 	[32001]={
-
+		["value"]="초기"
 	},
 	[33001]={
-
+		["value"]="초기"
 	},
 	[33002]={
-
+		["value"]="초기"
 	},
 	[34001]={
-
+		["value"]="초기"
 	},
 	[3400101]={
-
+		["value"]="반짝이는 아침 이슬"
 	},
 	[34002]={
-
+		["value"]="초기"
 	},
 	[34003]={
-
+		["value"]="초기"
 	},
 	[42001]={
-
+		["value"]="초기"
 	},
 	[43001]={
-
+		["value"]="초기"
 	},
 	[43002]={
-
+		["value"]="초기"
 	},
 	[44001]={
-
+		["value"]="초기"
 	},
 	[44002]={
-
+		["value"]="초기"
 	},
 	[44003]={
-
+		["value"]="초기"
 	},
 	[52001]={
-
+		["value"]="초기"
 	},
 	[53001]={
-
+		["value"]="초기"
 	},
 	[5300101]={
-
+		["value"]="빨간 망토"
 	},
 	[53002]={
-
+		["value"]="초기"
 	},
 	[54001]={
-
+		["value"]="초기"
 	},
 	[5400101]={
-
+		["value"]="날아오르는 춤"
 	},
 	[54002]={
-
+		["value"]="초기"
 	},
 	[54003]={
-
+		["value"]="초기"
 	}
 }
 local config = {

lua/app/config/strings/pt/activity_bounty_task.lua

@@ -1,6 +1,6 @@
 local activity_bounty_task = {
 	[1]={
-		["desc"]="จำนวนวันที่สะสมลงชื่อ"
+		["desc"]="Dias de login acumulados"
 	},
 	[2]={
 		["desc"]="Anúncios visualizados"
@@ -12,7 +12,7 @@ local activity_bounty_task = {
 		["desc"]="Derrote o chefão"
 	},
 	[5]={
-		["desc"]="จำนวนท้าทายอารีน่า"
+		["desc"]="Desafios da Arena"
 	},
 	[6]={
 		["desc"]="Ondas de combates concluídas"

lua/app/config/strings/pt/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="Gênio Antigo Médico"
 	},
 	[20044]={
-
+		["name"]="Líder dos Tubarões"
 	},
 	[20045]={
-
+		["name"]="Escuridão Virtuosa"
 	},
 	[20046]={
-
+		["name"]="Caranguejo Fluorescente"
 	},
 	[20047]={
-
+		["name"]="Rei do Mar"
 	},
 	[20048]={
-
+		["name"]="Guardião das Ruínas"
 	},
 	[30001]={
 		["name"]="Cabeça de Cebola"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="Disparada do Meteoro: aumenta o dano causado no turno atual e causa um golpe de enorme dano de habilidade."
 	},
 	[3400220]={
-		["desc"]="Pesadelo da Beleza: causa adicionalmente um golpe de habilidade massivo com 50% de chance de acionar o efeito de <color=#3cff28><color=#fcb501><u>Sonolento</u></color></color> que dura <color=#3cff28>2</color> turnos."
+		["desc"]="Pesadelo da Beleza: causa adicionalmente um golpe de habilidade massivo com 50% de chance de acionar o efeito de <color=#3cff28><color=#fcb501><u>Sonolento</u></color> que dura <color=#3cff28>2</color> turnos."
 	},
 	[4200120]={
 		["desc"]="Elo Elemental: elimina <color=#3cff28>3</color> elementos aleatórios e causa um golpe de dano de habilidade."
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="Mordida Desesperada: causa dano de habilidade extra várias vezes e elimina aleatoriamente <color=#3cff28>3</color> elementos."
 	},
 	[4400320]={
-		["desc"]="Roda Lunar Giratória: Causa dano de habilidade extra várias vezes, com uma probabilidade de <color=#3cff28>50%</color> de efeito de <color=#3cff28><u>congelamento</u></color></color> por < color=#3cff28>1</color> rodada."
+		["desc"]="Roda Lunar Giratória: Causa dano de habilidade extra várias vezes, com uma probabilidade de <color=#3cff28>50%</color> de efeito de <color=#3cff28><u>congelamento</u></color> por <color=#3cff28>1</color> rodada."
 	},
 	[5400320]={
 		["desc"]="Espada Corrompida: Causa uma grande quantidade de dano de habilidade, adiciona efeito de <color=#3cff28><u>corrupção</u></color> por <color=#3cff28>1</color> rodada."

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="O Gatilho do Purgatório pode restaurar uma certa quantidade de vida."
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>: o ataque básico de Pish serve para aumentar o dano extra a inimigos <color=#3cff28>fracos</color>."
+		["desc"]="<color=#fcff28>Combo</color>: o ataque básico do Serviçal do Demônio serve para aumentar o dano extra a inimigos <color=#3cff28>fracos</color>."
 	},
 	[1400303]={
 		["desc"]="A vulnerabilidade inerente ao Gatilho do Purgatório foi aumentada."
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>: o ataque básico de Pish serve causa dano extra a inimigos <color=#3cff28>vulneráveis</color>."
+		["desc"]="<color=#fcff28>Combo</color>: o ataque básico do Serviçal do Demônio causa dano extra a inimigos <color=#3cff28>vulneráveis</color>."
 	},
 	[1400305]={
 		["desc"]="O Gatilho do Purgatório concede um efeito de <color=#3cff28>renascimento</color> à equipe que dura 1 turno."
 	},
 	[1400306]={
-		["desc"]="Aumenta o Ataque de Pish em <color=#3cff28>15%</color>."
+		["desc"]="Aumenta o Ataque do Serviçal do Demônio em <color=#3cff28>15%</color>."
 	},
 	[1400307]={
 		["desc"]="Duração do <color=#3cff28>renascimento</color> acionado pelo Gatilho do Purgatório aumenta <color=#3cff28>+1</color> turno."
@@ -783,7 +783,7 @@ local skill_rogue = {
 		["desc"]="Desbloqueou Mordida Desesperada: causa dano de habilidade extra várias vezes e elimina aleatoriamente <color=#3cff28>3</color> elementos."
 	},
 	[3400301]={
-		["desc"]="A Mordida Desesperada pode anexar um efeito de <color=#3cff28>sangramento</cor> por <color=#3cff28>2</cor> turnos."
+		["desc"]="A Mordida Desesperada pode anexar um efeito de <color=#3cff28>sangramento</color> por <color=#3cff28>2</color> turnos."
 	},
 	[3400302]={
 		["desc"]="Os elementos eliminados pela Mordida Desesperada fornecem energia de habilidade*<color=#3cff28>2</color>."

lua/app/config/strings/pt/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="Inicial"
 	},
 	[13001]={
-
+		["value"]="Inicial"
 	},
 	[13002]={
-
+		["value"]="Inicial"
 	},
 	[14001]={
-
+		["value"]="Inicial"
 	},
 	[14002]={
-
+		["value"]="Inicial"
 	},
 	[1400201]={
-
+		["value"]="Rei da Praia"
 	},
 	[14003]={
-
+		["value"]="Inicial"
 	},
 	[22001]={
-
+		["value"]="Inicial"
 	},
 	[23001]={
-
+		["value"]="Inicial"
 	},
 	[23002]={
-
+		["value"]="Inicial"
 	},
 	[24001]={
-
+		["value"]="Inicial"
 	},
 	[24002]={
-
+		["value"]="Inicial"
 	},
 	[24003]={
-
+		["value"]="Inicial"
 	},
 	[32001]={
-
+		["value"]="Inicial"
 	},
 	[33001]={
-
+		["value"]="Inicial"
 	},
 	[33002]={
-
+		["value"]="Inicial"
 	},
 	[34001]={
-
+		["value"]="Inicial"
 	},
 	[3400101]={
-
+		["value"]="Sol e Orvalho"
 	},
 	[34002]={
-
+		["value"]="Inicial"
 	},
 	[34003]={
-
+		["value"]="Inicial"
 	},
 	[42001]={
-
+		["value"]="Inicial"
 	},
 	[43001]={
-
+		["value"]="Inicial"
 	},
 	[43002]={
-
+		["value"]="Inicial"
 	},
 	[44001]={
-
+		["value"]="Inicial"
 	},
 	[44002]={
-
+		["value"]="Inicial"
 	},
 	[44003]={
-
+		["value"]="Inicial"
 	},
 	[52001]={
-
+		["value"]="Inicial"
 	},
 	[53001]={
-
+		["value"]="Inicial"
 	},
 	[5300101]={
-
+		["value"]="Chapeuzinho Vermelho"
 	},
 	[53002]={
-
+		["value"]="Inicial"
 	},
 	[54001]={
-
+		["value"]="Inicial"
 	},
 	[5400101]={
-
+		["value"]="Dança Fluida"
 	},
 	[54002]={
-
+		["value"]="Inicial"
 	},
 	[54003]={
-
+		["value"]="Inicial"
 	}
 }
 local config = {

lua/app/config/strings/th/activity_bounty_task.lua

@@ -1,6 +1,6 @@
 local activity_bounty_task = {
 	[1]={
-		["desc"]="Días de login acumulados"
+		["desc"]="จำนวนวันที่สะสมลงชื่อ"
 	},
 	[2]={
 		["desc"]="สะสมดูโฆษณา"
@@ -12,7 +12,7 @@ local activity_bounty_task = {
 		["desc"]="สังหารบอส"
 	},
 	[5]={
-		["desc"]="Desafíos de Arena"
+		["desc"]="จำนวนท้าทายอารีน่า"
 	},
 	[6]={
 		["desc"]="จำนวนผ่านรอบการต่อสู้"

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

@@ -79,7 +79,7 @@ local buff = {
 		["id"]=49,
 		["show_name"]="เปราะบาง",
 		["desc"]="เปราะบาง: ดาเมจทั้งหมดที่ได้รับเพิ่มขึ้น<color=#3cff28>{0}</color>",
-		["tips_desc"]="อ่อนแอ: ดาเมจที่ได้รับทั้งหมดเพิ่มขึ้น",
+		["tips_desc"]="เปราะบาง: ดาเมจที่ได้รับทั้งหมดเพิ่มขึ้น",
 		["name"]="vulnerable"
 	},
 	[50]={

lua/app/config/strings/th/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="วิญญาณตะเกียงยาโบราณ"
 	},
 	[20044]={
-
+		["name"]="หัวหน้าฉลาม"
 	},
 	[20045]={
-
+		["name"]="อนธการ"
 	},
 	[20046]={
-
+		["name"]="ปูเรืองแสง"
 	},
 	[20047]={
-
+		["name"]="จ้าวสมุทร"
 	},
 	[20048]={
-
+		["name"]="ผู้พิทักษ์ซากโบราณ"
 	},
 	[30001]={
 		["name"]="หัวหอม"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="ดาวตกไล่ดวงจันทร์: ดาเมจครั้งนี้จะเพิ่มขึ้นหลังจากการใช้ และสร้างดาเมจสกิลมหาศาล 1 ครั้ง"
 	},
 	[3400220]={
-		["desc"]="ฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์<color=#3cff28><color=#fcb501><u>หลับ</u></color></color> <color=#3cff28>2</color>รอบ"
+		["desc"]="ฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์<color=#3cff28><color=#fcb501><u>หลับ</u></color> <color=#3cff28>2</color>รอบ"
 	},
 	[4200120]={
 		["desc"]="การเชื่อมโยงธาตุ: สุ่มกำจัดธาตุ<color=#3cff28>3</color>อัน และสร้างดาเมจสกิล 1 ครั้ง"
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="ขย้ำดับชีพ: สร้างดาเมจสกิลเพิ่มเติมหลายครั้ง และสุ่มกำจัด <color=#3cff28>3</color> ธาตุ"
 	},
 	[4400320]={
-		["desc"]="กงจันทร์หมุน: สร้างดาเมจสกิลเพิ่มเติมหลายครั้ง มีโอกาส <color=#3cff28>50%</color> ที่จะเพิ่มเอฟเฟกต์ <color=#3cff28><u>แช่แข็ง</u></color></color> <color=#3cff28>1</color> รอบ"
+		["desc"]="กงจันทร์หมุน: สร้างดาเมจสกิลเพิ่มเติมหลายครั้ง มีโอกาส <color=#3cff28>50%</color> ที่จะเพิ่มเอฟเฟกต์ <color=#3cff28><u>แช่แข็ง</u></color> <color=#3cff28>1</color> รอบ"
 	},
 	[5400320]={
 		["desc"]="ดาบร่วงหล่น: สร้างดาเมจสกิลมหาศาลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์<color=#3cff28><u>ทุจริต</u></color><color=#3cff28>1</color> รอบ"

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="ปืนไฟนรกสามารถฟื้นฟู HP ที่จำนวนจำกัดได้"
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>: การโจมตีทั่วไปของพิชสร้างดาเมจเพิ่มเติมให้กับศัตรู<color=#3cff28>อ่อนแอ</color>"
+		["desc"]="<color=#fcff28>Combo</color>: การโจมตีทั่วไปของคนรับใช้ปีศาจสร้างดาเมจเพิ่มเติมให้กับศัตรู<color=#3cff28>อ่อนแอ</color>"
 	},
 	[1400303]={
 		["desc"]="เอฟเฟกต์เปราะบางที่เพิ่มโดยปืนไฟนรกเพิ่มขึ้น"
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>: การโจมตีทั่วไปของพิชโดนศัตรู<color=#3cff28>อ่อนแอ</color>จะฟื้นฟู HP"
+		["desc"]="<color=#fcff28>Combo</color>: การโจมตีทั่วไปของคนรับใช้ปีศาจโดนศัตรู<color=#3cff28>อ่อนแอ</color>จะฟื้นฟู HP"
 	},
 	[1400305]={
 		["desc"]="ปืนไฟนรกจะเพิ่มเอฟเฟกต์<color=#3cff28>เกิดใหม่</color>ให้กับทีม 1 รอบ"
 	},
 	[1400306]={
-		["desc"]="การโจมตีของพิชเพิ่มขึ้น <color=#3cff28>15%</color>"
+		["desc"]="การโจมตีของคนรับใช้ปีศาจเพิ่มขึ้น <color=#3cff28>15%</color>"
 	},
 	[1400307]={
 		["desc"]="พลังฟื้นฟูของเอฟเฟกต์<color=#3cff28>เกิดใหม่</color>ที่เพิ่มโดยปืนไฟนรกจะแข็งแกร่งขึ้น จำนวนรอบ<color=#3cff28>+1</color>"

lua/app/config/strings/th/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[13001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[13002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[14001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[14002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[1400201]={
-
+		["value"]="ราชาชายหาด"
 	},
 	[14003]={
-
+		["value"]="เริ่มต้น"
 	},
 	[22001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[23001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[23002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[24001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[24002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[24003]={
-
+		["value"]="เริ่มต้น"
 	},
 	[32001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[33001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[33002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[34001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[3400101]={
-
+		["value"]="น้ำค้างรุ่งสาง"
 	},
 	[34002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[34003]={
-
+		["value"]="เริ่มต้น"
 	},
 	[42001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[43001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[43002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[44001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[44002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[44003]={
-
+		["value"]="เริ่มต้น"
 	},
 	[52001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[53001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[5300101]={
-
+		["value"]="หนูน้อยหมวกแดง"
 	},
 	[53002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[54001]={
-
+		["value"]="เริ่มต้น"
 	},
 	[5400101]={
-
+		["value"]="เยื้องกรายเต้นรำ"
 	},
 	[54002]={
-
+		["value"]="เริ่มต้น"
 	},
 	[54003]={
-
+		["value"]="เริ่มต้น"
 	}
 }
 local config = {

lua/app/config/strings/vi/activity_bounty_task.lua

@@ -1,6 +1,6 @@
 local activity_bounty_task = {
 	[1]={
-		["desc"]="累積簽到天數"
+		["desc"]="Số ngày tích điểm danh"
 	},
 	[2]={
 		["desc"]="Tích xem quảng cáo"
@@ -12,7 +12,7 @@ local activity_bounty_task = {
 		["desc"]="Diệt BOSS"
 	},
 	[5]={
-		["desc"]="競技場挑戰次數"
+		["desc"]="Lượt k.chiến Đấu Trường"
 	},
 	[6]={
 		["desc"]="Thông qua đợt chiến đấu"

lua/app/config/strings/vi/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="Linh Đăng Cổ Y"
 	},
 	[20044]={
-
+		["name"]="Thủ Lĩnh Cá Mập"
 	},
 	[20045]={
-
+		["name"]="Dimness"
 	},
 	[20046]={
-
+		["name"]="Cua Biển Phát Sáng"
 	},
 	[20047]={
-
+		["name"]="Vua Biển Cả"
 	},
 	[20048]={
-
+		["name"]="Thủ Vệ Di Tích"
 	},
 	[30001]={
 		["name"]="Onion"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="Sao Băng Siêu Tốc: Dùng xong tăng sát thương lần này, 1 lần sát thương kỹ năng cực lớn."
 	},
 	[3400220]={
-		["desc"]="Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều ST kỹ năng, cos 50% kèm <color=#3cff28><color=#fcb501><u>Ngủ Say</u></color></color>, <color=#3cff28>2</color> hiệp."
+		["desc"]="Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều ST kỹ năng, cos 50% kèm <color=#3cff28><color=#fcb501><u>Ngủ Say</u></color>, <color=#3cff28>2</color> hiệp."
 	},
 	[4200120]={
 		["desc"]="Liên Kết Nguyên Tố: Ngẫu nhiên xua tan <color=#3cff28>3</color> Nguyên Tố, gây 1 lần sát thương kỹ năng."
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="Gặm Cắn Chí Mạng: Gây thêm nhiều lần sát thương kỹ năng, xua tan ngẫu nhiên <color=#3cff28>3</color> nguyên tố."
 	},
 	[4400320]={
-		["desc"]="Vầng Trăng Xoay Tròn: Gây thêm nhiều lần sát thương kỹ năng, có <color=#3cff28>50%</color> kèm <color=#3cff28><u>Đóng Băng</u></color></color>, <color=#3cff28>1</color> hiệp."
+		["desc"]="Vầng Trăng Xoay Tròn: Gây thêm nhiều lần sát thương kỹ năng, có <color=#3cff28>50%</color> kèm <color=#3cff28><u>Đóng Băng</u></color>, <color=#3cff28>1</color> hiệp."
 	},
 	[5400320]={
 		["desc"]="Kiếm Sa Đọa: Gây thêm 1 lần nhiều sát thương kỹ năng, kèm <color=#3cff28><u>Sa Đọa</u></color>, <color=#3cff28>1</color> hiệp."

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="Cò Súng Địa Ngục được hồi HP nhất định."
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>: Peace đánh thường gây thêm sát thương lên kẻ địch <color=#3cff28>Suy Yếu</color>."
+		["desc"]="<color=#fcff28>Combo</color>: Incubus đánh thường gây thêm sát thương lên kẻ địch <color=#3cff28>Suy Yếu</color>."
 	},
 	[1400303]={
 		["desc"]="Cò Súng Địa Ngục kèm tăng hiệu ứng Trọng Thương."
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>: Peace đánh thường kẻ địch <color=#3cff28>Trọng Thương</color> sẽ hồi HP."
+		["desc"]="<color=#fcff28>Combo</color>: Incubus đánh thường kẻ địch <color=#3cff28>Trọng Thương</color> sẽ hồi HP."
 	},
 	[1400305]={
 		["desc"]="Sau khi thi triển Cò Súng Địa Ngục sẽ giúp đội nhận hiệu quả <color=#3cff28>Trùng Sinh</color>, 1 hiệp."
 	},
 	[1400306]={
-		["desc"]="Peace tăng <color=#3cff28>15%</color> Công."
+		["desc"]="Incubus tăng <color=#3cff28>15%</color> Công."
 	},
 	[1400307]={
 		["desc"]="Tăng cường năng lực hồi phục của hiệu quả kèm <color=#3cff28>Trùng Sinh</color> của Cò Súng Địa Ngục, số hiệp <color=#3cff28>+1</color>."

lua/app/config/strings/vi/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="Ban Đầu"
 	},
 	[13001]={
-
+		["value"]="Ban Đầu"
 	},
 	[13002]={
-
+		["value"]="Ban Đầu"
 	},
 	[14001]={
-
+		["value"]="Ban Đầu"
 	},
 	[14002]={
-
+		["value"]="Ban Đầu"
 	},
 	[1400201]={
-
+		["value"]="Vua Bãi Biển"
 	},
 	[14003]={
-
+		["value"]="Ban Đầu"
 	},
 	[22001]={
-
+		["value"]="Ban Đầu"
 	},
 	[23001]={
-
+		["value"]="Ban Đầu"
 	},
 	[23002]={
-
+		["value"]="Ban Đầu"
 	},
 	[24001]={
-
+		["value"]="Ban Đầu"
 	},
 	[24002]={
-
+		["value"]="Ban Đầu"
 	},
 	[24003]={
-
+		["value"]="Ban Đầu"
 	},
 	[32001]={
-
+		["value"]="Ban Đầu"
 	},
 	[33001]={
-
+		["value"]="Ban Đầu"
 	},
 	[33002]={
-
+		["value"]="Ban Đầu"
 	},
 	[34001]={
-
+		["value"]="Ban Đầu"
 	},
 	[3400101]={
-
+		["value"]="Ánh Nắng Sương Sớm"
 	},
 	[34002]={
-
+		["value"]="Ban Đầu"
 	},
 	[34003]={
-
+		["value"]="Ban Đầu"
 	},
 	[42001]={
-
+		["value"]="Ban Đầu"
 	},
 	[43001]={
-
+		["value"]="Ban Đầu"
 	},
 	[43002]={
-
+		["value"]="Ban Đầu"
 	},
 	[44001]={
-
+		["value"]="Ban Đầu"
 	},
 	[44002]={
-
+		["value"]="Ban Đầu"
 	},
 	[44003]={
-
+		["value"]="Ban Đầu"
 	},
 	[52001]={
-
+		["value"]="Ban Đầu"
 	},
 	[53001]={
-
+		["value"]="Ban Đầu"
 	},
 	[5300101]={
-
+		["value"]="Cô bé quàng khăn đỏ"
 	},
 	[53002]={
-
+		["value"]="Ban Đầu"
 	},
 	[54001]={
-
+		["value"]="Ban Đầu"
 	},
 	[5400101]={
-
+		["value"]="Nhảy Múa Nhanh Nhẹn"
 	},
 	[54002]={
-
+		["value"]="Ban Đầu"
 	},
 	[54003]={
-
+		["value"]="Ban Đầu"
 	}
 }
 local config = {

lua/app/config/strings/zh/activity_bounty_task.lua

@@ -1,6 +1,6 @@
 local activity_bounty_task = {
 	[1]={
-		["desc"]="Số ngày tích điểm danh"
+		["desc"]="累積簽到天數"
 	},
 	[2]={
 		["desc"]="累積觀看廣告"
@@ -12,7 +12,7 @@ local activity_bounty_task = {
 		["desc"]="擊殺首領"
 	},
 	[5]={
-		["desc"]="Lượt k.chiến Đấu Trường"
+		["desc"]="競技場挑戰次數"
 	},
 	[6]={
 		["desc"]="完成戰鬥波次"

lua/app/config/strings/zh/monster_base.lua

@@ -303,19 +303,19 @@ local monster_base = {
 		["name"]="古醫燈靈"
 	},
 	[20044]={
-
+		["name"]="鯊魚頭領"
 	},
 	[20045]={
-
+		["name"]="黑暗一德"
 	},
 	[20046]={
-
+		["name"]="螢光海蟹"
 	},
 	[20047]={
-
+		["name"]="海之王"
 	},
 	[20048]={
-
+		["name"]="遺跡守護者"
 	},
 	[30001]={
 		["name"]="洋蔥頭"

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

@@ -42,7 +42,7 @@ local skill = {
 		["desc"]="流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。"
 	},
 	[3400220]={
-		["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color></color>效果，<color=#3cff28>2</color>回合。"
+		["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>2</color>回合。"
 	},
 	[4200120]={
 		["desc"]="元素連接：隨機消除<color=#3cff28>3</color>個元素，並造成一次技能傷害。"
@@ -84,7 +84,7 @@ local skill = {
 		["desc"]="絕命啃咬:額外造成數次技能傷害，並隨機消除<color=#3cff28>3</color>個元素。"
 	},
 	[4400320]={
-		["desc"]="旋轉月輪:額外造成數次技能傷害，<color=#3cff28>50%</color>機率附帶<color=#3cff28><u>凍結</u></color></color>效果，< color=#3cff28>1</color>回合。"
+		["desc"]="旋轉月輪:額外造成數次技能傷害，<color=#3cff28>50%</color>機率附帶<color=#3cff28><u>凍結</u></color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[5400320]={
 		["desc"]="墮落之劍:額外造成一次大量技能傷害，附帶<color=#3cff28><u>腐敗</u></color>效果，<color=#3cff28>1</color>回合。"

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

@@ -738,19 +738,19 @@ local skill_rogue = {
 		["desc"]="煉獄扳機可回復一定量生命。"
 	},
 	[1400302]={
-		["desc"]="<color=#fcff28>Combo</color>:皮侍普攻對<color=#3cff28>虛弱</color>敵人額外增傷。"
+		["desc"]="<color=#fcff28>Combo</color>:惡魔侍者普攻對<color=#3cff28>虛弱</color>敵人額外增傷。"
 	},
 	[1400303]={
 		["desc"]="煉獄扳機附帶的易傷效果提高。"
 	},
 	[1400304]={
-		["desc"]="<color=#fcff28>Combo</color>:皮侍普攻<color=#3cff28>易傷</color>敵人將回復生命。"
+		["desc"]="<color=#fcff28>Combo</color>:惡魔侍者普攻<color=#3cff28>易傷</color>敵人將回復生命。"
 	},
 	[1400305]={
 		["desc"]="煉獄扳機釋放後為團隊賦予<color=#3cff28>重生</color>效果，1回合。"
 	},
 	[1400306]={
-		["desc"]="皮侍攻擊提高<color=#3cff28>15%</color>。"
+		["desc"]="惡魔侍者攻擊提高<color=#3cff28>15%</color>。"
 	},
 	[1400307]={
 		["desc"]="煉獄扳機附帶的<color=#3cff28>重生</color>效果回復能力增強，回合數<color=#3cff28>+1</color>。"

lua/app/config/strings/zh/skin.lua

@@ -1,105 +1,105 @@
 local skin = {
 	[12001]={
-
+		["value"]="初始"
 	},
 	[13001]={
-
+		["value"]="初始"
 	},
 	[13002]={
-
+		["value"]="初始"
 	},
 	[14001]={
-
+		["value"]="初始"
 	},
 	[14002]={
-
+		["value"]="初始"
 	},
 	[1400201]={
-
+		["value"]="沙灘王者"
 	},
 	[14003]={
-
+		["value"]="初始"
 	},
 	[22001]={
-
+		["value"]="初始"
 	},
 	[23001]={
-
+		["value"]="初始"
 	},
 	[23002]={
-
+		["value"]="初始"
 	},
 	[24001]={
-
+		["value"]="初始"
 	},
 	[24002]={
-
+		["value"]="初始"
 	},
 	[24003]={
-
+		["value"]="初始"
 	},
 	[32001]={
-
+		["value"]="初始"
 	},
 	[33001]={
-
+		["value"]="初始"
 	},
 	[33002]={
-
+		["value"]="初始"
 	},
 	[34001]={
-
+		["value"]="初始"
 	},
 	[3400101]={
-
+		["value"]="驕陽晨露"
 	},
 	[34002]={
-
+		["value"]="初始"
 	},
 	[34003]={
-
+		["value"]="初始"
 	},
 	[42001]={
-
+		["value"]="初始"
 	},
 	[43001]={
-
+		["value"]="初始"
 	},
 	[43002]={
-
+		["value"]="初始"
 	},
 	[44001]={
-
+		["value"]="初始"
 	},
 	[44002]={
-
+		["value"]="初始"
 	},
 	[44003]={
-
+		["value"]="初始"
 	},
 	[52001]={
-
+		["value"]="初始"
 	},
 	[53001]={
-
+		["value"]="初始"
 	},
 	[5300101]={
-
+		["value"]="小紅帽"
 	},
 	[53002]={
-
+		["value"]="初始"
 	},
 	[54001]={
-
+		["value"]="初始"
 	},
 	[5400101]={
-
+		["value"]="翩然起舞"
 	},
 	[54002]={
-
+		["value"]="初始"
 	},
 	[54003]={
-
+		["value"]="初始"
 	}
 }
 local config = {

lua/app/module/activity/activity_manager.lua

@@ -71,6 +71,8 @@ end
 function ActivityManager:rspSummerTaskReward(result)
     if result.err_code == GConst.ERROR_STR.SUCCESS then
         DataManager.ActivityData:onReceivedTaskReward(result.reqData.id, result.stage, result.level, result.exp)
+
+        BIReport:postActOpt(BIReport.ACTIVITY_SUMMER.TASK_REWARD, DataManager.ActivityData:getActId(), DataManager.ActivityData:getBountyLevel(), DataManager.ActivityData:getBountyLevelScore(), 0)
     end
 end
 
@@ -114,6 +116,8 @@ end
 function ActivityManager:rspBuyBountyLevel(result)
     if result.err_code == GConst.ERROR_STR.SUCCESS then
         DataManager.ActivityData:onBoughtBountyLevel()
+
+        BIReport:postActOpt(BIReport.ACTIVITY_SUMMER.BUY_LEVEL_UP, DataManager.ActivityData:getActId(), DataManager.ActivityData:getBountyLevel(), DataManager.ActivityData:getBountyLevelScore(), DataManager.ActivityData:getBuyBountyLevelCost())
     end
 end
 

lua/app/module/login/login_ui.lua

@@ -30,7 +30,11 @@ function LoginUI:onLoadRootComplete()
 	local version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion()
 	self.versionTx:setText(I18N:getGlobalText(I18N.GlobalConst.APP) .. version)
 
-	uiMap["login_ui.logo"]:setLanguageSprite(GConst.ATLAS_PATH.UI_LOGIN, "login")
+	local logoObj = uiMap["login_ui.logo"]
+	logoObj:setVisible(false)
+	logoObj:setLanguageSprite(GConst.ATLAS_PATH.UI_LOGIN, "login", function()
+		logoObj:setVisible(true)
+	end)
 	self.progressTx = uiMap["login_ui.progress_tx"]
 	self.progressTx:setText("")
 	uiMap["login_ui.loading_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.LOADING_DESC))

lua/app/module/login/test_login_ui.lua

@@ -25,7 +25,11 @@ function TestLoginUI:onLoadRootComplete()
 	local version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion()
 	self.versionTx:setText(I18N:getGlobalText(I18N.GlobalConst.APP) .. version)
 
-	uiMap["test_login_ui.logo"]:setLanguageSprite(GConst.ATLAS_PATH.UI_LOGIN, "login")
+	local logoObj = uiMap["test_login_ui.logo"]
+	logoObj:setVisible(false)
+	logoObj:setLanguageSprite(GConst.ATLAS_PATH.UI_LOGIN, "login", function()
+		logoObj:setVisible(true)
+	end)
 	self.progressTx = uiMap["test_login_ui.progress_tx"]
 	self.progressTx:setText("")
 	self.inputField = uiMap["test_login_ui.login_node.input_field"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_INPUT_FIELD)

lua/app/ui/activity/activity_hero_comp.lua

@@ -10,6 +10,7 @@ function ActivityHeroComp:init()
     self.txTime = uiMap["hero_panel.tx_time"]
     self.btnBuy = uiMap["hero_panel.btn_buy"]
     self.txBuy = uiMap["hero_panel.btn_buy.tx_buy"]
+    self.rewardNode = uiMap["hero_panel.rewards"]
     self.rewardCells = {}
     for i = 1, 3 do
         table.insert(self.rewardCells, uiMap["hero_panel.rewards.pop_reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL))
@@ -36,6 +37,7 @@ function ActivityHeroComp:refresh()
             cell:setVisible(false)
         end
     end
+    self.rewardNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT):RefreshLayout()
     if DataManager.ShopData:getGiftRemainBuyNum(GConst.ActivityConst.HERO_GIFT_ID_1) > 0 then
         self.btnBuy:setTouchEnable(true)
         self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_2")

lua/app/ui/battle/battle_base_ui.lua

@@ -1518,6 +1518,9 @@ function BattleBaseUI:showGridEffectSfx(posId, sfxName, callback, customTime, zE
             info.isIdle = true
             info.obj:setActive(false)
         end, customTime, function()
+            if self:isClosed() then
+                return
+            end
             if callback then
                 callback()
             end

lua/app/ui/shop/gift_pop_ui.lua

@@ -122,11 +122,17 @@ function GiftPopUI:refresh(needCheck)
     if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then
         local type = PayManager:getGiftConfigInfo(self.actType, self.actId).type
         self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType][type]))
-        self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType][type])
+        self.banner:setVisible(false)
+        self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType][type], function()
+            self.banner:setVisible(true)
+        end)
         self.bg:setTexture(GIFT_BG_NAME[self.actType][type])
     else
         self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType]))
-        self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType])
+        self.banner:setVisible(false)
+        self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType], function()
+            self.banner:setVisible(true)
+        end)
         self.bg:setTexture(GIFT_BG_NAME[self.actType])
     end
 

lua/app/userdata/activity/activity_data.lua

@@ -19,6 +19,9 @@ function ActivityData:setDirty()
 end
 
 function ActivityData:isOpen()
+    if GFunc.isShenhe() then
+        return false
+    end
     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then
         return false
     end
@@ -28,6 +31,11 @@ function ActivityData:isOpen()
     return true
 end
 
+-- 获取活动id
+function ActivityData:getActId()
+    return ACT_ID
+end
+
 -- 获取活动时间配置
 function ActivityData:getActCfg()
     return ConfigManager:getConfig("activity")[ACT_ID]