From de5429ca0efaef484efa1894e8b465a85954b539 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 22 Feb 2023 18:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=86=9F=E7=BB=83=E5=BA=A6=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E9=99=8D=E4=BD=8E=E7=82=89=E6=B8=A9=E6=B6=88=E8=80=97=20?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E4=B8=BA=E5=8D=83=E5=88=86=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/smithy/api_forgeequip.go | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 863f59563..685aa6fc5 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -25,9 +25,10 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 		err    error
 		update map[string]interface{}
 
-		costRes  []*cfg.Gameatn
-		customLv int32 // 定制装备的等级
-		rsp      *pb.SmithyForgeEquipResp
+		costRes            []*cfg.Gameatn
+		customLv           int32 // 定制装备的等级
+		rsp                *pb.SmithyForgeEquipResp
+		needTemperatureCos int32 // 需要消耗的温度
 	)
 	rsp = &pb.SmithyForgeEquipResp{}
 	update = make(map[string]interface{})
@@ -81,14 +82,21 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 			customLv = reelcfg.CustomizedLv[index]
 		}
 	}
+	needTemperatureCos = reelcfg.TemperatureCos
+	// 熟练度减少的温度
+	t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
+	needTemperatureCos = reelcfg.TemperatureCos * (1000 - t) / 1000
+	// 检查炉温 是否够
+	if stove.Temperature < needTemperatureCos {
+		code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
+		return
+	}
 
-	// 是否是熔岩打造
-	if req.Lava > 0 {
-		// 预计消耗温度
-		exemption := this.module.configure.GetGlobalConf().ExemptionTemperatureCos // "item,1110001,1
+	if req.Lava > 0 { // 是否是熔岩打造
+		exemption := this.module.configure.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度
 		raise_temperatureNum := this.module.configure.GetGlobalConf().ExemptionTemperatureCosNum
 		raise_temperatureNum = req.Lava * exemption.N
-		if reelcfg.TemperatureCos > raise_temperatureNum {
+		if needTemperatureCos > raise_temperatureNum {
 			code = pb.ErrorCode_SmithyLackLava // 缺少熔岩
 			return
 		}
@@ -102,16 +110,8 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 			return
 		}
 		costRes = append(costRes, lavaCost)
-
 	} else {
-		// 熟练度减少的温度
-		t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
-		// 检查炉温 是否够
-		if stove.Temperature < reelcfg.TemperatureCos-t {
-			code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
-			return
-		}
-		stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度
+		stove.Temperature -= needTemperatureCos // 消耗温度
 		update["temperature"] = stove.Temperature
 	}