竞技场段位奖励

2023-08-17 11:51:50 +08:00 · 2023-08-17 11:51:50 +08:00 · f15917914c
commit f15917914c
parent 18cd61d870
53 changed files with 636 additions and 120 deletions
--- a/lua/app/common/bi_report.lua
+++ b/lua/app/common/bi_report.lua
@ -113,7 +113,7 @@ BIReport.ITEM_GET_TYPE = {
 	ARENA_REMATCH_CD = "ArenaRematchCd",
 	ARENA_REWARD = "ArenaReward",
 	ARENA_AD_BOX_REWARD = "ArenaAdBoxReward",
-	ARENA_SETTLEMENT = "ArenaSettlement",
+	ARENA_GRADING_REWARD = "ArenaGradingReward",
 	CHANGE_NAME = "ChangeName",	-- 重命名
 	CHANGE_AVATAR = "ChangeAvatar",	-- 修改头像
 	CHANGE_FRAME = "ChangeFrame",	-- 修改头像框
--- a/lua/app/config/equip.lua
+++ b/lua/app/config/equip.lua
@ -7556,12 +7556,12 @@ local equip = {
 			}
 		},
 		["weapon_icon"]={
-			31,
-			32,
-			33,
-			34,
-			35,
-			36
+			25,
+			26,
+			27,
+			28,
+			29,
+			30
 		}
 	},
 	[1400103]={
@ -8001,12 +8001,12 @@ local equip = {
 			}
 		},
 		["weapon_icon"]={
-			19,
-			20,
-			21,
-			22,
-			23,
-			24
+			13,
+			14,
+			15,
+			16,
+			17,
+			18
 		}
 	},
 	[1400104]={
@ -8446,12 +8446,12 @@ local equip = {
 			}
 		},
 		["weapon_icon"]={
-			7,
-			8,
-			9,
-			10,
-			11,
-			12
+			1,
+			2,
+			3,
+			4,
+			5,
+			6
 		}
 	},
 	[1400105]={
@ -8891,12 +8891,12 @@ local equip = {
 			}
 		},
 		["weapon_icon"]={
-			43,
-			44,
-			45,
-			46,
-			47,
-			48
+			37,
+			38,
+			39,
+			40,
+			41,
+			42
 		}
 	},
 	[1400201]={
--- a/lua/app/config/item.lua
+++ b/lua/app/config/item.lua
@ -1439,10 +1439,9 @@ local item = {
 		}
 	},
 	[44]={
-		["type"]=12,
-		["parameter"]=1400101,
-		["qlt"]=3,
-		["icon"]="1400101"
+		["type"]=9,
+		["qlt"]=5,
+		["icon"]="44"
 	},
 	[45]={
 		["type"]=10,
@ -2368,9 +2367,15 @@ local item = {
 		["parameter"]=5400101,
 		["qlt"]=4,
 		["icon"]="5400101"
+	},
+	[1400101]={
+		["type"]=12,
+		["parameter"]=1400101,
+		["qlt"]=3,
+		["icon"]="1400101"
 	}
 }
 local config = {
-data=item,count=111
+data=item,count=112
 }
 return config
--- a/lua/app/config/localization/localization_global_const.lua
+++ b/lua/app/config/localization/localization_global_const.lua
@ -455,6 +455,12 @@ local LocalizationGlobalConst =
 	HERO_FUND_DESCC_2 = "HERO_FUND_DESCC_2",
 	HERO_FUND_DESCC_3 = "HERO_FUND_DESCC_3",
 	HERO_FUND_DESCC_4 = "HERO_FUND_DESCC_4",
+	ARENA_DESC_37 = "ARENA_DESC_37",
+	ARENA_DESC_38 = "ARENA_DESC_38",
+	ARENA_DESC_39 = "ARENA_DESC_39",
+	ARENA_DESC_40 = "ARENA_DESC_40",
+	ARENA_DESC_41 = "ARENA_DESC_41",
+	ARENA_DESC_42 = "ARENA_DESC_42",
 }

 return LocalizationGlobalConst
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@ -7617,7 +7617,7 @@ local skill = {
 		},
 		["name_act"]="attack01",
 		["fx_self"]=300112,
-		["fx_self_mirror"]=400127
+		["fx_self_mirror"]=400112
 	},
 	[5400211]={
 		["position"]=5,
@ -7643,7 +7643,7 @@ local skill = {
 		},
 		["name_act"]="attack02",
 		["fx_self"]=300113,
-		["fx_self_mirror"]=400128
+		["fx_self_mirror"]=400113
 	},
 	[5400212]={
 		["position"]=5,
@ -7669,7 +7669,7 @@ local skill = {
 		},
 		["name_act"]="attack03",
 		["fx_self"]=300114,
-		["fx_self_mirror"]=400129
+		["fx_self_mirror"]=400114
 	},
 	[5400213]={
 		["position"]=5,
@ -7695,7 +7695,7 @@ local skill = {
 		},
 		["name_act"]="attack04",
 		["fx_self"]=300115,
-		["fx_self_mirror"]=400130
+		["fx_self_mirror"]=400115
 	},
 	[5400220]={
 		["energy"]=10,
@ -7767,7 +7767,7 @@ local skill = {
 			3000,
 			400
 		},
-		["fx_self_mirror"]=400131
+		["fx_self_mirror"]=400116
 	},
 	[5400221]={
 		["position"]=5,
@ -7897,7 +7897,7 @@ local skill = {
 		},
 		["name_act"]="attack01",
 		["fx_self"]=300127,
-		["fx_self_mirror"]=400112
+		["fx_self_mirror"]=400127
 	},
 	[5400311]={
 		["position"]=5,
@ -7923,7 +7923,7 @@ local skill = {
 		},
 		["name_act"]="attack02",
 		["fx_self"]=300128,
-		["fx_self_mirror"]=400113
+		["fx_self_mirror"]=400128
 	},
 	[5400312]={
 		["position"]=5,
@ -7949,7 +7949,7 @@ local skill = {
 		},
 		["name_act"]="attack03",
 		["fx_self"]=300129,
-		["fx_self_mirror"]=400114
+		["fx_self_mirror"]=400129
 	},
 	[5400313]={
 		["position"]=5,
@ -7975,7 +7975,7 @@ local skill = {
 		},
 		["name_act"]="attack04",
 		["fx_self"]=300130,
-		["fx_self_mirror"]=400115
+		["fx_self_mirror"]=400130
 	},
 	[5400320]={
 		["buff_id"]={
@ -8022,7 +8022,7 @@ local skill = {
 			3000,
 			400
 		},
-		["fx_self_mirror"]=400116
+		["fx_self_mirror"]=400131
 	},
 	[5400321]={
 		["position"]=5,
--- a/lua/app/config/skin.lua
+++ b/lua/app/config/skin.lua
@ -40,7 +40,7 @@ local skin = {
 		["got"]=1,
 		["skin_point"]=10,
 		["hero_id"]=14001,
-		["item_id"]=44,
+		["item_id"]=1400101,
 		["skill_show"]={
 			14001011,
 			14001012,
--- a/lua/app/config/strings/cn/equip.lua
+++ b/lua/app/config/strings/cn/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="巨力锤,战者之锤,流星巨锤,破军锤,断魂锤,陨星"
 	},
 	[1400102]={
-		["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
+		["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠"
 	},
 	[1400103]={
-		["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠"
+		["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍"
 	},
 	[1400104]={
-		["name"]="皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链,铜制手环"
+		["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索"
 	},
 	[1400105]={
-		["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
+		["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
 	},
 	[1400201]={
 		["name"]="猫拳,尖刺猫拳,青钢猫拳,裂伤猫拳,破空猫拳,福神之力"
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@ -455,6 +455,12 @@ local localization_global =
    ["HERO_FUND_DESCC_2"] = "月之祝福",
    ["HERO_FUND_DESCC_3"] = "拥有月之祝福后，在战斗中累计通过波次可获得丰厚奖励。",
    ["HERO_FUND_DESCC_4"] = "新活动14日达标开启",
+    ["ARENA_DESC_37"] = "解锁英雄：",
+    ["ARENA_DESC_38"] = "已解锁英雄：",
+    ["ARENA_DESC_39"] = "升段奖励为一次性奖励",
+    ["ARENA_DESC_40"] = "升段奖励",
+    ["ARENA_DESC_41"] = "结算奖励",
+    ["ARENA_DESC_42"] = "未领取奖励",
 }

 return localization_global
--- a/lua/app/config/strings/cn/skill.lua
+++ b/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=#3cff28>2</color>回合。"
+		["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[4200120]={
 		["desc"]="元素链接：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"
--- a/lua/app/config/strings/cn/skin.lua
+++ b/lua/app/config/strings/cn/skin.lua
@ -11,6 +11,9 @@ local skin = {
 	[14001]={
 		["value"]="初始"
 	},
+	[1400101]={
+		["value"]="遗迹战甲"
+	},
 	[14002]={
 		["value"]="初始"
 	},
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/de/skin.lua
+++ b/lua/app/config/strings/de/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={

+	},
+	[1400101]={
+
 	},
 	[14002]={

@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/en/equip.lua
+++ b/lua/app/config/strings/en/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="Mighty Mallet,Warrior's Hammer,Comet Crusher,Annihilator's Hammer,Soulshatter,Falling Star"
 	},
 	[1400102]={
-		["name"]="Rugged Steel Helm,Fine Steel Visor,Obsidian Noble Crown,Gallant Coronet,Dragonhorn Circlet,Eternal Glory Crown"
+		["name"]="Floral Circlet,Pearl Circlet,Flame Gilded Circlet,Serene Jade Circlet,Starry Phoenix Circlet,Supreme Crown"
 	},
 	[1400103]={
-		["name"]="Thick Woven Vestment,Thin Steel Hauberk,Dark Iron Plate,Champion's Jade Armor,Wyrmhide Golden Plate,Eternal Heavy Plate"
+		["name"]="Soft Leather Robe,Jade-Adorned Robe,Purple Gauze Silk,Amber-hued Robe,Phoenix Feather Robe,Sovereign Celestial Robe"
 	},
 	[1400104]={
-		["name"]="Leather Belt,Ebony Gold Waistband,Knight's Baldric,Wyrm Sinew Belt,Eternal Girth,Bronze Bracelet"
+		["name"]="Embroidered Belt,Elegant Waist Band,Pearl-embroidered Belt,Astral Glory Belt,Phoenix Gaze Belt,Ultimate Immortal Belt"
 	},
 	[1400105]={
-		["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands"
+		["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
 	},
 	[1400201]={
 		["name"]="Cat's Claw,Spiked Claw,Azure Steel Claw,Shredding Claw,Sky-Cleaving Claw,Fortune's Blessing"
--- a/lua/app/config/strings/en/skill.lua
+++ b/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> 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>1</color> turns."
 	},
 	[4200120]={
 		["desc"]="Elemental Link: Clear <color=#3cff28>3</color> random elements and deal skill damage once."
--- a/lua/app/config/strings/en/skin.lua
+++ b/lua/app/config/strings/en/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="Initial"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="Initial"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/es/equip.lua
+++ b/lua/app/config/strings/es/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="Martillo Potente,Martillo de Guerrero,Martillo de Meteorito,Martillo Atacante,Martillo Letal,Estrella Fugaz"
 	},
 	[1400102]={
-		["name"]="Visera de Acero Bruto,Visera de Acero Fino,Corona de obsidiana,Corona de héroe,Corona de Cuerno de Dragón,Corona Eterna"
+		["name"]="Corona Floral,Corona con Perlas,Corona de Fuego,Corona de Jade,Corona de Fénix,Corona Suprema"
 	},
 	[1400103]={
-		["name"]="Túnica Gruesa,Armadura de Acero Delgado,Armadura Pesada,Armadura de Jade,Casco Dorado de Escamas de Dragón,Armadura Pesada Eterna"
+		["name"]="Forro de Cuero Suave,Túnica con Jade,Satén Morado,Túnica de Ámbar,Túnica con Pluma de Fénix,Túnica de Estrella Suprema"
 	},
 	[1400104]={
-		["name"]="Cinturón de Cuero,Faja de Oro Negro,Faja de Jinete,Faja de Tendón de Dragón,Cadena de Cintura Eterna,Pulsera de Cobre"
+		["name"]="Cinturón Bordado,Corsé Elegante,Cinturón Bordado con Perlas,Cinturón Imperial de Estrella,Cinturón de Ojos de Fénix,Cuerda Suprema"
 	},
 	[1400105]={
-		["name"]="Pulsera de Cobre,Muñequera de Cuero,Muñequera de Hierro,Guanteletes de Héroe,Muñequera de Barba de Dragón,Muñequera Eterna"
+		["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
 	},
 	[1400201]={
 		["name"]="Golpe de gato,Puño con Pinchos,Puño de Acero Verde,Puño Lacerante,Puño en Cielo ,Poder de Fortuna"
--- a/lua/app/config/strings/es/skill.lua
+++ b/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> 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>1</color> rondas."
 	},
 	[4200120]={
 		["desc"]="Enlace de Elementos: elimina <color=#3cff28>3</color> elementos aleatorios y causa un daño de habilidad."
--- a/lua/app/config/strings/es/skin.lua
+++ b/lua/app/config/strings/es/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="Inicial"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="Inicial"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/fr/skin.lua
+++ b/lua/app/config/strings/fr/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={

+	},
+	[1400101]={
+
 	},
 	[14002]={

@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/id/equip.lua
+++ b/lua/app/config/strings/id/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="Mallet Perkasa,Palu Prajurit,Penghancur Komet,Palu Pemusnah,Penghancur Jiwa,Bintang Jatuh"
 	},
 	[1400102]={
-		["name"]="Helm Baja Kasar,Pelindung Baja Halus,Mahkota Obsidian,Coronet Perkasa,Circlet Tanduk Naga,Mahkota Kemuliaan Abadi"
+		["name"]="Circlet Bunga,Circlet Mutiara,Circlet Api Emas,Circlet Giok,Circlet Phoenix,Mahkota Agung"
 	},
 	[1400103]={
-		["name"]="Jubah Tenun Tebal,Armor Cincin Baja Tipis,Plat Besi Gelap,Armor Giok Sang Juara,Plat Emas Wyrmhide,Plat Berat Abadi"
+		["name"]="Jubah Kulit Lembut,Jubah Giok,Sutra Kasa Ungu,Jubah Amber,Jubah Bulu Phoenix,Jubah Bintang Daulat"
 	},
 	[1400104]={
-		["name"]="Sabuk Kulit,Tali Pinggang Emas Eboni,Ksatria Baldric,Sabuk Otot Wyrm,Lingkar Kekal,Gelang Bronze"
+		["name"]="Sabuk Bordir,Tali Pinggang Elegan,Sabuk Mutiara,Sabuk Astral,Sabuk Phoenix,Sabuk Abadi"
 	},
 	[1400105]={
-		["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi"
+		["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
 	},
 	[1400201]={
 		["name"]="Cakar Kucing,Cakar Duri,Cakar Baja Azure,Cakar Pencabik,Cakar Pembelah Langit,Berkah Keberuntungan"
--- a/lua/app/config/strings/id/skill.lua
+++ b/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> 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>1</color> giliran."
 	},
 	[4200120]={
 		["desc"]="Link Elemen: Menghilangkan <color=#3cff28>3</color> elemen secara acak dan memberikan DMG skill."
--- a/lua/app/config/strings/id/skin.lua
+++ b/lua/app/config/strings/id/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="Awal"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="Awal"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/ja/equip.lua
+++ b/lua/app/config/strings/ja/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="マイティマレット,戦士のハンマー,彗星クラッシャー,破壊ハンマー,ソウルシャッター,流れ星"
 	},
 	[1400102]={
-		["name"]="鋼の仮面,ファインスチール製仮面,黒曜石の冠,勇気の冠,竜角の冠,永遠の冠"
+		["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし"
 	},
 	[1400103]={
-		["name"]="厚織りの法衣,薄鋼鉄製ハウバーク,玄鉄の鎧,強者の鎧,竜鱗の鎧,永遠の鎧"
+		["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ"
 	},
 	[1400104]={
-		["name"]="革ベルト,黒檀ゴールドのガードル,騎士のベルト,竜腱のガードル,永遠のガードル,銅のブレスレット"
+		["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ"
 	},
 	[1400105]={
-		["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド"
+		["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
 	},
 	[1400201]={
 		["name"]="猫の爪,トゲの爪,鋼の爪,裂傷の爪,空を切り裂く爪,福神の力"
--- a/lua/app/config/strings/ja/skill.lua
+++ b/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>効果を付与する。"
+		["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28><color=#fcb501><u>昏睡</u></color>効果を付与する。"
 	},
 	[4200120]={
 		["desc"]="元素連接：ランダムで<color=#3cff28>3</color>つの元素を消し、スキルを1回発動する。"
--- a/lua/app/config/strings/ja/skin.lua
+++ b/lua/app/config/strings/ja/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="デフォルト"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="デフォルト"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/ko/equip.lua
+++ b/lua/app/config/strings/ko/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="힘센 망치,워리어의 망치,유성 망치,장군의 망치,영혼 파괴 망치,떨어지는 별"
 	},
 	[1400102]={
-		["name"]="거친 강철 마스크,정교한 강철 마스크,어둠의 노블 왕관,용맹의 왕관,용의 뿔로 만든 왕관,화려한 영원의 왕관"
+		["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관"
 	},
 	[1400103]={
-		["name"]="두꺼운 니트 두루마기,얇은 강철 갑옷,검은 빛을 띤 무거운 중갑,강자의 옥 갑옷,용비늘 황금 투구,영원의 중갑"
+		["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브"
 	},
 	[1400104]={
-		["name"]="가죽 벨트,검은 황금 허리띠,기사의 벨트,용의 힘줄 허리띠,영원의 허리띠 장식,브론즈 팔찌"
+		["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트"
 	},
 	[1400105]={
-		["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대"
+		["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
 	},
 	[1400201]={
 		["name"]="고양이 펀치,손톱 세운 고양이 펀치,브론즈 고양이 펀치,거친 고양이 펀치,무시무시한 고양이 펀치,행운의 신이 내린 축복"
--- a/lua/app/config/strings/ko/skill.lua
+++ b/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> 효과를 부여합니다."
+		["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>1</color>턴 동안 <color=#3cff28><color=#fcb501><u>수면</u></color> 효과를 부여합니다."
 	},
 	[4200120]={
 		["desc"]="원소 연결: 무작위로 <color=#3cff28>3</color>개의 원소를 소멸하고 스킬 피해를 한 번 입힙니다."
--- a/lua/app/config/strings/ko/skin.lua
+++ b/lua/app/config/strings/ko/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="초기"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="초기"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/pt/equip.lua
+++ b/lua/app/config/strings/pt/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="Martelo Poderoso,Martelo do Combatente,Martelo do Meteoro Gigante,Martelo do Exército Quebrado,Martelo Quebra-alma,Meteorito"
 	},
 	[1400102]={
-		["name"]="Máscara de Aço Grosso,Elmo de Aço Refinado,Coroa de Obsidiana,Coroa da Valentia,Coroa do Chifre do Dragão,Coroa Majestosa da Eternidade"
+		["name"]="Coroa de Flor Comum,Tiara de Pérola,Tiara de Ouro Tece-chamas,Coroa de Jade da Lua Clara,Coroa Estrelada da Fênix,Coroa Encantadora da Supremacia"
 	},
 	[1400103]={
-		["name"]="Túnica Grossa,Cota de Anéis de Aço Fino,Armadura Pesada de Ferro Negro,Armadura de Jade do Valente,Couraça Dourada de Escamas de Dragão,Armadura Pesada da Eternidade"
+		["name"]="Vestimenta Interna de Couro Flexível,Túnica Adornada com Jade,Cetim e Gaza Roxa,Vestimenta de Âmbar,Traje Majestoso de Pena de Fênix,Túnica Estrelada da Supremacia"
 	},
 	[1400104]={
-		["name"]="Cinto de Couro,Cinto de Ouro Negro,Cinto do Cavaleiro,Cinta de Tendão de Dragão,Corrente de Cintura da Eternidade,Pulseira de Cobre"
+		["name"]="Faixa Bordada Simples,Cinta Elegante,Faixa Bordada de Pérola,Cinto da Luz Estelar,Cinta do Olhar da Fênix,Cordão Celestial da Supremacia"
 	},
 	[1400105]={
-		["name"]="Pulseira de Cobre,Braceletes de Couro,Braceletes de Coração de Ferro,Manoplas do Herói,Braceletes do Bigode do Dragão,Pulseiras da Eternidade"
+		["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
 	},
 	[1400201]={
 		["name"]="Punho de Gato,Punho de Gato Espinhoso,Punho de Gato de Aço Azul,Punho de Gato Rasgador,Punho de Gato Rompe-céus,Força do Deus da Fortuna"
--- a/lua/app/config/strings/pt/skill.lua
+++ b/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> 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>1</color> turnos."
 	},
 	[4200120]={
 		["desc"]="Elo Elemental: elimina <color=#3cff28>3</color> elementos aleatórios e causa um golpe de dano de habilidade."
--- a/lua/app/config/strings/pt/skin.lua
+++ b/lua/app/config/strings/pt/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="Inicial"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="Inicial"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/ru/skin.lua
+++ b/lua/app/config/strings/ru/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={

+	},
+	[1400101]={
+
 	},
 	[14002]={

@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/th/equip.lua
+++ b/lua/app/config/strings/th/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="ค้อนยักษ์,ค้อนนักรบ,ค้อนดาวตก,ค้อนทำลาย,ค้อนตัดวิญญาณ,อุกกาบาต"
 	},
 	[1400102]={
-		["name"]="เกราะหน้าเหล็กหยาบ,เกราะหน้าเหล็กเลิศ,มงกุฎออบซิเดียน,มงกุฎกล้าหาญ,มงกุฎเขามังกร,มงกุฎนิรันดร์"
+		["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม"
 	},
 	[1400103]={
-		["name"]="เสื้อยาวถักหนา,เกราะวงแหวนเหล็กบาง,เกราะหนักเหล็ก,เกราะหยกผู้แข็งแกร่ง,บุตรขุนนางเกล็ดมังกร,เกราะหนักนิรันดร์"
+		["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม"
 	},
 	[1400104]={
-		["name"]="เข็มขัดหนัง,คอร์เซ็ททอง,แหวนเอวอัศวิน,คอร์เซ็ทเอ็นมังกร,ห่วงโซ่เอวนิรันดร์,สร้อยข้อมือทองแดง"
+		["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม"
 	},
 	[1400105]={
-		["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์"
+		["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
 	},
 	[1400201]={
 		["name"]="หมัดแมว,หมัดแมวหนามแหลม,หมัดแมวเหล็กเขียว,หมัดแมวฉีกขาด,หมัดแมวทะลวง,พลังเทพโชคลาภ"
--- a/lua/app/config/strings/th/skill.lua
+++ b/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=#3cff28>2</color>รอบ"
+		["desc"]="ฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์<color=#3cff28><color=#fcb501><u>หลับ</u></color> <color=#3cff28>1</color>รอบ"
 	},
 	[4200120]={
 		["desc"]="การเชื่อมโยงธาตุ: สุ่มกำจัดธาตุ<color=#3cff28>3</color>อัน และสร้างดาเมจสกิล 1 ครั้ง"
--- a/lua/app/config/strings/th/skin.lua
+++ b/lua/app/config/strings/th/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="เริ่มต้น"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="เริ่มต้น"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/vi/equip.lua
+++ b/lua/app/config/strings/vi/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="Búa Mạnh,Búa Chiến Sĩ,Búa Sao Băng,Búa Phá Quân,Búa Đoạn Hồn,Thiên Thạch"
 	},
 	[1400102]={
-		["name"]="Mặt Nạ Thép Thô,Mũ Thép Tinh Thiết,Mũ Hắc Diệu,Vương Miện Anh Dũng,Mũ Sừng Rồng,Mũ Vĩnh Hằng"
+		["name"]="Mũ Gỗ Phàm Hoa,Mũ Ngọc Trai,Mũ Vàng Vân Lửa,Mũ Ngọc Trăng Sáng,Mũ Sao Mũ Phượng,Mũ Chí Tôn"
 	},
 	[1400103]={
-		["name"]="Áo Dệt Kim Dày,Giáp Thép Mỏng,Giáp Huyền Thiết,Giáp Ngọc Cường Giả,Mũ Vàng Vảy Rồng,Giáp Vĩnh Hằng"
+		["name"]="Áo Choàng Da,Áo Choàng Ngọc Bích,Tơ Lụa Sa Tím,Áo Hổ Phách,Trang Phục Phụng Hoàng,Áo Choàng Chí Tôn"
 	},
 	[1400104]={
-		["name"]="Đai Da,Đai Than Đá,Đai Kỵ Sĩ,Đai Gân Rồng,Đai Vĩnh Hằng,Vòng Tay Đồng"
+		["name"]="Đai Đơn Giản,Đai Thanh Lịch,Đai Ngọc Trai,Đai Ánh Sao,Đai Mắt Phượng,Dây Chí Tôn"
 	},
 	[1400105]={
-		["name"]="Vòng Tay Đồng,Đai Da Cổ Tay,Đai Thép Cổ Tay,Bao Tay Anh Hùng,Tay Râu Rồng,Vòng Vĩnh Hằng"
+		["name"]="Vòng Tay Tử Thiết,Bao Tay Nhẹ Nhàng,Bao Tay Hoàng Kim,Bao Tay Chòm Sao,Bao Tay Xương Phượng,Giáp Tay Chí Tôn"
 	},
 	[1400201]={
 		["name"]="Miêu Quyền,Miêu Quyền Gai Góc,Miêu Quyền Thép Xanh,Miêu Quyền Vết Rách,Miêu Quyền Phá Không,Sức Mạnh Phúc Thần"
--- a/lua/app/config/strings/vi/skill.lua
+++ b/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=#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>1</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."
--- a/lua/app/config/strings/vi/skin.lua
+++ b/lua/app/config/strings/vi/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="Ban Đầu"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="Ban Đầu"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/config/strings/zh/equip.lua
+++ b/lua/app/config/strings/zh/equip.lua
@ -48,16 +48,16 @@ local equip = {
 		["name"]="巨力錘,戰者之錘,流星巨錘,破軍錘,斷魂錘,隕星"
 	},
 	[1400102]={
-		["name"]="粗鋼面甲,精鋼面盔,黑曜貴冠,英勇冠冕,龍角之冠,永恆華冠"
+		["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠"
 	},
 	[1400103]={
-		["name"]="厚織長衫,薄鋼環甲,玄鐵重甲,強者玉甲,龍鱗金冑,永恆重鎧"
+		["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍"
 	},
 	[1400104]={
-		["name"]="皮革腰帶,烏金束腰,騎士腰環,龍筋束腰,永恆腰鏈,銅製手環"
+		["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索"
 	},
 	[1400105]={
-		["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪"
+		["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
 	},
 	[1400201]={
 		["name"]="貓拳,尖刺貓拳,青鋼貓拳,裂傷貓拳,破空貓拳,福神之力"
--- a/lua/app/config/strings/zh/skill.lua
+++ b/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=#3cff28>2</color>回合。"
+		["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>1</color>回合。"
 	},
 	[4200120]={
 		["desc"]="元素連接：隨機消除<color=#3cff28>3</color>個元素，並造成一次技能傷害。"
--- a/lua/app/config/strings/zh/skill_rogue.lua
+++ b/lua/app/config/strings/zh/skill_rogue.lua
@ -579,7 +579,7 @@ local skill_rogue = {
 		["desc"]="冰霜劍舞附帶的冰霜效果，效果提高。"
 	},
 	[4400105]={
-		["desc"]="冰霜劍舞有<color=#3cff28>50%</color>機率附帶凍傷效果，<color=#3cff28>2</color>回合。"
+		["desc"]="冰霜劍舞有<color=#3cff28>50%</color>機率附帶凍結效果，<color=#3cff28>2</color>回合。"
 	},
 	[4400106]={
 		["desc"]="寒冰妖姬攻擊提高<color=#3cff28>15%</color>。"
--- a/lua/app/config/strings/zh/skin.lua
+++ b/lua/app/config/strings/zh/skin.lua
@ -10,6 +10,9 @@ local skin = {
 	},
 	[14001]={
 		["value"]="初始"
+	},
+	[1400101]={
+
 	},
 	[14002]={
 		["value"]="初始"
@ -103,6 +106,6 @@ local skin = {
 	}
 }
 local config = {
-data=skin,count=34
+data=skin,count=35
 }
 return config
--- a/lua/app/module/arena/arena_manager.lua
+++ b/lua/app/module/arena/arena_manager.lua
@ -249,4 +249,18 @@ function ArenaManager:showGiftPopUI(showType)
    UIManager:showUI("app/ui/arena/arena_pop_gift_ui", {showType = showType})
 end

+-- 领取段位奖励
+function ArenaManager:reqGradingReward(id)
+    local getIds = {}
+    table.insert(getIds, id)
+    self:sendMessage(ProtoMsgType.FromMsgEnum.PVPStageRewardReq, {ids = getIds}, {}, self.rspGradingReward, BIReport.ITEM_GET_TYPE.ARENA_GRADING_REWARD)
+end
+
+function ArenaManager:rspGradingReward(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        DataManager.ArenaData:onGradingRewardReceived(result.reqData.ids)
+        GFunc.showRewardBox(result.rewards)
+    end
+end
+
 return ArenaManager
--- a/lua/app/proto/proto_msg_type.lua
+++ b/lua/app/proto/proto_msg_type.lua
@ -177,6 +177,8 @@ local ProtoMsgType = {
        [3613497485] = "ArenaBountyRewardReq",
        [3613499318] = "ArenaBountyRewardRsp",
        [3624439233] = "NewMailNtf",
+        [3629950931] = "PVPStageRewardReq",
+        [3629952764] = "PVPStageRewardRsp",
        [3663247602] = "MallDailyResetNtf",
        [3663314292] = "MallDailyResetReq",
        [3663316125] = "MallDailyResetRsp",
@ -208,6 +210,8 @@ local ProtoMsgType = {
        [4155167647] = "SummerTaskClaimRsp",
        [4188104820] = "HeroFundAwardReq",
        [4188106653] = "HeroFundAwardRsp",
+        [4195650791] = "TriggerWeaponArmorGiftReq",
+        [4195652624] = "TriggerWeaponArmorGiftRsp",
        [4256333947] = "ExistReq",
        [4256335780] = "ExistRsp",
    },
@ -389,6 +393,8 @@ local ProtoMsgType = {
        ArenaBountyRewardReq = 3613497485,
        ArenaBountyRewardRsp = 3613499318,
        NewMailNtf = 3624439233,
+        PVPStageRewardReq = 3629950931,
+        PVPStageRewardRsp = 3629952764,
        MallDailyResetNtf = 3663247602,
        MallDailyResetReq = 3663314292,
        MallDailyResetRsp = 3663316125,
@ -420,6 +426,8 @@ local ProtoMsgType = {
        SummerTaskClaimRsp = 4155167647,
        HeroFundAwardReq = 4188104820,
        HeroFundAwardRsp = 4188106653,
+        TriggerWeaponArmorGiftReq = 4195650791,
+        TriggerWeaponArmorGiftRsp = 4195652624,
        ExistReq = 4256333947,
        ExistRsp = 4256335780,
    },
@ -601,6 +609,8 @@ local ProtoMsgType = {
        ArenaBountyRewardReq = "ArenaBountyRewardReq",
        ArenaBountyRewardRsp = "ArenaBountyRewardRsp",
        NewMailNtf = "NewMailNtf",
+        PVPStageRewardReq = "PVPStageRewardReq",
+        PVPStageRewardRsp = "PVPStageRewardRsp",
        MallDailyResetNtf = "MallDailyResetNtf",
        MallDailyResetReq = "MallDailyResetReq",
        MallDailyResetRsp = "MallDailyResetRsp",
@ -632,6 +642,8 @@ local ProtoMsgType = {
        SummerTaskClaimRsp = "SummerTaskClaimRsp",
        HeroFundAwardReq = "HeroFundAwardReq",
        HeroFundAwardRsp = "HeroFundAwardRsp",
+        TriggerWeaponArmorGiftReq = "TriggerWeaponArmorGiftReq",
+        TriggerWeaponArmorGiftRsp = "TriggerWeaponArmorGiftRsp",
        ExistReq = "ExistReq",
        ExistRsp = "ExistRsp",
    },
--- a/lua/app/ui/arena/arena_grading_reward_ui.lua
+++ b/lua/app/ui/arena/arena_grading_reward_ui.lua
@ -0,0 +1,77 @@
+local ArenaGradingRewardUI = class("ArenaGradingRewardUI", BaseUI)
+
+function ArenaGradingRewardUI:isFullScreen()
+	return true
+end
+
+function ArenaGradingRewardUI:showCommonBG()
+	return false
+end
+
+function ArenaGradingRewardUI:getPrefabPath()
+	return "assets/prefabs/ui/arena/arena_grading_reward_ui.prefab"
+end
+
+function ArenaGradingRewardUI:onPressBackspace()
+	self:closeUI()
+end
+
+function ArenaGradingRewardUI:ctor()
+end
+
+function ArenaGradingRewardUI:onCover()
+end
+
+function ArenaGradingRewardUI:onReshow()
+end
+
+function ArenaGradingRewardUI:onClose()
+end
+
+function ArenaGradingRewardUI:onLoadRootComplete()
+	local uiMap = self.root:genAllChildren()
+
+	self.scrollrectComp = uiMap["arena_grading_reward_ui.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+	self.scrollrectContent = uiMap["arena_grading_reward_ui.scrollrect.viewport.content"]
+	self.btnClose = uiMap["arena_grading_reward_ui.banner.btn_close"]
+	self.txTips = uiMap["arena_grading_reward_ui.banner.tx_tips"]
+
+	
+	local cfg = DataManager.ArenaData:getGradingRewardCfg()
+	self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_39))
+	self.scrollrectComp:addInitCallback(function()
+		return "app/ui/arena/cell/arena_grading_reward_cell"
+	end)
+	self.scrollrectComp:addRefreshCallback(function(index, cell)
+		cell:refresh(index)
+	end)
+	self.scrollrectComp:clearCells()
+	self.scrollrectComp:refillCells(#cfg)
+	-- 处理进入定位
+	self.scrollrectContent:setActive(false)
+	self:performWithDelayGlobal(function()
+		-- self.scrollrectComp:moveToIndex(DataManager.ArenaData:getCurTargetIndex())
+		local posY = -DataManager.ArenaData:getCurTargetPosY()
+		local temp = -self.scrollrectComp.baseObject:fastGetSizeDeltaY() / 2
+		Logger.logHighlight(posY.. "/"..temp)
+		if posY + temp <= 0 then
+			posY = posY + temp
+		end
+		Logger.logHighlight(posY)
+		self.scrollrectContent:setAnchoredPositionY(posY)
+		self.scrollrectContent:setActive(true)
+	end, 0.01)
+
+    self.btnClose:addClickListener(function()
+		self:closeUI()
+	end)
+	self:bind(DataManager.ArenaData, "isDirty", function()
+        self:onRefresh()
+    end)
+end
+
+function ArenaGradingRewardUI:onRefresh()
+	self.scrollrectComp:updateAllCell()
+end
+
+return ArenaGradingRewardUI
--- a/lua/app/ui/arena/arena_grading_reward_ui.lua.meta
+++ b/lua/app/ui/arena/arena_grading_reward_ui.lua.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: fa7e37c3349ab1646a3232a7eb25fa33
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/ui/arena/arena_season_reward_ui.lua
+++ b/lua/app/ui/arena/arena_season_reward_ui.lua
@ -137,7 +137,7 @@ function ArenaSeasonRewardUI:showGetReward()

 	self.btnGet:addRedPoint(110, 35, 0.6)

-	local rewards = DataManager.ArenaData:getGradingRewardInfo(lastId)
+	local rewards = DataManager.ArenaData:getSeasonRewards(lastId)
 	local rewardCount = #rewards
    self.getRewardComp:addInitCallback(function()
 		return GConst.TYPEOF_LUA_CLASS.REWARD_CELL
--- a/lua/app/ui/arena/cell/arena_grading_cell.lua
+++ b/lua/app/ui/arena/cell/arena_grading_cell.lua
@ -9,6 +9,10 @@ function ArenaGradingCell:init()
 end

 function ArenaGradingCell:refresh(id)
+    if id == nil then
+        return
+    end
+
    self.txGrading:setText(DataManager.ArenaData:getGradingName(id))
    self.imgIdx:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingNumName(id))
    self.imgGrading:setSprite(GConst.ATLAS_PATH.ARENA, DataManager.ArenaData:getGradingIconName(id))
--- a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua
+++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua
@ -0,0 +1,133 @@
+local ArenaGradingRewardCell = class("ArenaGradingRewardCell", BaseCell)
+
+local COMMON_SIZE = 220
+local UNLOCK_SIZE = 570
+
+function ArenaGradingRewardCell:init()
+    local uiMap = self:getUIMap()
+
+    -- 进度
+    self.progress = uiMap["arena_grading_reward_cell.progress"]
+    self.imgProgCur = uiMap["arena_grading_reward_cell.progress.img_prog_cur"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
+    self.imgProgMax = uiMap["arena_grading_reward_cell.progress.img_prog_max"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
+    self.txGradingValue = uiMap["arena_grading_reward_cell.progress.tx_value"]
+    -- 游标
+    self.tagProg = uiMap["arena_grading_reward_cell.cur_prog"]
+    self.txTag = uiMap["arena_grading_reward_cell.cur_prog.tx_tag"]
+    -- 通用奖励
+    self.commonReward = uiMap["arena_grading_reward_cell.common_reward"]
+    self.txDesc = uiMap["arena_grading_reward_cell.common_reward.tx_desc"]
+    self.maskReward = uiMap["arena_grading_reward_cell.common_reward.mask"]
+    self.rewards = {}
+    for i = 1, 4 do
+        table.insert(self.rewards, uiMap["arena_grading_reward_cell.common_reward.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL))
+    end
+    -- 英雄解锁
+    self.heroUnlock = uiMap["arena_grading_reward_cell.hero_unlock"]
+    self.spineGradingRoot = uiMap["arena_grading_reward_cell.hero_unlock.spine_root"]
+    self.spineGrading = uiMap["arena_grading_reward_cell.hero_unlock.spine_grading"]
+    self.txGrading = uiMap["arena_grading_reward_cell.hero_unlock.title.tx_grading"]
+    self.txUnlock = uiMap["arena_grading_reward_cell.hero_unlock.tx_unlock"]
+    self.heroList = uiMap["arena_grading_reward_cell.hero_unlock.hero_list"]
+    self.heros = {}
+    for i = 1, 6 do
+        table.insert(self.heros, uiMap["arena_grading_reward_cell.hero_unlock.hero_list.item_hero_" .. i])
+    end
+
+    self.commonReward:addClickListener(function()
+        if DataManager.ArenaData:canGetGradingReward(self.id) and not DataManager.ArenaData:isReceivedGradingReward(self.id) then
+            ModuleManager.ArenaManager:reqGradingReward(self.id)
+        end
+	end)
+end
+
+function ArenaGradingRewardCell:refresh(id)
+    self.id = id
+    local cfg = DataManager.ArenaData:getGradingRewardCfg()[self.id]
+    local curPoint = DataManager.ArenaData:getScore()
+    local maxPoint = DataManager.ArenaData:getMaxScore()
+    local curProg = DataManager.ArenaData:getGradingRewardProgressByScore(self.id, curPoint)
+    local maxProg = DataManager.ArenaData:getGradingRewardProgressByScore(self.id, maxPoint)
+
+    -- Logger.logHighlight(id.."当前进度:"..cfg.score.."/" .. curProg .."/"..maxProg)
+
+    self.spineGradingRoot:removeAllChildren()
+    if cfg.unlock_hero and #cfg.unlock_hero > 0 then
+        -- 解锁英雄
+        self.baseObject:setSizeDeltaY(UNLOCK_SIZE)
+        self.heroUnlock:setActive(true)
+
+        local gradingId = DataManager.ArenaData:getGradingIdFromScore(cfg.score)
+        SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.spineGradingRoot, function(spineObject)
+            spineObject:setSkin(DataManager.ArenaData:getGradingNumName(gradingId))
+            spineObject:playAnim("idle", true)
+        end)
+        self.txGrading:setText(DataManager.ArenaData:getGradingName(gradingId))
+        if maxPoint >= cfg.score then
+            self.txUnlock:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_38))
+        else
+            self.txUnlock:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_37))
+        end
+
+        for idx, hero in ipairs(self.heros) do
+            if cfg.unlock_hero[idx] then
+                hero:setActive(true)
+                local heroInfo = ConfigManager:getConfig("hero")[cfg.unlock_hero[idx]]
+                hero:setSprite(GConst.ATLAS_PATH.ICON_ITEM, "frame_"..heroInfo.qlt)
+                local map = hero:genAllChildren()
+                map["img_hero"]:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon)
+            else
+                hero:setActive(false)
+            end
+        end
+    else
+        self.baseObject:setSizeDeltaY(COMMON_SIZE)
+        self.heroUnlock:setActive(false)
+    end
+
+    self.txTag:setText(curPoint)
+    self.txGradingValue:setText(cfg.score)
+    self.imgProgCur.value = curProg
+    self.imgProgMax.value = maxProg
+
+    if DataManager.ArenaData:getCurGradingRewardId() == self.id then
+        self.tagProg:setVisible(true)
+        local rootHeight = self.baseObject:fastGetSizeDeltaY()
+        local posY = rootHeight * curProg
+
+        -- 高度超框处理
+        if self.id == 1 or self.id == #table.keys(cfg) then
+            local tagHeight = self.tagProg:fastGetSizeDeltaY()
+            if posY < tagHeight / 2  then
+                posY = tagHeight / 2
+            end
+        end
+        self.tagProg:setAnchoredPositionY(posY)
+    else
+        self.tagProg:setVisible(false)
+    end
+
+    local canGet = DataManager.ArenaData:canGetGradingReward(self.id)
+    local isReceived = DataManager.ArenaData:isReceivedGradingReward(self.id)
+    self.maskReward:setVisible(not canGet)
+    if canGet then
+        if isReceived then
+            self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_5))
+        else
+            self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_42))
+        end
+    else
+        self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_6))
+    end
+
+    for idx, reward in ipairs(self.rewards) do
+        if cfg.reward[idx] then
+            reward:setVisible(true)
+            reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived)
+        else
+            reward:setVisible(false)
+        end
+    end
+end
+
+return ArenaGradingRewardCell
--- a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.meta
+++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b77becd3787902a478c7fab399b3ad23
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
--- a/lua/app/ui/arena/cell/arena_season_reward_cell.lua
+++ b/lua/app/ui/arena/cell/arena_season_reward_cell.lua
@ -11,7 +11,7 @@ function ArenaSeasonRewardCell:init()
 end

 function ArenaSeasonRewardCell:refresh(id)
-    local rewards = DataManager.ArenaData:getGradingRewardInfo(id)
+    local rewards = DataManager.ArenaData:getSeasonRewards(id)

    for idx, cell in pairs(self.rewards) do
        if rewards[idx] then
--- a/lua/app/ui/battle/battle_result_ui.lua
+++ b/lua/app/ui/battle/battle_result_ui.lua
@ -242,6 +242,10 @@ function BattleResultUI:refreshArenaNode()
    local curId = DataManager.ArenaData:getGradingId()
    local lastId = DataManager.ArenaData:getGradingIdFromScore(lastScore)

+    if curId == nil or lastId == nil then
+        return
+    end
+
    self.arenaTxGrading:setText(DataManager.ArenaData:getGradingName(lastId))
    self:refreshArenaGradingSpine(lastId)

@ -321,6 +325,10 @@ function BattleResultUI:refreshArenaBoxNode()
 end

 function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp)
+    if gradingId == nil then
+        return
+    end
+
    if self.arenaSpine then
        self.arenaSpine:playAnimComplete("vanish", false, false, function()
            self.arenaSpine:destroy()
--- a/lua/app/ui/main_city/component/arena_comp.lua
+++ b/lua/app/ui/main_city/component/arena_comp.lua
@ -57,12 +57,15 @@ function ArenaComp:init()
    self.txReward = uiMap["arena_comp.btn_reward.tx_reward"]
    self.btnRank = uiMap["arena_comp.btn_rank"]
    self.txRank = uiMap["arena_comp.btn_rank.tx_rank"]
+    self.btnGradingReward = uiMap["arena_comp.btn_grading_reward"]
+    self.txGradingReward = uiMap["arena_comp.btn_grading_reward.tx_grading_reward"]

    self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_4))
    self.txRecord:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_7))
    self.txFormation:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_9))
-    self.txReward:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC))
+    self.txReward:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_41))
    self.txRank:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_5))
+    self.txGradingReward:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_40))

    self.btnHelp:addClickListener(function()
        local params = {
@ -84,6 +87,9 @@ function ArenaComp:init()
    self.btnRank:addClickListener(function()
        UIManager:showUI("app/ui/arena/arena_rank_ui")
    end)
+    self.btnGradingReward:addClickListener(function()
+        UIManager:showUI("app/ui/arena/arena_grading_reward_ui")
+    end)
    self:initBounty()
    self:refreshShow()
    self:initRightBtns()
@ -176,6 +182,7 @@ function ArenaComp:refreshShow()

    self:refreshBounty() -- 刷新战令
    self:updateTimer()
+    self:refreshGradingRewardRedPoint()
 end

 function ArenaComp:updateTimer()
@ -253,4 +260,13 @@ function ArenaComp:refreshRightBtns()
    self.rightNode:setVisible(y < 0)
 end

+-- 刷新段位奖励红点
+function ArenaComp:refreshGradingRewardRedPoint()
+    if DataManager.ArenaData:hasGradingRewardRedDot() then
+        self.btnGradingReward:addRedPoint(50, 50, 0.6)
+    else
+        self.btnGradingReward:removeRedPoint()
+    end
+end
+
 return ArenaComp
--- a/lua/app/userdata/arena/arena_data.lua
+++ b/lua/app/userdata/arena/arena_data.lua
@ -27,15 +27,14 @@ function ArenaData:init(data)
    self.todayAdRematchCount = data.today_ad_count-- 今日看广告跳匹配cd次数
    self.todayWinAdBoxCount = data.ad_box_win_reward_count-- 今日胜利宝箱次数
    self.todayLoseAdBoxCount = data.ad_box_lose_reward_count-- 今日失败宝箱次数
+    self.maxScore = data.highest_score_in_history-- 历史最高积分
+    self.gotGradingRewardIds = data.stage_gift_id-- 已领取的段位奖励id
    self:updateTotalFightCount(data)
    -- 初始化rank配置
    self.cfgRank = self:getRankCfg(self.season)
    -- 初始化time配置
    self.cfgTime = self:getTimeCfg(self.season)

-    if data.highest_score_in_history then
-        self.maxGradingId = self:getGradingIdFromScore(data.highest_score_in_history)
-    end
    self.curGradingId = self:getGradingIdFromScore(self.score) -- 当前所在段位id
    DataManager.FormationData:initArena(data.attack_array_heroes, data.defend_array_heroes)
    DataManager.PlayerData:initArena(data.today_ticket_buy_count, data.today_ticket_ad_count)
@ -179,7 +178,7 @@ function ArenaData:getRemainSeasonSettlementTime()
 end

 -- 获取赛季段位结算奖励信息
-function ArenaData:getGradingRewardInfo(id)
+function ArenaData:getSeasonRewards(id)
    local cfg = ConfigManager:getConfig("arena_rank")
    if cfg[id] == nil then
        Logger.logError("未找到段位[%d]相关数据", id)
@ -188,8 +187,23 @@ function ArenaData:getGradingRewardInfo(id)
    return cfg[id].season_reward
 end

+-- 获取当前赛季最低段位积分
+function ArenaData:getSeasonGradingMinScore()
+    local result = 0
+    for id, data in pairs(self.cfgRank) do
+        if result == 0 or result > data.score then
+            result = data.score
+        end
+    end
+    return result
+end
+
 -- 获取积分所对应的段位id
 function ArenaData:getGradingIdFromScore(score, isLastSeason)
+    if score == nil or score < 0 then
+        return nil
+    end
+
    local gradingId,gradingInfo = nil
    local cfg = self.cfgRank
    if isLastSeason then
@ -265,7 +279,7 @@ end
 -- 获取段位名称
 function ArenaData:getGradingName(id)
    local cfg = ConfigManager:getConfig("arena_rank")
-    if cfg[id] == nil then
+    if id == nil or cfg[id] == nil then
        Logger.logError("未找到段位[%d]相关数据", id)
        return nil
    end
@ -363,6 +377,11 @@ end

 -- 个人 ----------------------------------------------------------------------

+-- 获取历史最高段位积分
+function ArenaData:getMaxScore()
+    return self.maxScore or self:getScore()
+end
+
 -- 获取当前段位积分
 function ArenaData:getScore()
    return self.score
@ -375,7 +394,7 @@ end

 -- 获取当前段位
 function ArenaData:getFormartMaxGrading()
-    local id = self.maxGradingId or self.curGradingId
+    local id = self:getGradingIdFromScore(self.maxScore) or self.curGradingId
    if not id then
        id = 0
    end
@ -467,6 +486,157 @@ function ArenaData:hasAdBox(isWin, checkCount)
    return false
 end

+-- 升段奖励 ----------------------------------------------------------------------
+
+-- 获取段位奖励配置
+function ArenaData:getGradingRewardCfg()
+    if self.gradingRewardCfg == nil then
+        self.gradingRewardCfg = ConfigManager:getConfig("arena_gift")
+    end
+
+    return self.gradingRewardCfg
+end
+
+-- 获取段位道具奖励
+function ArenaData:getGradingRewardsItem(id)
+    return self:getGradingRewardCfg()[id].reward
+end
+
+-- 获取段位英雄奖励， nil为没有
+function ArenaData:getGradingRewardsHero(id)
+    return self:getGradingRewardCfg()[id].unlock_hero
+end
+
+-- 获取当前列表定位所在档位的index
+function ArenaData:getCurTargetIndex()
+    -- 判断最低奖励可领取
+    for id, data in ipairs(self:getGradingRewardCfg()) do
+        if self:canGetGradingReward(id) and not self:isReceivedGradingReward(id) then
+            return id
+        end
+    end
+
+    return self:getCurGradingRewardId()
+end
+
+-- 获取当前所在段位奖励的id
+function ArenaData:getCurGradingRewardId()
+    local curScore = self:getScore()
+    for id, data in ipairs(self:getGradingRewardCfg()) do
+        local prog = self:getGradingRewardProgressByScore(id, curScore)
+        if prog >= 0 and prog < 1 then
+            return id
+        end
+    end
+
+    return 1
+end
+
+-- 段位奖励是否可领取
+function ArenaData:canGetGradingReward(id)
+    return self:getMaxScore() >= self:getGradingRewardCfg()[id].score
+end
+
+-- 段位奖励是否已领取
+function ArenaData:isReceivedGradingReward(id)
+    if self.gotGradingRewardIds == nil then
+        return false
+    end
+
+    return table.containValue(self.gotGradingRewardIds, id)
+end
+
+-- 获取积分对应的段位奖励档位进度
+function ArenaData:getGradingRewardProgressByScore(id, score)
+    local cfg = self:getGradingRewardCfg()
+    local point = cfg[id].score
+
+    local rangeMin = 0
+    local rangeMax = 0
+    if id - 1 > 0 then
+        rangeMin = point - math.floor((point - cfg[id - 1].score) / 2)
+    else
+        rangeMin = self:getSeasonGradingMinScore()
+    end
+    if id + 1 <= #cfg then
+        rangeMax = point + math.floor((cfg[id + 1].score - point) / 2)
+    else
+        rangeMax = point
+    end
+
+    -- Logger.logHighlight(id.."档位范围:"..rangeMin.."->"..rangeMax)
+
+    if id == 1 then
+        -- 第一个档位特殊处理
+        local minScore = self:getSeasonGradingMinScore()
+        local prog = (score - minScore) / (point - minScore)
+        if prog > 0.5 then
+            prog = 0.5
+        end
+        if score > point then
+            prog = prog + ((score - point) / (rangeMax - point))
+        end
+        return prog
+    end
+
+    if score >= rangeMax then
+        -- 超过进度条
+        return 1
+    elseif score < rangeMin then
+        --低于进度条
+        return -1
+    elseif score == rangeMin then
+        -- 进度最低值
+        return 0
+    else
+        -- 在进度条范围内
+        return (score - rangeMin) / (rangeMax - rangeMin)
+    end
+end
+
+-- 是否有段位奖励入口红点
+function ArenaData:hasGradingRewardRedDot()
+    -- 有奖励可领取
+    for id, data in pairs(self:getGradingRewardCfg()) do
+        if self:canGetGradingReward(id) and not self:isReceivedGradingReward(id) then
+            return true
+        end
+    end
+
+    return false
+end
+
+local GRADING_REWARD_COMMON_SIZE = 220
+local GRADING_REWARD_UNLOCK_SIZE = 570
+
+-- 获取当前列表定位所在档位的高度
+function ArenaData:getCurTargetPosY()
+    -- 判断最低奖励可领取
+    local totalHeight = 0
+    for id, data in ipairs(self:getGradingRewardCfg()) do
+        if self:canGetGradingReward(id) and not self:isReceivedGradingReward(id) then
+            -- Logger.logHighlight(id)
+            return totalHeight
+        end
+
+        totalHeight = totalHeight + (data.unlock_hero ~= nil and GRADING_REWARD_UNLOCK_SIZE or GRADING_REWARD_COMMON_SIZE)
+    end
+
+    -- 判断当前档位
+    totalHeight = 0
+    local curScore = self:getScore()
+    for id, data in ipairs(self:getGradingRewardCfg()) do
+        local prog = self:getGradingRewardProgressByScore(id, curScore)
+        if prog >= 0 and prog < 1 then
+            return totalHeight
+        end
+
+        totalHeight = totalHeight + (data.unlock_hero ~= nil and GRADING_REWARD_UNLOCK_SIZE or GRADING_REWARD_COMMON_SIZE)
+    end
+
+    return 0
+end
+
 -- 事件处理 ----------------------------------------------------------------------

 function ArenaData:onDayChanged()
@ -518,12 +688,12 @@ function ArenaData:onBattleResultReceived(settlement, result)
    -- 积分改变
    self.score = self.score + settlement.incr_score
    self.curGradingId = self:getGradingIdFromScore(self.score)
-    if result.highest_score_in_history then
-        local beforeMaxGrading = self.maxGradingId
-        self.maxGradingId = self:getGradingIdFromScore(result.highest_score_in_history)
-        if beforeMaxGrading ~= self.maxGradingId then
-            DataManager.HeroData:checkIfCanShowHeroUnlockDan(self:getFormartMaxGrading())
-        end
+
+    local beforeMaxGradingId = self:getGradingIdFromScore(self.maxScore)
+    self.maxScore = result.highest_score_in_history
+    local curMaxGradingId = self:getGradingIdFromScore(self.maxScore)
+    if beforeMaxGradingId ~= curMaxGradingId then
+        DataManager.HeroData:checkIfCanShowHeroUnlockDan(self:getFormartMaxGrading())
    end

    self:setDirty()
@ -560,4 +730,10 @@ function ArenaData:onSeasonChanged()
    self:setDirty()
 end

+-- 领取段位奖励
+function ArenaData:onGradingRewardReceived(ids)
+    self.gotGradingRewardIds = table.addArray(self.gotGradingRewardIds, ids)
+    self:setDirty()
+end
+
 return ArenaData