From 17407e0e1a89eafcc5814ce8d9dc1770dc218ac0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 13 Jan 2022 16:42:30 +0800
Subject: [PATCH] 1

---
 webapp/controller/GunController.class.php  | 2 +-
 webapp/controller/HeroController.class.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/controller/GunController.class.php b/webapp/controller/GunController.class.php
index b048e357..1d59ddec 100644
--- a/webapp/controller/GunController.class.php
+++ b/webapp/controller/GunController.class.php
@@ -278,7 +278,7 @@ class GunController extends BaseAuthedController {
             return;
         }
         $baseAttrs = mt\Item::getBaseAttrs($itemMeta);
-        $baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
+        mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
         $attrs = emptyReplace(json_decode($gunDb['rand_attr'], true), array());
         {
             $obtainAttrs = mt\GunQuality::getRandAttr($nextQualityMeta);
diff --git a/webapp/controller/HeroController.class.php b/webapp/controller/HeroController.class.php
index d4a449cb..8bb01ef8 100644
--- a/webapp/controller/HeroController.class.php
+++ b/webapp/controller/HeroController.class.php
@@ -164,7 +164,7 @@ class HeroController extends BaseAuthedController {
             return;
         }
         $baseAttrs = mt\Hero::getHeroAttr($heroMeta);
-        $baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
+        mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
         $attrs = emptyReplace(json_decode($heroDb['rand_attr'], true), array());
         $ret = mt\HeroLevel::addRandAttr($nextLevelMeta, $baseAttrs, $attrs);
         if (!$ret) {
@@ -264,7 +264,7 @@ class HeroController extends BaseAuthedController {
             return;
         }
         $baseAttrs = mt\Hero::getHeroAttr($heroMeta);
-        $baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
+        mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
         $attrs = emptyReplace(json_decode($heroDb['rand_attr'], true), array());
         {
             $obtainAttrs = mt\HeroQuality::getRandAttr($nextQualityMeta);