1
This commit is contained in:
parent
b037893f6c
commit
c58448edff
@ -91,6 +91,7 @@ class Gun(object):
|
|||||||
['trade_locktime', 0, '出售锁定时间(升级或者升阶完成后触发),单位秒,只锁交易,其他的操作仍可进行'],
|
['trade_locktime', 0, '出售锁定时间(升级或者升阶完成后触发),单位秒,只锁交易,其他的操作仍可进行'],
|
||||||
['chip_ids', '', '镶嵌的芯片主键id组'],
|
['chip_ids', '', '镶嵌的芯片主键id组'],
|
||||||
['!chip_core', [ChipCore()], '芯片核心加成'],
|
['!chip_core', [ChipCore()], '芯片核心加成'],
|
||||||
|
['offer_reward_state', 0, '是否悬赏中'],
|
||||||
]
|
]
|
||||||
|
|
||||||
class GunSkin(object):
|
class GunSkin(object):
|
||||||
|
@ -136,9 +136,10 @@ class Gun extends BaseModel {
|
|||||||
public static function toDto($row)
|
public static function toDto($row)
|
||||||
{
|
{
|
||||||
$attr = emptyReplace(json_decode($row['rand_attr'], true), array());
|
$attr = emptyReplace(json_decode($row['rand_attr'], true), array());
|
||||||
$lockType = 0;
|
// $lockType = 0;
|
||||||
$unlockTime = 0;
|
// $unlockTime = 0;
|
||||||
if ($row['lock_type'] != 0 && $row['unlock_time'] - myself()->_getNowTime() > 0) {
|
// //if ($row['lock_type'] != 0 && $row['unlock_time'] - myself()->_getNowTime() > 0) {
|
||||||
|
{
|
||||||
$lockType = $row['lock_type'];
|
$lockType = $row['lock_type'];
|
||||||
$unlockTime = $row['unlock_time'];
|
$unlockTime = $row['unlock_time'];
|
||||||
}
|
}
|
||||||
@ -195,6 +196,7 @@ class Gun extends BaseModel {
|
|||||||
$unlockTime - myself()->_getNowTime()),
|
$unlockTime - myself()->_getNowTime()),
|
||||||
'unlock_trade_time' => $row['unlock_trade_time'],
|
'unlock_trade_time' => $row['unlock_trade_time'],
|
||||||
'chip_ids' => $row['chip_ids'],
|
'chip_ids' => $row['chip_ids'],
|
||||||
|
'offer_reward_state' => 0,
|
||||||
);
|
);
|
||||||
$dto['ceg_uplimit'] = FormulaService::getWeaponPvpDailyCegUpLimit($dto);
|
$dto['ceg_uplimit'] = FormulaService::getWeaponPvpDailyCegUpLimit($dto);
|
||||||
$dto['raw_pve_ceg_uplimit'] =
|
$dto['raw_pve_ceg_uplimit'] =
|
||||||
|
@ -133,8 +133,10 @@ class Hero extends BaseModel {
|
|||||||
$lockType = $row['lock_type'];
|
$lockType = $row['lock_type'];
|
||||||
$unlockTime = $row['unlock_time'];
|
$unlockTime = $row['unlock_time'];
|
||||||
}*/
|
}*/
|
||||||
$lockType = $row['lock_type'];
|
{
|
||||||
$unlockTime = $row['unlock_time'];
|
$lockType = $row['lock_type'];
|
||||||
|
$unlockTime = $row['unlock_time'];
|
||||||
|
}
|
||||||
|
|
||||||
$qualityMeta = mt\HeroQuality::getByQuality($row['quality']);
|
$qualityMeta = mt\HeroQuality::getByQuality($row['quality']);
|
||||||
$todayGetGold = $row['today_get_gold'];
|
$todayGetGold = $row['today_get_gold'];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user