From cef4865080b09b67e6be803b2160539ceaf0c444 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 9 Nov 2022 17:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E9=AD=94=E5=B1=9E=E6=80=A7=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/const.go                 | 15 +++++++--------
 modules/equipment/api_ench.go |  4 ++--
 modules/hero/model_hero.go    |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/comm/const.go b/comm/const.go
index cf32503ea..9a9f689c4 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -67,14 +67,13 @@ const (
 	ModuleArena       core.M_Modules = "arena"       //竞技场
 	ModuleTroll       core.M_Modules = "troll"       //巨怪商队
 	ModuleHoroscope   core.M_Modules = "horoscope"   //星座图
-	//ModuleFetter      core.M_Modules = "herofetter"  //好友模块
-	ModuleSociaty   core.M_Modules = "sociaty"   //公会
-	ModulePay       core.M_Modules = "pay"       //支付
-	ModuleAcademy   core.M_Modules = "academy"   //联盟学院
-	ModulePrivilege core.M_Modules = "privilege" //特权
-	ModuleGrowtask  core.M_Modules = "growtask"  //成长任务
-	ModuleWorldtask core.M_Modules = "worldtask" //世界任务
-	ModuleReddot    core.M_Modules = "reddot"    //红点
+	ModuleSociaty     core.M_Modules = "sociaty"     //公会
+	ModulePay         core.M_Modules = "pay"         //支付
+	ModuleAcademy     core.M_Modules = "academy"     //联盟学院
+	ModulePrivilege   core.M_Modules = "privilege"   //特权
+	ModuleGrowtask    core.M_Modules = "growtask"    //成长任务
+	ModuleWorldtask   core.M_Modules = "worldtask"   //世界任务
+	ModuleReddot      core.M_Modules = "reddot"      //红点
 )
 
 //数据表名定义处
diff --git a/modules/equipment/api_ench.go b/modules/equipment/api_ench.go
index 8bf9bdcf5..428a328ab 100644
--- a/modules/equipment/api_ench.go
+++ b/modules/equipment/api_ench.go
@@ -44,9 +44,9 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
-	AttrValue = rand.Int31n(conf.AttrMax - conf.AttrMini)
+	AttrValue = rand.Int31n(conf.AttrMax-conf.AttrMini) + conf.AttrMini
 	if AttrValue > equip.AdverbEntry[req.Index].Value {
-		equip.AdverbEntry[req.Index].BaseValue = AttrValue
+		equip.AdverbEntry[req.Index].EnchValue = AttrValue
 	}
 	if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
 		"adverbEntry":    equip.AdverbEntry,
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 341efe279..24abc6eb9 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -304,7 +304,7 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
 		hero.EquipID[i] = v.Id
 		addProperty[v.MainEntry.AttrName] += v.MainEntry.Value //主属性
 		for _, v := range v.AdverbEntry {
-			addProperty[v.AttrName] += v.Value //附加属性
+			addProperty[v.AttrName] += v.Value + v.EnchValue //附加属性
 		}
 		for k, v := range addProperty {
 			switch k {