From 72b1d99a192dc5716c63f8e50d94d743f8e4a4a5 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 9 May 2023 16:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=86=94=E5=B2=A9=E6=89=93=E9=80=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=BC=BA=E5=B0=91=E7=86=94=E5=B2=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_awaken.go       |  3 ++-
 modules/smithy/api_forgeequip.go | 33 ++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index 14adf7e56..5cacfaa04 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -63,6 +63,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
+	_hero.JuexingLv += 1
 	_value, ok := strconv.Atoi(awakenData.Phasebonus[0])
 	if ok == nil { // 升级技能
 		for pos, v := range _hero.NormalSkill {
@@ -77,7 +78,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 	} else { // 加属性
 		this.module.modelHero.resetJuexingProperty(_hero)
 	}
-	_hero.JuexingLv += 1
+
 	_heroMap["juexingLv"] = _hero.JuexingLv
 	_heroMap["juexProperty"] = _hero.JuexProperty
 	// 保存数据
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index af1d998ed..0c5346e2f 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -19,16 +19,16 @@ func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyFo
 // 打造装备
 func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
-		stove              *pb.DBStove
-		err                error
-		update             map[string]interface{}
-		addProbability     int32
-		costRes            []*cfg.Gameatn
-		customLv           int32 // 定制装备的等级
-		rsp                *pb.SmithyForgeEquipResp
-		needTemperatureCos int32 // 需要消耗的温度
-		maxT               int32
-		atno               []*pb.UserAtno
+		stove          *pb.DBStove
+		err            error
+		update         map[string]interface{}
+		addProbability int32
+		costRes        []*cfg.Gameatn
+		customLv       int32 // 定制装备的等级
+		rsp            *pb.SmithyForgeEquipResp
+		needT          int32 // 需要消耗的温度
+		maxT           int32
+		atno           []*pb.UserAtno
 	)
 	// 参数校验
 	if req.Count == 0 { // 传0 默认打造意见
@@ -84,19 +84,20 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 			customLv = reelcfg.CustomizedLv[index]
 		}
 	}
-	needTemperatureCos = reelcfg.TemperatureCos * req.Count
+	needT = reelcfg.TemperatureCos * req.Count
 	// 熟练度减少的温度
 	t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
-	needTemperatureCos = needTemperatureCos * (1000 - t) / 1000 // 千分比
+	needT = needT * (1000 - t) / 1000 // 千分比
 	// 工具台技能减少
 	_s := this.module.modelStove.StoveToolsTemperature(stove)
 	if _s != 0 {
-		needTemperatureCos *= (1 - _s/1000)
+		needT *= (1 - _s/1000)
 	}
 	if req.Lava > 0 { // 熔岩打造
 		exemption := this.module.ModuleTools.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度
 		gloabNum := this.module.ModuleTools.GetGlobalConf().ExemptionTemperatureCosNum
-		if needTemperatureCos > req.Count*gloabNum {
+		if needT > req.Lava*gloabNum {
+			this.module.Errorf("ErrorCode_SmithyLackLava needT:%d,curT:%d,count :%d", needT, req.Count*gloabNum, req.Count)
 			code = pb.ErrorCode_SmithyLackLava // 缺少熔岩
 			return
 		}
@@ -112,11 +113,11 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 		costRes = append(costRes, lavaCost)
 	} else {
 		// 检查炉温 是否够
-		if stove.Temperature < needTemperatureCos {
+		if stove.Temperature < needT {
 			code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
 			return
 		}
-		stove.Temperature -= needTemperatureCos // 消耗温度
+		stove.Temperature -= needT // 消耗温度
 		update["temperature"] = stove.Temperature
 	}