From 242a928fdf08a755b3a1f98e678d3b53d1c83c60 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Fri, 26 Aug 2022 20:02:33 +0800
Subject: [PATCH] 1

---
 webapp/controller/HeroController.class.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/webapp/controller/HeroController.class.php b/webapp/controller/HeroController.class.php
index 9770fb50..08b2466c 100644
--- a/webapp/controller/HeroController.class.php
+++ b/webapp/controller/HeroController.class.php
@@ -55,7 +55,15 @@ class HeroController extends BaseAuthedController {
                     array_push($chipAttr,$v);
                 }
             }
-        $hero['rand_attr'] = $chipAttr;
+        $item = [];
+        foreach ($chipAttr as $k=>$v){
+            if (!isset($item[$v['attr_id']])){
+                $item[$v['attr_id']] = $v;
+            }else{
+                $item[$v['attr_id']]['val']+= $v['val'];
+            }
+        }
+        $hero['rand_attr'] = $item;
         $hero_attr = emptyReplace(json_decode($hero['attr'], true), array());
         \mt\AttrHelper::mergeAttr($hero_attr,$chipAttr);
         $hero['attr'] = $hero_attr;