From ab74f3599c331159f7fa4c85731dc8d74be017b8 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 6 Mar 2023 18:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=E6=90=BA=E7=A8=8B=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E4=BC=98=E5=8C=96=E7=86=9F=E7=BB=83=E5=BA=A6?=
 =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/const.go                     |  1 +
 modules/smithy/api_createorder.go |  1 +
 modules/smithy/api_forgeequip.go  |  5 +++--
 modules/smithy/model_atlas.go     | 12 ++++++++----
 modules/smithy/model_stove.go     | 11 +++++++++++
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/comm/const.go b/comm/const.go
index 104c67bd6..7ab4b0faf 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -757,4 +757,5 @@ const (
 	SmithyToolsSkill3 = 3 // 所有图纸炉温消耗减少
 	SmithyToolsSkill4 = 4 // 每日顾客数量提升至{0}人
 	SmithyToolsSkill5 = 5 // 顾客购买装备数量上限提高至{0}件
+
 )
diff --git a/modules/smithy/api_createorder.go b/modules/smithy/api_createorder.go
index a4d9ae5f9..7737d2579 100644
--- a/modules/smithy/api_createorder.go
+++ b/modules/smithy/api_createorder.go
@@ -33,6 +33,7 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.SmithyCreate
 		code = pb.ErrorCode_DBError
 		return
 	}
+
 	_skillCfg := this.module.configure.GetSmithyStoveConfigData(_smithy.StoveLv)
 	needTime := _skillCfg.Time // 订单需要的时间
 	for _, order := range req.Order {
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 69653c3f9..17d023418 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -202,9 +202,10 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 	// 更新图鉴信息
 	for _, v := range rsp.Equip {
 		if equipConf := this.module.configure.GetEquipmentConfigureById(v.CId); equipConf != nil { // 获取装备等级
-			this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), v.CId, equipConf.Star, int32(len(v.AdverbEntry)+1), stove.Forge[req.ReelId])
+			go func(cid string, star int32, AdverbEntry int32) {
+				this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), cid, star, AdverbEntry, stove.Forge[req.ReelId])
+			}(v.CId, equipConf.Star, int32(len(v.AdverbEntry)+1)) // 品质按副词条数+1 来算
 		}
 	}
-
 	return
 }
diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go
index 90c2bd6d4..02977d7d8 100644
--- a/modules/smithy/model_atlas.go
+++ b/modules/smithy/model_atlas.go
@@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
+	cfg "go_dreamfactory/sys/configure/structs"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -58,12 +59,15 @@ func (this *modelAtlas) modifySmithyAtlasList(uid string, data map[string]interf
 
 // 检查是否激活图鉴
 func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, quality int32, forgeCount int32) bool {
-	atlasConf := this.module.configure.GetSmithyAtlasConf(id)
-	if atlasConf == nil {
+	var (
+		atlasConf *cfg.GameSmithyAtlasData
+		list      *pb.DBAtlas
+		err       error
+	)
+	if atlasConf = this.module.configure.GetSmithyAtlasConf(id); atlasConf == nil {
 		return false
 	}
-	list, err := this.module.modelAtlas.getSmithyAtlasList(uid)
-	if err != nil {
+	if list, err = this.module.modelAtlas.getSmithyAtlasList(uid); err != nil {
 		return false
 	}
 	if atlasConf.TypeId == 1 { // 装备收藏图鉴信息
diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go
index 93d01777a..24d11fa7c 100644
--- a/modules/smithy/model_stove.go
+++ b/modules/smithy/model_stove.go
@@ -230,3 +230,14 @@ func (this *modelStove) CheckUnlockSuid(reelId, lv, dropid int32) int32 {
 	}
 	return dropid
 }
+
+// 获取工具台数据加成
+func (this *modelStove) getStoveToolSkill(uid string, skillType int32) int32 {
+
+	if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil {
+		if conf := this.module.configure.GetSmithySkill(skillType, stove.Skill[skillType]); conf != nil {
+			return conf.Value
+		}
+	}
+	return 0
+}