diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php index 64711590..4af5f184 100644 --- a/webapp/models/Gun.php +++ b/webapp/models/Gun.php @@ -321,16 +321,16 @@ class Gun extends BaseModel { )); } - public static function newGainGold($gunDto, $addGold) + public static function gainGoldPvp($gunDto, $addGold) { - $newGold = min($gunDto['ceg_uplimit'], - $gunDto['today_get_gold'] + $addGold); - $finalyAddGold = max(0, $newGold - $gunDto['today_get_gold']); + $newGold = min($gunDto['pvp_ceg_uplimit'], + $gunDto['current_pvp_get_ceg'] + $addGold); + $finalyAddGold = max(0, $newGold - $gunDto['current_pvp_get_ceg']); if ($finalyAddGold > 0) { self::update($gunDto['gun_uniid'], array( - 'today_get_gold' => $newGold, - 'last_get_gold_time' => myself()->_getNowTime() + 'current_pvp_get_ceg' => $newGold, + 'last_pvp_get_ceg_time' => myself()->_getNowTime() )); } return $finalyAddGold; diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 791d650a..ca4fe236 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -376,16 +376,16 @@ class Hero extends BaseModel { )); } - public static function newGainGold($heroDto, $addGold) + public static function gainGoldPvp($heroDto, $addGold) { - $newGold = min($heroDto['ceg_uplimit'], - $heroDto['today_get_gold'] + $addGold); - $finalyAddGold = max(0, $newGold - $heroDto['today_get_gold']); + $newGold = min($heroDto['pvp_ceg_uplimit'], + $heroDto['current_pvp_get_ceg'] + $addGold); + $finalyAddGold = max(0, $newGold - $heroDto['current_pvp_get_ceg']); if ($finalyAddGold > 0) { self::update($heroDto['hero_uniid'], array( - 'today_get_gold' => $newGold, - 'last_get_gold_time' => myself()->_getNowTime() + 'current_pvp_get_ceg' => $newGold, + 'last_pvp_get_ceg_time' => myself()->_getNowTime() )); } return $finalyAddGold;