diff --git a/webapp/controller/HeroController.class.php b/webapp/controller/HeroController.class.php
index dc1c8ea7..f28a17c7 100644
--- a/webapp/controller/HeroController.class.php
+++ b/webapp/controller/HeroController.class.php
@@ -282,17 +282,30 @@ class HeroController extends BaseAuthedController {
             )
         );
         if ($row){
+
             $data = array(
                 'skill_id' => $row['skill_id'],
                 'weapon_uid1' => $row['weapon_uid1'],
                 'weapon_uid2' => $row['weapon_uid2'],
                 'chip_page' => $row['chip_page'],
+                'gun_id1'=>0,
+                'gun_id2'=>0,
             );
+            $gunDb1 = Gun::find($row['weapon_uid1']);
+            $gunDb2 = Gun::find($row['weapon_uid2']);
+            if ($gunDb1){
+                $data['gun_id1'] = $gunDb1['gun_id'];
+            }
+            if ($gunDb1){
+                $data['gun_id2'] = $gunDb2['gun_id'];
+            }
         }else{
             $data = array(
                 'skill_id' => \mt\Skill::DEFAULT_SKILL,
                 'weapon_uid1' => 0,
                 'weapon_uid2' => 0,
+                'gun_id1'=>0,
+                'gun_id2'=>0,
                 'chip_page' => 1,
             );
         }