From 1ddb13b8fb2c41f3d77e193fb5848a57d6e90fda Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Mon, 29 Aug 2022 19:36:08 +0800
Subject: [PATCH] 1

---
 doc/Hero.py                                |  1 +
 webapp/controller/HeroController.class.php | 20 +++-----------------
 webapp/models/Hero.php                     |  4 ++--
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/doc/Hero.py b/doc/Hero.py
index 1fa7828e..26dfe214 100644
--- a/doc/Hero.py
+++ b/doc/Hero.py
@@ -54,6 +54,7 @@ class Hero(object):
                 'params': [
                     _common.ReqHead(),
                     ['hero_uniid', 0, '英雄唯一id'],
+                    ['skill_uniid', 0, '技能唯一id'],
                     ['skill_idx', 0, '技能idx 0：主动技能；1：被动技能'],
                 ],
                 'response': [
diff --git a/webapp/controller/HeroController.class.php b/webapp/controller/HeroController.class.php
index c4f8465c..b8104511 100644
--- a/webapp/controller/HeroController.class.php
+++ b/webapp/controller/HeroController.class.php
@@ -138,6 +138,7 @@ class HeroController extends BaseAuthedController {
     public function upgradeSkill()
     {
         $heroUniId = getReqVal('hero_uniid', 0);
+        $skillUniId = getReqVal('skill_uniid', 0);
         $skillIdx = getReqVal('skill_idx', 0);
         $heroDb = Hero::find($heroUniId);
         if (!$heroDb) {
@@ -148,11 +149,7 @@ class HeroController extends BaseAuthedController {
             $this->_rspErr(1, 'skill_idx must be 0-1');
             return;
         }
-        if ($skillIdx){
-            $skill = \mt\Skill::get($heroDb['skill_lv2']);
-        }else{
-            $skill = \mt\Skill::get($heroDb['skill_lv1']);
-        }
+        $skill = \mt\Skill::get($skillUniId);
         if (!$skill){
             $this->_rspErr(1, "You don't have the skill yet");
             return;
@@ -169,18 +166,7 @@ class HeroController extends BaseAuthedController {
             $this->_rspErr(1, "Not enough hero skill points");
             return;
         }
-        if ($skillIdx){
-            $where = [
-                'skill_lv2'=>$skill['nextlv_skill'],
-                'modifytime' => $this->_getNowTime()
-            ];
-        }else{
-            $where = [
-                'skill_lv1'=>$skill['nextlv_skill'],
-                'modifytime' => $this->_getNowTime()
-            ];
-        }
-        Hero::update($heroUniId,$where);
+        Hero::upgradeSkill($heroUniId,$skillIdx);
         $propertyChgService = new services\PropertyChgService();
         $propertyChgService->addHeroChg();
         $this->_rspData(array(
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 706cee88..2079ae10 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -251,8 +251,8 @@ class Hero extends BaseModel {
             'quality' => 1,
             'hero_tili' => $realHeroMeta ? $realHeroMeta['tili'] : 0,
             'state' => self::GETED_STATE,
-            'skill_lv1' => $realHeroMeta['skill1list'],
-            'skill_lv2' => $realHeroMeta['skill3list'],
+            'skill_lv1' => 1,
+            'skill_lv2' => 1,
             'rand_attr' => json_encode($randAttr),
             'lock_type' => self::NO_LOCK,
             'unlock_time' => 0,