diff --git a/webapp/models/Bag.php b/webapp/models/Bag.php index 509fdb48..58ae1450 100644 --- a/webapp/models/Bag.php +++ b/webapp/models/Bag.php @@ -71,12 +71,19 @@ class Bag extends BaseModel { public static function toDto($row) { + $todayGetGold = $row['today_get_gold']; + $lastGetGoldTime = $row['last_get_gold_time']; + if (myself()->_getDaySeconds($lastGetGoldTime) > myself()->getNowDaySeconds()) { + $todayGetGold = 0; + } return array( 'item_uniid' => $row['idx'], 'token_id' => $row['token_id'], 'item_id' => $row['item_id'], 'item_num' => $row['item_num'], 'attr' => emptyReplace(json_decode($row['rand_attr'], true), array()), + 'today_get_gold' => $todayGetGold, + 'last_get_gold_time' => $lastGetGoldTime, ); } diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php index b32ebfc8..b0aaddb8 100644 --- a/webapp/models/Gun.php +++ b/webapp/models/Gun.php @@ -121,6 +121,11 @@ class Gun extends BaseModel { $baseAttr = mt\Item::getBaseAttrs($itemMeta); mt\AttrHelper::mergeAttr($attr, $baseAttr); } + $todayGetGold = $row['today_get_gold']; + $lastGetGoldTime = $row['last_get_gold_time']; + if (myself()->_getDaySeconds($lastGetGoldTime) > myself()->getNowDaySeconds()) { + $todayGetGold = 0; + } $dto = array( 'gun_uniid' => $row['idx'], 'gun_id' => $row['gun_id'], @@ -131,6 +136,8 @@ class Gun extends BaseModel { 'attr' => $attr, 'try_count' => $row['try_count'], 'lock_type' => $lockType, + 'today_get_gold' => $todayGetGold, + 'last_get_gold_time' => $lastGetGoldTime, 'unlock_time' => $unlockTime, 'unlock_trade_time' => $row['unlock_trade_time'], ); diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 06a150d5..20c89655 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -118,6 +118,11 @@ class Hero extends BaseModel { $baseAttr = mt\Hero::getHeroAttr($heroMeta); mt\AttrHelper::mergeAttr($attr, $baseAttr); } + $todayGetGold = $row['today_get_gold']; + $lastGetGoldTime = $row['last_get_gold_time']; + if (myself()->_getDaySeconds($lastGetGoldTime) > myself()->getNowDaySeconds()) { + $todayGetGold = 0; + } $dto = array( 'token_id' => $row['token_id'], 'hero_uniid' => $row['idx'], @@ -132,6 +137,8 @@ class Hero extends BaseModel { 'attr' => $attr, 'try_count' => $row['try_count'], 'lock_type' => $lockType, + 'today_get_gold' => $todayGetGold, + 'last_get_gold_time' => $lastGetGoldTime, 'unlock_time' => $unlockTime, 'unlock_trade_time' => $row['unlock_trade_time'], );