From 3a774c7c133d1a5fe170abeaae922fb8accebc18 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 8 May 2022 23:09:57 +0800
Subject: [PATCH] 1

---
 webapp/models/Gun.php                 | 2 +-
 webapp/models/Hero.php                | 2 +-
 webapp/services/BattleDataService.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index 7ac6d6a6..ecf254ca 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -261,9 +261,9 @@ class Gun extends BaseModel {
     public static function gainGold($gunDto, $addGold)
     {
         $finalyAddGold = 0;
-        $goldLimit = 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'];
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 2d0d121a..e467367e 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -309,9 +309,9 @@ class Hero extends BaseModel {
     public static function gainGold($heroDto, $addGold)
     {
         $finalyAddGold = 0;
-        $goldLimit = 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'];
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 57519c14..7c0e622e 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -365,7 +365,7 @@ class BattleDataService extends BaseService {
                     $weaponUniid = getReqVal('weapon_uuid' . $i, 0);
                     if ($weaponUniid) {
                         $row = Gun::find($weaponUniid);
-                        $gunDto = $gunDb ? Gun::toDto($row) : null;
+                        $gunDto = $row ? Gun::toDto($row) : null;
                         if ($gunDto){
                             $finalyAddGold += Gun::gainGold($gunDto, $addGold);
                         }