diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index 8bceba3b..97bc66a3 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -417,6 +417,7 @@ void BattleDataContext::GetHeroLvQuality(long long& hero_uniid, int& hero_lv, in
     quality = 1;
     if (owner_.Get()->IsPlayer()) {
         if (hero_ability_ && hero_dto && hero_dto->IsObject()) {
+            hero_uniid = hero_dto->Get("hero_uniid", 0).GetInt64();
             hero_lv = hero_dto->Get("hero_lv", 0).GetInt();
             quality = hero_dto->Get("quality", 0).GetInt();
         }
@@ -430,12 +431,14 @@ void BattleDataContext::GetWeaponLvQuality(long long& weapon_uniid, int& weapon_
     quality = 1;
     if (owner_.Get()->IsPlayer()) {
         if (weapon1_ability_) {
-            weapon_lv += weapon_dto1->Get("gun_lv", 0).GetInt();
-            quality += weapon_dto1->Get("quality", 0).GetInt();
+            weapon_uniid = weapon_dto1->Get("gun_uniid", 0).GetInt64();
+            weapon_lv = weapon_dto1->Get("gun_lv", 0).GetInt();
+            quality = weapon_dto1->Get("quality", 0).GetInt();
         }
         if (weapon2_ability_) {
-            weapon_lv += weapon_dto2->Get("gun_lv", 0).GetInt();
-            quality += weapon_dto2->Get("quality", 0).GetInt();
+            weapon_uniid = weapon_dto2->Get("gun_uniid", 0).GetInt64();
+            weapon_lv = weapon_dto2->Get("gun_lv", 0).GetInt();
+            quality = weapon_dto2->Get("quality", 0).GetInt();
         }
     }
 }