From bd1f6be173205e472664d6079cfc2b493c81e98c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 14 Jun 2022 11:17:01 +0800 Subject: [PATCH] 1 --- webapp/models/Gun.php | 21 ---------------- webapp/models/Hero.php | 21 ---------------- webapp/services/BattleDataService.php | 36 --------------------------- 3 files changed, 78 deletions(-) diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php index b97492e5..12bb59d5 100644 --- a/webapp/models/Gun.php +++ b/webapp/models/Gun.php @@ -298,27 +298,6 @@ class Gun extends BaseModel { )); } - public static function gainGold($gunDto, $addGold) - { - $finalyAddGold = 0; - $gunQualityMeta = mt\GunQuality::getByQuality($gunDto['quality']); - if ($gunQualityMeta) { - $goldLimit = $gunQualityMeta['gold_limit']; - $attr = mt\AttrHelper::getAbsVal($gunDto['attr'], kHAT_LUCKY); - if ($attr) { - $goldLimit += $attr['val']; - } - $newGold = min($goldLimit, $gunDto['today_get_gold'] + $addGold); - $finalyAddGold = max(0, $newGold - $gunDto['today_get_gold']); - self::update($gunDto['gun_uniid'], - array( - 'today_get_gold' => $newGold, - 'last_get_gold_time' => myself()->_getNowTime() - )); - } - return $finalyAddGold; - } - public static function newGainGold($gunDto, $addGold) { $newGold = min($gunDto['ceg_uplimit'], diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 43c57b06..fd4e9c0d 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -344,27 +344,6 @@ class Hero extends BaseModel { )); } - public static function gainGold($heroDto, $addGold) - { - $finalyAddGold = 0; - $heroQualityMeta = mt\HeroQuality::getByQuality($heroDto['quality']); - if ($heroQualityMeta) { - $goldLimit = $heroQualityMeta['gold_limit']; - $attr = mt\AttrHelper::getAbsVal($heroDto['attr'], kHAT_LUCKY); - if ($attr) { - $goldLimit += $attr['val']; - } - $newGold = min($goldLimit, $heroDto['today_get_gold'] + $addGold); - $finalyAddGold = max(0, $newGold - $heroDto['today_get_gold']); - self::update($heroDto['hero_uniid'], - array( - 'today_get_gold' => $newGold, - 'last_get_gold_time' => myself()->_getNowTime() - )); - } - return $finalyAddGold; - } - public static function newGainGold($heroDto, $addGold) { $newGold = min($heroDto['ceg_uplimit'], diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php index c95d2ffd..95edd451 100644 --- a/webapp/services/BattleDataService.php +++ b/webapp/services/BattleDataService.php @@ -397,40 +397,4 @@ class BattleDataService extends BaseService { } } - private function oldRewardGold($heroDb) - { - $heroMeta = mt\Item::get($heroDb['hero_id']); - if (!$heroMeta) { - return; - } - $killMeta = mt\KillReward::get(getReqVal('kills', 0)); - $rankMeta = mt\RankReward::get(getReqVal('ranked', 0)); - $gold = 0; - $gold += $killMeta ? $killMeta['parameter'] : 0; - $gold += $rankMeta ? $rankMeta['parameter'] : 0; - $addGold = 0; - if ($gold > 0) { - $addGold = floor($gold / 3); - } - $finalyAddGold = 0; - if ($addGold) { - $finalyAddGold += Hero::gainGold($heroDb, $addGold); - { - for ($i = 1; $i <= 2; ++$i) { - $weaponUniid = getReqVal('weapon_uuid' . $i, 0); - if ($weaponUniid) { - $row = Gun::find($weaponUniid); - $gunDto = $row ? Gun::toDto($row) : null; - if ($gunDto){ - $finalyAddGold += Gun::gainGold($gunDto, $addGold); - } - } - } - } - } - if ($finalyAddGold > 0) { - myself()->_addVirtualItem(V_ITEM_GOLD, $finalyAddGold); - } - } - }