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

lua/app/common/event_manager.lua

@@ -45,6 +45,7 @@ EventManager.CUSTOM_EVENT = {
 	ARENA_SEASON_END = "ARENA_SEASON_END",-- 赛季结束
 	ARENA_RECORD_SUCCESS = "ARENA_RECORD_SUCCESS",-- 战报获取成功
 	ARENA_RANK_SUCCESS = "ARENA_RANK_SUCCESS",-- 排行榜获取成功
+	ARENA_AD_BOX_SUCCESS = "ARENA_AD_BOX_SUCCESS",-- ad宝箱获取成功
 	-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
 	-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
 }

lua/app/config/act_gift.lua

@@ -534,6 +534,18 @@ local act_gift = {
 		["limit_time"]=72,
 		["limit"]=1
 	},
+	[80102]={
+		["type"]=8,
+		["recharge_id"]=13,
+		["time_type"]=3,
+		["value"]=3000
+	},
+	[80202]={
+		["type"]=8,
+		["recharge_id"]=14,
+		["time_type"]=3,
+		["value"]=2000
+	},
 	[90102]={
 		["type"]=9,
 		["recharge_id"]=13,
@@ -708,6 +720,6 @@ local act_gift = {
 	}
 }
 local config = {
-data=act_gift,count=25
+data=act_gift,count=27
 }
 return config

lua/app/config/avatar.lua

@@ -1,4 +1,8 @@
 local avatar = {
+	[23]={
+		["iconId"]="avatar_1",
+		["item"]=23
+	},
 	[1001]={
 		["iconId"]="1",
 		["hero"]=12001
@@ -104,6 +108,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/avatar_frame.lua

@@ -2,9 +2,17 @@ local avatar_frame = {
 	[1000]={
 		["iconId"]="avatar_frame_1",
 		["unlock"]=true
+	},
+	[24]={
+		["iconId"]="avatar_frame_2",
+		["item"]=24
+	},
+	[25]={
+		["iconId"]="avatar_frame_3",
+		["item"]=25
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/const.lua

@@ -330,7 +330,7 @@ local const = {
 		["value"]=1
 	},
 	["cancle_link_show"]={
-		["value"]=3
+		["value"]=4
 	}
 }
 local config = {

lua/app/config/item.lua

@@ -152,6 +152,36 @@ local item = {
 				["id"]=54001,
 				["num"]=1,
 				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=14002,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=24002,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=34002,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=44002,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=54002,
+				["num"]=1,
+				["weight"]=100
 			}
 		}
 	},
@@ -361,6 +391,178 @@ local item = {
 		["qlt"]=4,
 		["icon"]="22"
 	},
+	[23]={
+		["type"]=9,
+		["qlt"]=5,
+		["icon"]="23"
+	},
+	[24]={
+		["type"]=10,
+		["qlt"]=4,
+		["icon"]="24"
+	},
+	[25]={
+		["type"]=10,
+		["qlt"]=5,
+		["icon"]="25"
+	},
+	[26]={
+		["type"]=3,
+		["qlt"]=5,
+		["icon"]="20",
+		["hero_drop"]={
+			{
+				["type"]=1,
+				["id"]=14001,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=24001,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=34001,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=44001,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=54001,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=14002,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=24002,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=34002,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=44002,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=54002,
+				["num"]=1,
+				["weight"]=10
+			},
+			{
+				["type"]=1,
+				["id"]=13001,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=13002,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=23001,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=23002,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=33001,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=33002,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=43001,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=43002,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=53001,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=53002,
+				["num"]=1,
+				["weight"]=50
+			},
+			{
+				["type"]=1,
+				["id"]=12001,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=22001,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=32001,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=42001,
+				["num"]=1,
+				["weight"]=100
+			},
+			{
+				["type"]=1,
+				["id"]=52001,
+				["num"]=1,
+				["weight"]=100
+			}
+		}
+	},
 	[12001]={
 		["type"]=5,
 		["parameter"]=12001,
@@ -513,6 +715,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/cn/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+		["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！"
+	},
 	[1001]={
 		["desc"]="激活舞女后获得。"
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/cn/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="初始头像框"
+	},
+	[24]={
+		["desc"]="S1竞技场白银头像，勇气的代表。"
+	},
+	[25]={
+		["desc"]="S1竞技场黄金头像，实力的证明。"
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

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

@@ -87,6 +87,22 @@ local item = {
 		["name"]="入场券",
 		["desc"]="每次挑战需要给竞技场记录员一张券。每天都有免费的券发放。"
 	},
+	[23]={
+		["name"]="勇气洋葱头",
+		["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！"
+	},
+	[24]={
+		["name"]="S1赛季白银头像框",
+		["desc"]="S1竞技场白银头像，勇气的代表。"
+	},
+	[25]={
+		["name"]="S1赛季黄金头像框",
+		["desc"]="S1竞技场黄金头像，实力的证明。"
+	},
+	[26]={
+		["name"]="高级随机碎片",
+		["desc"]="有概率随机获得优秀，稀有或史诗英雄碎片。"
+	},
 	[12001]={
 		["name"]="舞娘碎片",
 		["desc"]="舞娘碎片，凑齐可激活或升级。"
@@ -189,6 +205,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/de/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/de/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

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

@@ -64,6 +64,18 @@ local item = {
 	},
 	[22]={
 
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
 	},
 	[12001]={
 
@@ -142,6 +154,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/en/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="Obtained after activating Dancer."
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/en/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="Initial Avatar Frame"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

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

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "Drowsy...",
     ["ARENA_DESC_25"] = "Would you like to spend {0} Diamonds for a rematch?",
     ["ARENA_DESC_26"] = "The opponent has left. Please rematch.",
-    ["ARENA_DESC_27"] = "Arena Points +{0}",
+    ["ARENA_DESC_27"] = "Arena Points {0}",
     ["ARENA_DESC_29"] = "Arena settlement in progress. Please wait for matchmaking...",
     ["ARENA_DESC_30"] = "New Arena season started. Please update the game and re-log in!",
     ["ARENA_DESC_31"] = "Arena settlement begins. Challenge unavailable for now!",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "Buy Entry Ticket",
     ["SHOP_DESC_40"] = "Arena Victory Special Offer!!",
     ["SHOP_DESC_41"] = "Win in Arena battles and accumulate <color=#8aedff>max value</color>!",
+    ["BATTLE_DESC_12"] = "No skill to be enhanced for now",
     ["ARENA_BATTLE_DESC_6"] = "1. The attacking side in the Arena takes the first turn and can only link and eliminate elements within a 5x7 area on their own side. Skills will automatically receive all bonuses based on the hero's level.",
     ["ARENA_BATTLE_DESC_7"] = "2. After eliminating elements, they will be generated in the opponent's area, and the elements from the opponent's area will fall into our side, including the opponent's skills. Then, they will turn into the skills of our corresponding colored hero.",
     ["ARENA_BATTLE_DESC_8"] = "3. We must defeat the opponent within 30 turns. Each action by either side counts as 1 turn. Please pay attention to the turn indicator in the bottom right corner. Both sides in the Arena have a 100% increase in HP and an 80% reduction in damage dealt.",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "Previous",
     ["ARENA_BATTLE_DESC_10"] = "Next",
     ["ARENA_BATTLE_DESC_11"] = "Exiting will result in defeat. Do you want to exit?",
+    ["BATTLE_DESC_13"] = "Slide to this point to delink",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="Entry Ticket",
 		["desc"]="Each challenge requires one ticket for the Arena record keeper. Free tickets are issued daily."
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="Advanced Random Shard",
+		["desc"]="May randomly obtain Shards of Excellent, Rare, or Epic Heroes."
+	},
 	[12001]={
 		["name"]="Dancer Shard",
 		["desc"]="Dancer Fragments that can activate or upgrade Panda."
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/es/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="Se obtiene tras activar Bailarina."
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/es/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="Marco de avatar inicial"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/es/global.lua

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "Dormido...",
     ["ARENA_DESC_25"] = "¿Quieres emparejar de nuevo con {0} diamantes?",
     ["ARENA_DESC_26"] = "El oponente se fue. Empareja de nuevo.",
-    ["ARENA_DESC_27"] = "Puntos Arena+{0}",
+    ["ARENA_DESC_27"] = "Puntos Arena{0}",
     ["ARENA_DESC_29"] = "Liquidación de Arena en curso. Por favor, vuelve a emparejar más tarde.",
     ["ARENA_DESC_30"] = "La nueva temporada de Arena ha empezado. Actualiza el juego antes de entrar.",
     ["ARENA_DESC_31"] = "Ha comenzado la liquidación de Arena. El desafío no está dosponible ahora.",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "Comprar boleto",
     ["SHOP_DESC_40"] = "¡Especial de Victoria en Arena!",
     ["SHOP_DESC_41"] = "¡Gana en las batallas de Arena y reúne el <color=#8aedff>mayor valor</color>!",
+    ["BATTLE_DESC_12"] = "No hay habilidad reforzada por ahora",
     ["ARENA_BATTLE_DESC_6"] = "1. El lado atacante en la Arena toma el primer turno y solo puede conectar y eliminar elementos dentro de un área de 5*7 de su lado. Las habilidades recibirán automáticamente todas las bonificaciones según el nivel del héroe.",
     ["ARENA_BATTLE_DESC_7"] = "2. Los elementos eliminados se generarán en el área del openete, y los elementos del área del openete caerán en nuestra área, incluidas sus habilidades que se transformarán en las habilidades de nuestros héroes del colores correspondientes.",
     ["ARENA_BATTLE_DESC_8"] = "3. Hay que derrotar al oponente en 30 rondas. Una ronda incluye una acción de ambos lado. Presta atención a la marca de ronda en la esquina inferior derecha. El HP de ambos lados en la Arena aumenta un 100% y el daño causado se reduce un 80%.",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "Anterior",
     ["ARENA_BATTLE_DESC_10"] = "Siguiente",
     ["ARENA_BATTLE_DESC_11"] = "Al salir del combate, será declarada tu derrota. ¿Quieres salir?",
+    ["BATTLE_DESC_13"] = "Desliza hasta aquí para desconectar",
 }
 
 return localization_global

lua/app/config/strings/es/item.lua

@@ -87,6 +87,19 @@ local item = {
 		["name"]="Para realizar un desafío, necesitas dar un boleto para el anotador de la Arena. Se lanzan boletos gratuitos todos los días.",
 		["name"]="Para realizar un desafío, necesitas dar un boleto para el anotador de la Arena. Se lanzan boletos gratuitos todos los días."
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="Hay chance de obtener aleatoriamente fragmentos de héroes destacados, raros o épicos.",
+		["name"]="Hay chance de obtener aleatoriamente fragmentos de héroes destacados, raros o épicos."
+	},
 	[12001]={
 		["name"]="Fragmento de Bailarina. Se puede activar o actualizar al reunir todos los fragmentos.",
 		["name"]="Fragmento de Bailarina. Se puede activar o actualizar al reunir todos los fragmentos."
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/fr/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/fr/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/fr/global.lua

@@ -27,6 +27,7 @@ local localization_global =
     ["MAINTENANCE_NOTICE_DEFAULT"] = "Erreur de communication du serveur, veuillez réessayer plus tard",
     ["RATE_DESC_1"] = "Comment aimez-vous notre jeu?",
     ["RATE_DESC_2"] = "Plus tard",
+    ["BATTLE_DESC_12"] = "Pas de compétence renforcée",
 }
 
 return localization_global

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

@@ -64,6 +64,18 @@ local item = {
 	},
 	[22]={
 
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
 	},
 	[12001]={
 
@@ -142,6 +154,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/id/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="Dapat setelah lolos Dancer"
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/id/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="Bingkai avatar awal"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/id/global.lua

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "Kantuk...",
     ["ARENA_DESC_25"] = "Habiskan {0} berlian untuk matchmacking ulang?",
     ["ARENA_DESC_26"] = "Lawan telah pergi. Silakan matchmaking ulang.",
-    ["ARENA_DESC_27"] = "Poin Arena +{0}",
+    ["ARENA_DESC_27"] = "Poin Arena {0}",
     ["ARENA_DESC_29"] = "Sedang penyelesaian arena.. Matchmaking kembali nanti.",
     ["ARENA_DESC_30"] = "Musim baru Arena dibuka. Harap perbarui game dahulu sebelum login!",
     ["ARENA_DESC_31"] = "Penyelesaian arena dimulai, tantangan diberhentikan sementara!",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "Beli tiket masuk",
     ["SHOP_DESC_40"] = "Penawaran Spesial Arena Kemenangan!",
     ["SHOP_DESC_41"] = "Menangkan pertempuran Arena dan kumpulkan<color=#8aedff>hadiah tertinggi</color>!",
+    ["BATTLE_DESC_12"] = "Tidak ada peningkatan skill",
     ["ARENA_BATTLE_DESC_6"] = "1. Pihak yang menyerang di Arena mendapat giliran pertama dan hanya dapat menautkan dan menghilangkan elemen dalam area 5x7 di sisinya sendiri. Skill akan otomatis menerima semua bonus berdasarkan level Hero.",
     ["ARENA_BATTLE_DESC_7"] = "2. Setelah eliminasi elemen, mereka akan dihasilkan di area lawan, dan elemen dari area lawan akan jatuh ke pihak kita, termasuk skill lawan. Kemudian, mereka akan berubah menjadi skill dari Hero berwarna kita yang sesuai.",
     ["ARENA_BATTLE_DESC_8"] = "3. Kita harus mengalahkan lawan dalam waktu 30 giliran. Setiap aksi dari kedua sisi dihitung sebagai 1 giliran. Harap perhatikan indikator giliran di pojok kanan bawah. Kedua belah pihak di Arena memiliki peningkatan 100% dalam HP dan pengurangan 80% dalam DMG yang diberikan.",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "Sebelumnya",
     ["ARENA_BATTLE_DESC_10"] = "Berikutnya",
     ["ARENA_BATTLE_DESC_11"] = "Keluar akan mengakibatkan kekalahan. Yakin ingin keluar?",
+    ["BATTLE_DESC_13"] = "Geser untuk membatalkan koneksi",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="Tiket Masuk",
 		["desc"]="Setiap tantangan membutuhkan satu tiket untuk pencatat rekor Arena. Tiket gratis dikeluarkan setiap hari."
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="Shard Premium Acak",
+		["desc"]="Berpeluang mendapat Shard Hero luar biasa, langka, atau epik secara acak."
+	},
 	[12001]={
 		["name"]="Shard Dancer",
 		["desc"]="Shard Dancer. Kumpulkan untuk aktivasi atau upgrade."
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/ja/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="ダンサーをアクティブ化後獲得できる。"
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/ja/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="デフォルトフレーム"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/ja/global.lua

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "昏睡中……",
     ["ARENA_DESC_25"] = "{0}ダイヤを消費して、再マッチングしますか？",
     ["ARENA_DESC_26"] = "相手が退場しました。再マッチングしてください。",
-    ["ARENA_DESC_27"] = "闘技場ポイント+{0}",
+    ["ARENA_DESC_27"] = "闘技場ポイント{0}",
     ["ARENA_DESC_29"] = "闘技場決算中、後程マッチングしてください……",
     ["ARENA_DESC_30"] = "闘技場新シーズン解放！アップデート後に参加してください！",
     ["ARENA_DESC_31"] = "闘技場決算開始、しばらく挑戦できません！",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "チケットを購入する",
     ["SHOP_DESC_40"] = "闘技場勝利スペシャル！！",
     ["SHOP_DESC_41"] = "闘技場のバトルで勝利し、<color=#8aedff>超お得なボーナス</color>を貯めましょう！",
+    ["BATTLE_DESC_12"] = "強化スキルがありません",
     ["ARENA_BATTLE_DESC_6"] = "1、闘技場では、攻撃側からスタートし、自分側の5*7範囲内の元素を繋がって消すことができます。スキルはヒーローのレベルに応じて、全てのボーナスが自動的に付与されます。",
     ["ARENA_BATTLE_DESC_7"] = "2、元素を消した後、相手のエリアで新しい元素が生成し、相手のエリアの元素及びスキルはプレイヤー側に落ちてきます。相手のスキルがプレイヤー側に落ちると、対応する色のヒーローのスキルに変換されます。",
     ["ARENA_BATTLE_DESC_8"] = "3、30ターン以内に相手を倒す必要があります。双方の1回行動は1ターンとなり、右下のターンマークにご注意ください。闘技場では、双方のHPが100％増加し、与えるダメージが80%減少します。",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "前のページ",
     ["ARENA_BATTLE_DESC_10"] = "次のページ",
     ["ARENA_BATTLE_DESC_11"] = "終了すると敗北と判断されますが、終了しますか？",
+    ["BATTLE_DESC_13"] = "ここまでスライドするとキャンセルできる",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="チケット",
 		["desc"]="挑戦するたびに、闘技場の記録スタッフにチケットを1枚渡す必要があります。無料チケットは毎日配布されます。"
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="ランダムのレアヒーローピース",
+		["desc"]="一定の確率でアンコモン、レア、またはエピックヒーローピースを入手できる。"
+	},
 	[12001]={
 		["name"]="ダンサーのピース",
 		["desc"]="ダンサーのピース。必要数を集めると、解放またはレベルアップできる。"
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/ko/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="무희을(를) 활성화한 후, 획득할 수 있습니다."
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/ko/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="초기 아이콘 프레임"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/ko/global.lua

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "숙면 중...",
     ["ARENA_DESC_25"] = "{0} 다이아를 소모하여 다시 매칭하시겠나요?",
     ["ARENA_DESC_26"] = "상대가 떠났습니다. 다시 매칭해 주세요.",
-    ["ARENA_DESC_27"] = "아레나 포인트 +{0}",
+    ["ARENA_DESC_27"] = "아레나 포인트 {0}",
     ["ARENA_DESC_29"] = "아레나 정산 중, 잠시 후 다시 매치해 주세요...",
     ["ARENA_DESC_30"] = "아레나의 새로운 시즌이 열렸습니다. 게임을 업데이트하고 시작해 주세요!",
     ["ARENA_DESC_31"] = "아레나 정산이 시작되었습니다. 도전이 중지됩니다!",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "입장권 구매",
     ["SHOP_DESC_40"] = "아레나 승리 스페셜 혜택!!",
     ["SHOP_DESC_41"] = "아레나 배틀에서 승리하고 <color=#8aedff>최고의 가치</color>를 모으세요!",
+    ["BATTLE_DESC_12"] = "강화할 수 있는 스킬이 없습니다",
     ["ARENA_BATTLE_DESC_6"] = "1. 아레나에서 공격하는 쪽이 선제공격하며 자기 진영 절반의 5*7 범위 내의 원소만 소멸할 수 있습니다. 스킬은 영웅의 레벨에 따라 자동으로 모든 버프를 받습니다.",
     ["ARENA_BATTLE_DESC_7"] = "2. 원소를 소멸한 후, 상대의 영역에서 생성된 원소, 상대의 영역에 있던 원소들이 우리 쪽으로 떨어지고 상대의 스킬도 포함합니다. 상대의 스킬이 우리에게 떨어진 후, 우리 쪽에 해당하는 색상의 영웅 스킬로 바뀝니다.",
     ["ARENA_BATTLE_DESC_8"] = "3. 반드시 30 턴 이내에 상대를 물리쳐야 합니다. 양측에서 각각 1번 움직이면 1턴으로 간주합니다. 오른쪽 하단의 턴 표시를 주의해 주세요. 아레나에서 양쪽 모두 HP가 100% 증가하며 입히는 대미지는 80% 감소합니다.",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "이전 페이지",
     ["ARENA_BATTLE_DESC_10"] = "다음 페이지",
     ["ARENA_BATTLE_DESC_11"] = "게임을 나가시면 실패로 판정됩니다. 정말 나가시겠나요?",
+    ["BATTLE_DESC_13"] = "이곳으로 슬라이드하면 콤보를 취소할 수 있습니다",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="입장권",
 		["desc"]="도전할 때마다 아레나 기록원에게 티켓 한 장을 건네야 합니다. 매일 무료 티켓이 지급됩니다."
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="랜덤의 고급 파편",
+		["desc"]="확률적으로 랜덤의 뛰어난 영웅, 희귀 영웅 또는 에픽 영웅 파편을 얻을 수 있습니다."
+	},
 	[12001]={
 		["name"]="무희 파편",
 		["desc"]="무희 조각, 다 모으면 무희를 활성화하거나 업그레이드할 수 있습니다."
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/pt/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="Ativar Dançarina para obter."
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/pt/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="Moldura de avatar inicial"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/pt/global.lua

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "Adormecido...",
     ["ARENA_DESC_25"] = "Deseja encontrar outro oponente com {0} diamantes?",
     ["ARENA_DESC_26"] = "O oponente já saiu. Encontre outro.",
-    ["ARENA_DESC_27"] = "Ponto da Arena +{0}",
+    ["ARENA_DESC_27"] = "Ponto da Arena {0}",
     ["ARENA_DESC_29"] = "Classificação da Arena em curso. Volte a desafiar oponentes mais tarde...",
     ["ARENA_DESC_30"] = "A nova temporada da Arena começou. Atualize o jogo antes de entrar!",
     ["ARENA_DESC_31"] = "A classificação da Arena começou. O desafio não está disponível agora!",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "Comprar ingresso",
     ["SHOP_DESC_40"] = "Super oferta para a vitória na Arena!!",
     ["SHOP_DESC_41"] = "Vença na Arena para obter <color=#8aedff>oferta suprema</color>!",
+    ["BATTLE_DESC_12"] = "Sem habilidades de reforço de momento",
     ["ARENA_BATTLE_DESC_6"] = "1. O atacante na Arena tem a iniciativa. Você pode eliminar apenas os elementos dentro do alcance de 5 x 7 do seu próprio campo. As habilidades serão adquiridas automaticamente de acordo com o nível do herói.",
     ["ARENA_BATTLE_DESC_7"] = "2. Após eliminar os elementos, estes serão gerados na área do oponente; e os elementos da área do oponente, por sua vez, cairão no nosso campo, incluindo as habilidades do oponente. As habilidades do oponente que caem no seu campo se transformarão nas habilidades dos nossos heróis das cores correspondentes.",
     ["ARENA_BATTLE_DESC_8"] = "3. Devemos derrotar o oponente em 30 turnos. Cada ação de ambos os lados é considerada como 1 turno. Preste atenção ao marcador de turnos no canto inferior direito. A vida dos dois lados na Arena aumenta em 100% e o dano causado diminui em 80%.",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "Anterior",
     ["ARENA_BATTLE_DESC_10"] = "Próximo",
     ["ARENA_BATTLE_DESC_11"] = "Sua saída resultará em derrota. Deseja sair?",
+    ["BATTLE_DESC_13"] = "Deslize até aqui para cancelar a conexão",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="Ingresso",
 		["desc"]="Você precisa dar um ingresso ao funcionário do registro da Arena para cada desafio. São distribuídos Ingressos gratuitos todos os dias."
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="Fragmento Aleatório Avançado",
+		["desc"]="Possibilidade aleatória de obter fragmentos de heróis excelentes, raros ou épicos."
+	},
 	[12001]={
 		["name"]="Fragmento de Dançarina",
 		["desc"]="Fragmento de Dançarina, necessário para ativar ou melhorar."
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/ru/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/ru/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

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

@@ -64,6 +64,18 @@ local item = {
 	},
 	[22]={
 
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
 	},
 	[12001]={
 
@@ -142,6 +154,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/th/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="หลังจากการเปิดใช้งานสาวเต้นจะได้รับ"
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/th/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="กรอบรูปเริ่มต้น"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/th/global.lua

@@ -38,7 +38,7 @@ local localization_global =
     ["REWARD_PREVIEW_DESC"] = "ภาพรวมของรางวัล",
     ["HERO_DESC_8"] = "ใช้",
     ["HERO_DESC_9"] = "ข้อมูล",
-    ["HERO_DESC_10"] = "ผ่านด่านบทที่{0}จะปลดล็อค",
+    ["HERO_DESC_10"] = "ผ่านด่านบทที่{0}จะ\nปลดล็อค ",
     ["BATTLE_DESC_8"] = "ยังมีฮีโร่ที่ออกรบได้",
     ["MAIN_BTN_2"] = "ฮีโร่",
     ["MAIN_DESC_1"] = "บท {0}",
@@ -172,7 +172,7 @@ local localization_global =
     ["SHOP_DESC_27"] = "หีบสมบัติ",
     ["SHOP_DESC_28"] = "โปรฯรายวัน",
     ["SHOP_DESC_29"] = "\"โปรฯรายวัน\" จะรีเฟรชทุกวัน และสามารถรีเฟรชเพิ่มเติมได้ด้วยการดูโฆษณา",
-    ["HERO_DESC_11"] = "ได้รับจากกิจกรรม",
+    ["HERO_DESC_11"] = "ได้รับจาก\nกิจกรรม",
     ["SHOP_DESC_30"] = "ใช้เพชรเพื่อรีเฟรชโปรฯรายวันหรือไม่?",
     ["SHOP_DESC_31"] = "ยืนยันซื้อ",
     ["SHOP_DESC_32"] = "ใช้เหรียญทองเพื่อซื้อหรือไม่",
@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "หลับอยู่...",
     ["ARENA_DESC_25"] = "ใช้ {0} เพชรเพื่อจับคู่ใหม่หรือไม่?",
     ["ARENA_DESC_26"] = "คู่ต่อสู้ออกแล้ว กรุณาจับคู่ใหม่",
-    ["ARENA_DESC_27"] = "คะแนนอารีน่า+{0}",
+    ["ARENA_DESC_27"] = "คะแนนอารีน่า{0}",
     ["ARENA_DESC_29"] = "คำนวณอารีน่าอยู่ โปรดจับคู่ในภายหลัง",
     ["ARENA_DESC_30"] = "ซีซั่นใหม่ของอารีน่าเปิดแล้ว โปรดอัปเดตเกมก่อนเข้าร่วม!",
     ["ARENA_DESC_31"] = "เริ่มการคำนวณอารีน่าอยู่ หยุดการท้าทาย!",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "ซื้อตั๋วเข้าร่วม",
     ["SHOP_DESC_40"] = "โปรฯชนะอารีน่า! !",
     ["SHOP_DESC_41"] = "ชนะในการต่อสู้บนอารีน่า และรวบรวม<color=#8aedff>สุดคุ้มมากสูง</color> !",
+    ["BATTLE_DESC_12"] = "ยังไม่มีสกิลตีบวก",
     ["ARENA_BATTLE_DESC_6"] = "1. ฝ่ายโจมตีของอารีน่าสามารถเชื่อมต่อและกำจัดธาตุภายในขอบเขต 5*7 ของครึ่งสนามของตัวเองเท่านั้น สกิลจะได้รับโบนัสทั้งหมดโดยอัตโนมัติตามเลเวลของฮีโร่",
     ["ARENA_BATTLE_DESC_7"] = "2. หลังจากกำจัดธาตุแล้ว ธาตุจะถูกสร้างขึ้นจากพื้นที่ของฝ่ายตรงข้าม และธาตุในพื้นที่ของฝ่ายตรงข้ามจะตกมาอยู่ที่ฝ่ายเรา รวมถึงสกิลของฝ่ายตรงข้ามด้วย หลังจากที่สกิลของฝ่ายตรงข้ามตกมาอยู่ที่ฝ่ายเราแล้วจะถูกเปลี่ยนเป็นสกิลของฮีโร่เราที่มีสีสอดคล้องกัน",
     ["ARENA_BATTLE_DESC_8"] = "3. เราต้องเอาชนะฝ่ายตรงข้างภายใน 30 รอบ การลงมือ 1 ครั้งของทั้งสองฝ่ายคือ 1 รอบ โปรดสังเกตเครื่องหมายรอบในมุมขวาล่าง HP ของทั้งสองฝ่ายในอารีน่าเพิ่มขึ้น 100% และดาเมจที่สร้างขึ้นจะลดลง 80%",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "หน้าก่อนหน้า",
     ["ARENA_BATTLE_DESC_10"] = "หน้าถัดไป",
     ["ARENA_BATTLE_DESC_11"] = "การออกจะถูกตัดสินว่าเป็นความพ่ายแพ้ ออกหรือไม่?",
+    ["BATTLE_DESC_13"] = "ลากไปที่นี่เพื่อยกเลิกการเชื่อมต่อ",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="การท้าทายแต่ละครั้งต้องให้ตั๋ว 1 ใบให้นักบันทึกอารีน่า แจกตั๋วฟรีทุกวัน",
 		["name"]="การท้าทายแต่ละครั้งต้องให้ตั๋ว 1 ใบให้นักบันทึกอารีน่า แจกตั๋วฟรีทุกวัน"
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="มีโอกาสที่จะได้รับเศษฮีโร่ที่ยอดเยี่ยม หายาก หรืออีพิทแบบสุ่ม",
+		["name"]="มีโอกาสที่จะได้รับเศษฮีโร่ที่ยอดเยี่ยม หายาก หรืออีพิทแบบสุ่ม"
+	},
 	[12001]={
 		["name"]="เศษสาวเต้น รวบรวมครบจะเปิดใช้งานหรืออัปเลเวลได้",
 		["name"]="เศษสาวเต้น รวบรวมครบจะเปิดใช้งานหรืออัปเลเวลได้"
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/vi/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="Kích hoạt Vũ Cơ nhận được."
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/vi/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="Khung Avatar Ban Đầu"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/vi/global.lua

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "Đang ngủ say...",
     ["ARENA_DESC_25"] = "Có dùng {0} Kim Cương ghép lại không?",
     ["ARENA_DESC_26"] = "Đối thủ đã rời đi, hãy ghép lại",
-    ["ARENA_DESC_27"] = "Điểm Đấu Trường +{0}",
+    ["ARENA_DESC_27"] = "Điểm Đấu Trường {0}",
     ["ARENA_DESC_29"] = "Đang tổng kết Đấu Trường, vui lòng chờ...",
     ["ARENA_DESC_30"] = "Mùa giải mới của đấu trường đã mở, hãy cập nhật game để tham gia!",
     ["ARENA_DESC_31"] = "Bắt đầu tổng kết Đấu Trường, tạm dừng khiêu chiến!",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "Mua vé",
     ["SHOP_DESC_40"] = "Ưu đãi chiến thắng Đấu Trường!",
     ["SHOP_DESC_41"] = "Giành chiến thắng trong Đấu Trường, thu thập <color=#8aedff>giá trị cao nhất</color>!",
+    ["BATTLE_DESC_12"] = "Chưa có kỹ năng cường hóa",
     ["ARENA_BATTLE_DESC_6"] = "1. Phe tấn công sẽ ra tay trước, chỉ được kết nối loại bỏ các nguyên tố trong phạm vi 5*7 nửa sân bên mình. Kỹ năng sẽ tự động nhận tất cả buff dựa theo cấp anh hùng.",
     ["ARENA_BATTLE_DESC_7"] = "2. Sau khi loại bỏ nguyên tố, được tạo ra ở khu vực đối phương, nguyên tố thuộc khu vực đối phương sẽ rơi xuống phe ta, bao gồm kỹ năng của đối phương. Kỹ năng rơi xuống phe ta sẽ biến thành kỹ năng của anh hùng màu sắc tương ứng phe ta.",
     ["ARENA_BATTLE_DESC_8"] = "3. Chúng ta phải đánh bại đối phương trong 30 hiệp, hai bên hành động 1 lần là 1 hiệp, hãy chú ý ký hiệu hiệp ở góc dưới bên phải. HP hai bên trong Đấu Trường tăng 100%, sát thương gây ra giảm 80%.",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "Trang trước",
     ["ARENA_BATTLE_DESC_10"] = "Trang sau",
     ["ARENA_BATTLE_DESC_11"] = "Thoát sẽ bị coi là thua, xác nhận thoát?",
+    ["BATTLE_DESC_13"] = "Kéo đến đây để hủy liên kết",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="Vé",
 		["desc"]="Mỗi lần khiêu chiến cần đưa 1 vé cho nhân viên đấu trường. Mỗi ngày đều có phát vé miễn phí."
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="Mảnh Ngẫu Nhiên Cao Cấp",
+		["desc"]="Có tỷ lệ nhận ngẫu nhiên Mảnh Anh Hùng Ưu Tú, Hiếm hoặc Sử Thi."
+	},
 	[12001]={
 		["name"]="Mảnh Vũ Cơ",
 		["desc"]="Mảnh Vũ Cơ, thu thập đủ được kích hoạt hoặc tăng cấp."
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/config/strings/zh/avatar.lua

@@ -1,4 +1,7 @@
 local avatar = {
+	[23]={
+
+	},
 	[1001]={
 		["desc"]="啟動舞孃後獲得。"
 	},
@@ -76,6 +79,6 @@ local avatar = {
 	}
 }
 local config = {
-data=avatar,count=25
+data=avatar,count=26
 }
 return config

lua/app/config/strings/zh/avatar_frame.lua

@@ -1,9 +1,15 @@
 local avatar_frame = {
 	[1000]={
 		["desc"]="初始頭像框"
+	},
+	[24]={
+
+	},
+	[25]={
+
 	}
 }
 local config = {
-data=avatar_frame,count=1
+data=avatar_frame,count=3
 }
 return config

lua/app/config/strings/zh/global.lua

@@ -302,7 +302,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_5"] = "昏睡中……",
     ["ARENA_DESC_25"] = "是否花費{0}鑽石重新匹配？",
     ["ARENA_DESC_26"] = "對手已經離開，請重新匹配",
-    ["ARENA_DESC_27"] = "競技場積分+{0}",
+    ["ARENA_DESC_27"] = "競技場積分{0}",
     ["ARENA_DESC_29"] = "競技場結算中，請稍後再匹配……",
     ["ARENA_DESC_30"] = "競技場新賽季開啟，請更新遊戲再進入！",
     ["ARENA_DESC_31"] = "競技場結算開始，暫停挑戰！",
@@ -312,6 +312,7 @@ local localization_global =
     ["ARENA_DESC_32"] = "購買入場券",
     ["SHOP_DESC_40"] = "競技場勝利特惠！！",
     ["SHOP_DESC_41"] = "在競技場戰鬥中獲勝，聚集<color=#8aedff>最大超值福利</color>！",
+    ["BATTLE_DESC_12"] = "暫時沒有強化技能",
     ["ARENA_BATTLE_DESC_6"] = "1、競技場攻方先手，只可連接消除本方半場5*7範圍內的元素。技能將根據英雄的等級自動獲得所有加成。",
     ["ARENA_BATTLE_DESC_7"] = "2、消除元素後，將從對方區域生成，對方區域的元素將下落到我方，包括對方的技能。對方技能下落到我方後將轉變為我方對應顏色英雄的技能。",
     ["ARENA_BATTLE_DESC_8"] = "3、我們必須在30回合內擊敗對方，雙方個行動1次為1個回合，請注意右下角回合記號。競技場雙方生命提高100%，造成傷害降低80%。",
@@ -320,6 +321,7 @@ local localization_global =
     ["ARENA_BATTLE_DESC_9"] = "上一頁",
     ["ARENA_BATTLE_DESC_10"] = "下一頁",
     ["ARENA_BATTLE_DESC_11"] = "退出將判定為戰敗，是否退出？",
+    ["BATTLE_DESC_13"] = "滑動至此處可取消連線",
 }
 
 return localization_global

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

@@ -87,6 +87,19 @@ local item = {
 		["name"]="入場券",
 		["desc"]="每次挑戰需要給競技場記錄員一張券。每天都有免費的券發放。"
 	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+		["name"]="高級隨機碎片",
+		["desc"]="有機率隨機獲得優秀，稀有或史詩英雄碎片。"
+	},
 	[12001]={
 		["name"]="舞孃碎片",
 		["desc"]="舞孃碎片，集滿可啟用或升級。"
@@ -189,6 +202,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=47
+data=item,count=51
 }
 return config

lua/app/module/arena/arena_manager.lua

@@ -219,7 +219,9 @@ end
 
 function ArenaManager:rspAdBoxReward(result)
     if result.err_code == GConst.ERROR_STR.SUCCESS then
-        ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.SUMMON, params = summonType, rewards = result.rewards})
+        local idx = result.reqData.win and 2 or 1
+        ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.ARENA_AD_BOX, params = idx, rewards = result.rewards})
+        EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.ARENA_AD_BOX_SUCCESS)
     end
 end
 

lua/app/module/shop/shop_const.lua

@@ -16,6 +16,7 @@ ShopConst.BOX_REWARD_TYPE = {
     SUMMON = 1,
     BOUNTY = 2,
     ARENA_BOUNTY = 3,
+    ARENA_AD_BOX = 4,
 }
 
 ShopConst.PAGE_TYPE = {

lua/app/ui/battle/battle_result_ui.lua

@@ -2,6 +2,7 @@ local BattleResultUI = class("BattleResultUI", BaseUI)
 
 local UNIT_RESULT_RERPORT_CELL = "app/ui/battle/cell/unit_result_report_cell"
 local MAX_SCROLL_SHOW_COUNT = 10
+local SCROLL_LINE_HEIGHT = 130
 
 function BattleResultUI:getPrefabPath()
     return "assets/prefabs/ui/battle/battle_result_ui.prefab"
@@ -139,6 +140,10 @@ function BattleResultUI:onLoadRootComplete()
     self.arenaBoxBtnGet:addClickListener(function()
         ModuleManager.ShopManager:showArenaAdBoxUI(self.isWin)
     end)
+    self:addEventListener(EventManager.CUSTOM_EVENT.ARENA_AD_BOX_SUCCESS, function()
+        self.getedArenaAdBox = true
+        self.arenaBoxBtnGet:setActive(false)
+    end)
 end
 
 function BattleResultUI:onClickMask()
@@ -264,7 +269,7 @@ function BattleResultUI:refreshArenaNode()
     self.arenaSequence:AppendCallback(function()
         self.arenaTxGrading:setText(DataManager.ArenaData:getGradingName(curId))
         if lastId ~= curId then
-            self:refreshArenaGradingSpine(curId)
+            self:refreshArenaGradingSpine(curId, curId > lastId)
         end
         self.arenaSequence = nil
     end)
@@ -278,43 +283,48 @@ function BattleResultUI:refreshArenaNode()
     end
 end
 
-function BattleResultUI:refreshArenaBoxNode()
+function BattleResultUI:hasArenaBoxNode()
-    self.rewardScrollRect:setSizeDeltaY(260)
-    self.rewardScrollRect:setAnchoredPositionY(-268)
     if self.battleType ~= GConst.BattleConst.BATTLE_TYPE.ARENA then
+        return false
+    end
+    if self.isWin and self.arenaTotalCount and (self.arenaTotalCount % GFunc.getConstIntValue("arena_win_adbox")) ~= 0 then
+        return false
+    end
+    if not self.isWin and self.arenaTotalCount and (self.arenaTotalCount % GFunc.getConstIntValue("arena_lose_adbox")) ~= 0 then
+        return false
+    end
+
+    return true
+end
+
+function BattleResultUI:refreshArenaBoxNode()
     self.arenaBoxNode:setVisible(false)
-        return
+    if not self:hasArenaBoxNode() then
-    end
-    if self.isWin and (self.arenaTotalCount % GFunc.getConstIntValue("arena_win_adbox")) ~= 0 then
-        return
-    end
-    if not self.isWin and (self.arenaTotalCount % GFunc.getConstIntValue("arena_lose_adbox")) ~= 0 then
         return
     end
     self.arenaBoxNode:setVisible(true)
+    self.arenaBoxBtnGet:setActive(not self.getedArenaAdBox)
     self.arenaBoxTxGet:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
-    self.rewardScrollRect:setSizeDeltaY(120)
-    self.rewardScrollRect:setAnchoredPositionY(-255)
 
     if self.isWin then
         -- 胜利宝箱
         self.arenaBoxNode:setSprite(GConst.ATLAS_PATH.ARENA, "arena_bg_6")
-        self.arenaBoxImgIcon:setSprite(GConst.ATLAS_PATH.ARENA, "arena_chest_2")
+        self.arenaBoxImgIcon:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_5")
         self.arenaBoxTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_32))
     else
         -- 鼓励宝箱
         self.arenaBoxNode:setSprite(GConst.ATLAS_PATH.ARENA, "arena_bg_5")
-        self.arenaBoxImgIcon:setSprite(GConst.ATLAS_PATH.ARENA, "arena_chest_1")
+        self.arenaBoxImgIcon:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_4")
         self.arenaBoxTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_33))
     end
 end
 
-function BattleResultUI:refreshArenaGradingSpine(gradingId)
+function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp)
     if self.arenaSpine then
         self.arenaSpine:playAnimComplete("vanish", false, false, function()
             self.arenaSpine:destroy()
 		    self.arenaSpine = nil
-            self:refreshArenaGradingSpine(gradingId)
+            self:refreshArenaGradingSpine(gradingId, isUp)
         end)
     else
         SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.arenaSpineRoot, function(spineObject)
@@ -325,10 +335,12 @@ function BattleResultUI:refreshArenaGradingSpine(gradingId)
                 self.arenaSpine:playAnim("idle", true, false)
             end)
         end)
+        if isUp then
             EffectManager:loadUIEffectAsync("assets/prefabs/effects/ui/vfx_ui_".. DataManager.ArenaData:getGradingIconName(gradingId) ..".prefab", self, self.arenaSpineRoot, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj)
                 obj:play()
             end)
         end
+	end
 end
 
 function BattleResultUI:refreshRewards()
@@ -348,6 +360,14 @@ function BattleResultUI:refreshRewards()
         end
         cell:showRightUpIcon(index <= self.mysteryBoxIdx, GConst.ATLAS_PATH.COMMON, "common_chest_1")
 	end)
+    if self:hasArenaBoxNode() then
+        self.rewardScrollRect:setSizeDeltaY(SCROLL_LINE_HEIGHT)
+        self.rewardScrollRect:setAnchoredPositionY(-255)
+    else
+        self.rewardScrollRect:setSizeDeltaY(SCROLL_LINE_HEIGHT * 2)
+        self.rewardScrollRect:setAnchoredPositionY(-268)
+    end
+
     self.rewardScrollRectComp:setFadeArgs(0.05, 0.3)
     self.rewardScrollRectComp:clearCells()
     local rewardCount = #self.rewards

lua/app/ui/shop/box_open_ui.lua

@@ -23,6 +23,11 @@ local ARENA_BOUNTY_SPINE_NAME = {
     [10] = "ui_bounty_chestopen_5",
 }
 
+local ARENA_AD_BOX_SPINE_NAME = {
+    [1] = "ui_arena_adchest_1",
+    [2] = "ui_arena_adchest_2",
+}
+
 function BoxOpenUI:ctor(params)
     self.params = params or {} -- 将信息传递给下一个界面
     self.type = self.params and self.params.type 
@@ -54,6 +59,8 @@ function BoxOpenUI:onLoadRootComplete()
         spineName = BOUNTY_SPINE_NAME[self.index]
     elseif self.type == GConst.ShopConst.BOX_REWARD_TYPE.ARENA_BOUNTY then
         spineName = ARENA_BOUNTY_SPINE_NAME[self.index]
+    elseif self.type == GConst.ShopConst.BOX_REWARD_TYPE.ARENA_AD_BOX then
+        spineName = ARENA_AD_BOX_SPINE_NAME[self.index]
     end
     if not spineName then
         spineName = DEFAULT_SPINE_NAME

lua/app/ui/shop/box_reward_ui.lua

@@ -41,7 +41,7 @@ function BoxRewardUI:ctor(params)
     for _, reward in ipairs(self.rewards) do
         if reward.type == GConst.REWARD_TYPE.ITEM and reward.item.id == GConst.ItemConst.ITEM_ID_GOLD then
             self.coinNum = self.coinNum + reward.item.count
-        else
+        elseif reward.item.id ~= GConst.ItemConst.ITEM_ID_GEM then
             local id = reward.item.id
             local count = reward.item.count
             fragmentMap[id] = (fragmentMap[id] or 0) + count