diff --git a/doc/_common.py b/doc/_common.py
index e04b6ab6..7c400b47 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -138,8 +138,8 @@ class Hero(object):
             ['!attr', [Attr()], '属性'],
             ['try_count', 0, '剩余体验次数 当state=1时才有意义'],
             ['lock_type', 0, '0:无锁 1:升级 2:升阶'],
-            ['lock_time', 0, '使用锁定时间(升级或者升阶触发),单位秒,锁定期间不可战斗和做其他操作'],
-            ['trade_locktime', 0, '出售锁定时间(升级或者升阶完成后触发),单位秒,只锁交易，其他的操作仍可进行'],
+            ['unlock_time', 0, '使用解锁utc时间(升级或者升阶触发),锁定期间不可战斗和做其他操作,配合lock_type使用'],
+            ['unlock_trade_time', 0, '出售解锁utc时间(升级或者升阶完成后触发),只锁交易，其他的操作仍可进行，和lock_type无关是独立的锁!!!'],
         ]
 
 class HeroSkin(object):
diff --git a/webapp/controller/GunController.class.php b/webapp/controller/GunController.class.php
index fa4eb491..8b7c8cf7 100644
--- a/webapp/controller/GunController.class.php
+++ b/webapp/controller/GunController.class.php
@@ -2,6 +2,7 @@
 
 require_once('mt/GunTalentGrow.php');
 require_once('mt/GunTalent.php');
+require_once('mt/Parameter.php');
 
 require_once('models/GunSkin.php');
 require_once('models/GunTalent.php');
@@ -180,7 +181,8 @@ class GunController extends BaseAuthedController {
                          'gun_lv' => $gunDb['gun_lv'] + 1,
                          'rand_attr' => json_encode($attrs),
                          'lock_type' => Gun::LEVEL_LOCK,
-                         'unlock_time' => $this->_getNowTime() + $currLevelMeta['time']
+                         'unlock_time' => $this->_getNowTime() + $currLevelMeta['time'],
+                         'unlock_trade_time' => $this->_getNowTime() + $currLevelMeta['time'] + mt\Parameter::getVal('gun_lock_transaction_time', 0)
                      )
         );
         $propertyChgService = new services\PropertyChgService();
@@ -279,7 +281,8 @@ class GunController extends BaseAuthedController {
                          'quality' => $gunDb['quality'] + 1,
                          'rand_attr' => json_encode($attrs),
                          'lock_type' => Gun::QUALITY_LOCK,
-                         'unlock_time' => $this->_getNowTime() + $currQualityMeta['time']
+                         'unlock_time' => $this->_getNowTime() + $currQualityMeta['time'],
+                         'unlock_trade_time' => $this->_getNowTime() + $currQualityMeta['time'] + mt\Parameter::getVal('gun_lock_transaction_time', 0)
                      )
         );
         $propertyChgService = new services\PropertyChgService();
diff --git a/webapp/controller/HeroController.class.php b/webapp/controller/HeroController.class.php
index 21d42322..5bf7ae8e 100644
--- a/webapp/controller/HeroController.class.php
+++ b/webapp/controller/HeroController.class.php
@@ -6,6 +6,7 @@ require_once('mt/Item.php');
 require_once('mt/HeroLevel.php');
 require_once('mt/HeroQuality.php');
 require_once('mt/AttrHelper.php');
+require_once('mt/Parameter.php');
 
 require_once('models/Hero.php');
 require_once('models/HeroSkin.php');
@@ -167,7 +168,8 @@ class HeroController extends BaseAuthedController {
                          'hero_lv' => $heroDb['hero_lv'] + 1,
                          'rand_attr' => json_encode($attrs),
                          'lock_type' => Hero::LEVEL_LOCK,
-                         'unlock_time' => $this->_getNowTime() + $currLevelMeta['time']
+                         'unlock_time' => $this->_getNowTime() + $currLevelMeta['time'],
+                         'unlock_trade_time' => $this->_getNowTime() + $currLevelMeta['time'] + mt\Parameter::getVal('hero_lock_transaction_time', 0)
                      )
         );
         $propertyChgService = new services\PropertyChgService();
@@ -266,7 +268,8 @@ class HeroController extends BaseAuthedController {
                          'quality' => $heroDb['quality'] + 1,
                          'rand_attr' => json_encode($attrs),
                          'lock_type' => Gun::QUALITY_LOCK,
-                         'unlock_time' => $this->_getNowTime() + $currQualityMeta['time']
+                         'unlock_time' => $this->_getNowTime() + $currQualityMeta['time'],
+                         'unlock_trade_time' => $this->_getNowTime() + $currQualityMeta['time'] + mt\Parameter::getVal('hero_lock_transaction_time', 0)
                      )
         );
         $propertyChgService = new services\PropertyChgService();
diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index 2ce3cc53..bf7dd069 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -55,12 +55,11 @@ class Gun extends BaseModel {
     {
         $attr = emptyReplace(json_decode($row['rand_attr'], true), array());
         $lockType = 0;
-        $lockTime = 0;
+        $unlockTime = 0;
         if ($row['lock_type'] != 0 && $row['unlock_time'] - myself()->_getNowTime() > 0) {
             $lockType = $row['lock_type'];
-            $lockTime = $row['unlock_time'] - myself()->_getNowTime();
+            $unlockTime = $row['unlock_time'];
         }
-        $tradeLocktime = max(0, $row['unlock_trade_time'] - myself()->_getNowTime());
         $dto = array(
             'gun_uniid' => $row['idx'],
             'gun_id' => $row['gun_id'],
@@ -70,8 +69,8 @@ class Gun extends BaseModel {
             'attr' => $attr,
             'try_count' => $row['try_count'],
             'lock_type' => $lockType,
-            'lock_time' => $lockTime,
-            'trade_locktime' => $tradeLocktime,
+            'unlock_time' => $unlockTime,
+            'unlock_trade_time' => $row['unlock_trade_time'],
         );
         return $dto;
     }
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index a1466fee..9325b70c 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -56,12 +56,11 @@ class Hero extends BaseModel {
     {
         $attr = emptyReplace(json_decode($row['rand_attr'], true), array());
         $lockType = 0;
-        $lockTime = 0;
+        $unlockTime = 0;
         if ($row['lock_type'] != 0 && $row['unlock_time'] - myself()->_getNowTime() > 0) {
             $lockType = $row['lock_type'];
-            $lockTime = $row['unlock_time'] - myself()->_getNowTime();
+            $unlockTime = $row['unlock_time'];
         }
-        $tradeLocktime = max(0, $row['unlock_trade_time'] - myself()->_getNowTime());
         $dto = array(
             'hero_uniid' => $row['idx'],
             'hero_id' => $row['hero_id'],
@@ -75,8 +74,8 @@ class Hero extends BaseModel {
             'attr' => $attr,
             'try_count' => $row['try_count'],
             'lock_type' => $lockType,
-            'lock_time' => $lockTime,
-            'trade_locktime' => $tradeLocktime,
+            'unlock_time' => $unlockTime,
+            'unlock_trade_time' => $row['unlock_trade_time'],
         );
         return $dto;
     }