From ba5fcca7ad1aa415bc9389d9b7454534b2fa32d1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 5 Jan 2022 19:50:51 +0800
Subject: [PATCH] 1

---
 webapp/controller/HeroController.class.php | 19 ++++++++++++---
 webapp/mt/AttrHelper.php                   | 28 ++++++++++++++++++++++
 webapp/mt/HeroLevel.php                    | 10 +++++++-
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 webapp/mt/AttrHelper.php

diff --git a/webapp/controller/HeroController.class.php b/webapp/controller/HeroController.class.php
index 656920bc..d1e3ee8c 100644
--- a/webapp/controller/HeroController.class.php
+++ b/webapp/controller/HeroController.class.php
@@ -158,7 +158,11 @@ class HeroController extends BaseAuthedController {
         }
         $oldAttr = json_decode($heroDb['rand_attr'], true);
         $randAttr = $oldAttr;
-        mt\HeroLevel::getRandAttr($initLevelMeta, $nextLevelMeta, $oldAttr, $randAttr);
+        $ret = mt\HeroLevel::getRandAttr($initLevelMeta, $nextLevelMeta, $oldAttr, $randAttr);
+        if (!$ret) {
+            $this->_rspErr(2, '服务器内部错误');
+            return;
+        }
         $this->_decItems($costItems);
         Hero::update($heroUniId,
                      array(
@@ -250,12 +254,21 @@ class HeroController extends BaseAuthedController {
         }
         $oldAttr = json_decode($heroDb['rand_attr'], true);
         $randAttr = $oldAttr;
+        $ret = false;
         {
-            mt\HeroQuality::getNextAttr($initQualityMeta, $nextQualityMeta, $oldAttr, $randAttr);
+            $ret = mt\HeroQuality::getNextAttr($initQualityMeta, $nextQualityMeta, $oldAttr, $randAttr);
+            if (!$ret) {
+                $this->_rspErr(2, '服务器内部错误');
+                return;
+            }
             $oldAttr = $randAttr;
         }
         {
-            mt\HeroLevel::getNextAttr($initLevelMeta, $nextLevelMeta, $oldAttr, $randAttr);
+            $ret = mt\HeroLevel::getNextAttr($initLevelMeta, $nextLevelMeta, $oldAttr, $randAttr);
+            if (!$ret) {
+                $this->_rspErr(2, '服务器内部错误');
+                return;
+            }
         }
         $this->_decItems($costItems);
         Hero::update($heroUniId,
diff --git a/webapp/mt/AttrHelper.php b/webapp/mt/AttrHelper.php
new file mode 100644
index 00000000..e0c90e93
--- /dev/null
+++ b/webapp/mt/AttrHelper.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace mt;
+
+use phpcommon;
+
+class AttrHelper {
+
+    public static function parseAttr($attrStr)
+    {
+        $attrs = array();
+        $strs = explode('|', $attrStr);
+        foreach ($strs as $str) {
+        }
+        return $attrs;
+    }
+
+    public static function mergeAttr($aAttr, $bAttr)
+    {
+
+    }
+
+    public static function canMerge($aAttr, $bAttr)
+    {
+
+    }
+
+}
diff --git a/webapp/mt/HeroLevel.php b/webapp/mt/HeroLevel.php
index bea6bc90..e52935d4 100644
--- a/webapp/mt/HeroLevel.php
+++ b/webapp/mt/HeroLevel.php
@@ -2,6 +2,8 @@
 
 namespace mt;
 
+require('mt/AttrHelper.sql');
+
 use phpcommon;
 
 class HeroLevel {
@@ -19,7 +21,13 @@ class HeroLevel {
 
     public static function getRandAttr($initMeta, $nextMeta, $oldAttr, &$newAttr)
     {
-
+        $initAttr = mt\AttrHelper::parseAttr($initMeta['rand_attrs']);
+        $nextAttr = mt\AttrHelper::parseAttr($next['rand_attrs']);
+        if (!mt\AttrHelper::canMerge($initAttr, $nextAttr)) {
+            return false;
+        }
+        mt\AttrHelper::mergeAttr($oldAttr, $newAttr);
+        return true;
     }
 
     protected static function getMetaList()