From 1391d464e6e96cf36fa808cd65e20893e6ddf3b6 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 30 Mar 2023 17:50:41 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=83=E5=8A=9F?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=BE=E7=BD=AE=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/practice/api_practice.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/practice/api_practice.go b/modules/practice/api_practice.go
index 8fbb444b2..ce970cffd 100644
--- a/modules/practice/api_practice.go
+++ b/modules/practice/api_practice.go
@@ -60,9 +60,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
-	if code = this.module.ModuleHero.KungFuHero(session, req.Hero, true, ""); code != pb.ErrorCode_Success {
-		return
-	}
+
 	if req.Teacher != "" {
 		if room.Knapsack[req.Teacher] == 1 { //已经被使用
 			code = pb.ErrorCode_ReqParameterError
@@ -90,7 +88,9 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
 		pillar.Prop = req.Prop
 	}
 	pillar.Hero = req.Hero
-
+	if code = this.module.ModuleHero.KungFuHero(session, req.Hero, true, ""); code != pb.ErrorCode_Success {
+		return
+	}
 	pillar.Start = configure.Now().Unix()
 	if extra >= 0 {
 		pillar.End = configure.Now().Add(time.Minute * (time.Duration(pillarconfigure.PlacementDuration))).Unix()

From 193a4e86edfee620cd8a16b3bacc9bfc2a7a6ed9 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 30 Mar 2023 18:21:06 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/smithy/api_forgeequip.go | 5 +++--
 modules/smithy/module.go         | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 8a75c7072..f412ce5c2 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -216,9 +216,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 	}
 	stove.Data[req.ReelId].Value += 1
 	stove.Forge[req.ReelId] += 1
-	update["data"] = stove.Data
 
-	update["forge"] = stove.Forge // 打造次数
 	this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
 	// 检查是否提升了熟练度等级
 	nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1)
@@ -243,6 +241,9 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 			}
 		}
 	}
+	update["data"] = stove.Data
+
+	update["forge"] = stove.Forge // 打造次数
 	rsp.Data = stove
 	session.SendMsg(string(this.module.GetType()), "forgeequip", rsp)
 	// 更新图鉴信息
diff --git a/modules/smithy/module.go b/modules/smithy/module.go
index e556e1fc1..2638d76d5 100644
--- a/modules/smithy/module.go
+++ b/modules/smithy/module.go
@@ -70,7 +70,7 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) {
 
 					atlas.Collect[id] = &pb.CollectData{
 						Id:       id,
-						Score:    atlasConf.AtlasScore,
+						Score:    0,
 						Time:     configure.Now().Unix(),
 						Activate: false,
 					}
@@ -88,7 +88,7 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) {
 			if _, ok := atlas.Collect[id]; !ok {
 				atlas.Collect[id] = &pb.CollectData{
 					Id:       id,
-					Score:    atlasConf.AtlasScore,
+					Score:    0,
 					Time:     configure.Now().Unix(),
 					Activate: false,
 				}
@@ -106,7 +106,7 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) {
 			if _, ok := list.Collect[id]; !ok {
 				list.Collect[id] = &pb.CollectData{
 					Id:       id,
-					Score:    atlasConf.AtlasScore,
+					Score:    0,
 					Time:     configure.Now().Unix(),
 					Activate: false,
 				}

From 600d011f1529c3ca87364629ff0237782337c215 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 30 Mar 2023 18:45:40 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0pvp=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=88=98=E6=96=97=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/pvp/api_activecancel.go |  52 ++++++
 pb/pvp_msg.pb.go                | 300 +++++++++++++++++++++++---------
 2 files changed, 265 insertions(+), 87 deletions(-)
 create mode 100644 modules/pvp/api_activecancel.go

diff --git a/modules/pvp/api_activecancel.go b/modules/pvp/api_activecancel.go
new file mode 100644
index 000000000..6eb5060fa
--- /dev/null
+++ b/modules/pvp/api_activecancel.go
@@ -0,0 +1,52 @@
+package pvp
+
+import (
+	"fmt"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) CancelCheck(session comm.IUserSession, req *pb.PvpActiveCancelReq) (code pb.ErrorCode) {
+	return
+}
+
+///设置战斗阵型
+func (this *apiComp) Cancel(session comm.IUserSession, req *pb.PvpActiveCancelReq) (code pb.ErrorCode, data proto.Message) {
+	var (
+		battle  *BattleItem
+		ok      bool
+		winside int32
+	)
+	if code = this.CancelCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+	this.module.lock.RLock()
+	battle, ok = this.module.battles[req.Battleid]
+	this.module.lock.RUnlock()
+	if ok {
+		if battle.Red.Uid == session.GetUserId() {
+			winside = 2
+		} else {
+			winside = 1
+		}
+		this.module.PvpFinishPush(&pb.BattleFinishPush{
+			Battleid: req.Battleid,
+			WinSide:  winside,
+		})
+		if err := this.module.SendMsgToSession(string(comm.ModulePvp), "cancel", &pb.PvpCancelPush{
+			ServicePath: fmt.Sprintf("%s/%s", this.service.GetType(), this.service.GetId()),
+			Battleid:    battle.Id,
+		}, battle.RedSession, battle.BlueSession); err != nil {
+			this.module.Errorln(err)
+		}
+	} else {
+		code = pb.ErrorCode_BattleInCmdFailed
+		return
+	}
+
+	session.SendMsg(string(this.module.GetType()), "cancel", &pb.PvpActiveCancelResp{Issucc: true})
+	return
+}
diff --git a/pb/pvp_msg.pb.go b/pb/pvp_msg.pb.go
index baf8bb24a..f4da18d74 100644
--- a/pb/pvp_msg.pb.go
+++ b/pb/pvp_msg.pb.go
@@ -355,6 +355,100 @@ func (x *PvpCancelPush) GetBattleid() string {
 	return ""
 }
 
+type PvpActiveCancelReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Battleid string `protobuf:"bytes,1,opt,name=battleid,proto3" json:"battleid"` //战斗id
+}
+
+func (x *PvpActiveCancelReq) Reset() {
+	*x = PvpActiveCancelReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pvp_pvp_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PvpActiveCancelReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PvpActiveCancelReq) ProtoMessage() {}
+
+func (x *PvpActiveCancelReq) ProtoReflect() protoreflect.Message {
+	mi := &file_pvp_pvp_msg_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PvpActiveCancelReq.ProtoReflect.Descriptor instead.
+func (*PvpActiveCancelReq) Descriptor() ([]byte, []int) {
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *PvpActiveCancelReq) GetBattleid() string {
+	if x != nil {
+		return x.Battleid
+	}
+	return ""
+}
+
+type PvpActiveCancelResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"`
+}
+
+func (x *PvpActiveCancelResp) Reset() {
+	*x = PvpActiveCancelResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pvp_pvp_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PvpActiveCancelResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PvpActiveCancelResp) ProtoMessage() {}
+
+func (x *PvpActiveCancelResp) ProtoReflect() protoreflect.Message {
+	mi := &file_pvp_pvp_msg_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PvpActiveCancelResp.ProtoReflect.Descriptor instead.
+func (*PvpActiveCancelResp) Descriptor() ([]byte, []int) {
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *PvpActiveCancelResp) GetIssucc() bool {
+	if x != nil {
+		return x.Issucc
+	}
+	return false
+}
+
 //布阵  请求
 type PvpFormationReq struct {
 	state         protoimpl.MessageState
@@ -368,7 +462,7 @@ type PvpFormationReq struct {
 func (x *PvpFormationReq) Reset() {
 	*x = PvpFormationReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pvp_pvp_msg_proto_msgTypes[6]
+		mi := &file_pvp_pvp_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -381,7 +475,7 @@ func (x *PvpFormationReq) String() string {
 func (*PvpFormationReq) ProtoMessage() {}
 
 func (x *PvpFormationReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pvp_pvp_msg_proto_msgTypes[6]
+	mi := &file_pvp_pvp_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -394,7 +488,7 @@ func (x *PvpFormationReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PvpFormationReq.ProtoReflect.Descriptor instead.
 func (*PvpFormationReq) Descriptor() ([]byte, []int) {
-	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{6}
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *PvpFormationReq) GetBattleid() string {
@@ -423,7 +517,7 @@ type PvpFormationResp struct {
 func (x *PvpFormationResp) Reset() {
 	*x = PvpFormationResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pvp_pvp_msg_proto_msgTypes[7]
+		mi := &file_pvp_pvp_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -436,7 +530,7 @@ func (x *PvpFormationResp) String() string {
 func (*PvpFormationResp) ProtoMessage() {}
 
 func (x *PvpFormationResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pvp_pvp_msg_proto_msgTypes[7]
+	mi := &file_pvp_pvp_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -449,7 +543,7 @@ func (x *PvpFormationResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PvpFormationResp.ProtoReflect.Descriptor instead.
 func (*PvpFormationResp) Descriptor() ([]byte, []int) {
-	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{7}
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *PvpFormationResp) GetIssucc() bool {
@@ -472,7 +566,7 @@ type PvpStartPush struct {
 func (x *PvpStartPush) Reset() {
 	*x = PvpStartPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pvp_pvp_msg_proto_msgTypes[8]
+		mi := &file_pvp_pvp_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -485,7 +579,7 @@ func (x *PvpStartPush) String() string {
 func (*PvpStartPush) ProtoMessage() {}
 
 func (x *PvpStartPush) ProtoReflect() protoreflect.Message {
-	mi := &file_pvp_pvp_msg_proto_msgTypes[8]
+	mi := &file_pvp_pvp_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -498,7 +592,7 @@ func (x *PvpStartPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PvpStartPush.ProtoReflect.Descriptor instead.
 func (*PvpStartPush) Descriptor() ([]byte, []int) {
-	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{8}
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *PvpStartPush) GetCode() ErrorCode {
@@ -528,7 +622,7 @@ type PvpOutCmdPush struct {
 func (x *PvpOutCmdPush) Reset() {
 	*x = PvpOutCmdPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pvp_pvp_msg_proto_msgTypes[9]
+		mi := &file_pvp_pvp_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -541,7 +635,7 @@ func (x *PvpOutCmdPush) String() string {
 func (*PvpOutCmdPush) ProtoMessage() {}
 
 func (x *PvpOutCmdPush) ProtoReflect() protoreflect.Message {
-	mi := &file_pvp_pvp_msg_proto_msgTypes[9]
+	mi := &file_pvp_pvp_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -554,7 +648,7 @@ func (x *PvpOutCmdPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PvpOutCmdPush.ProtoReflect.Descriptor instead.
 func (*PvpOutCmdPush) Descriptor() ([]byte, []int) {
-	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{9}
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *PvpOutCmdPush) GetBattleid() string {
@@ -584,7 +678,7 @@ type PvpInCmdReq struct {
 func (x *PvpInCmdReq) Reset() {
 	*x = PvpInCmdReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pvp_pvp_msg_proto_msgTypes[10]
+		mi := &file_pvp_pvp_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -597,7 +691,7 @@ func (x *PvpInCmdReq) String() string {
 func (*PvpInCmdReq) ProtoMessage() {}
 
 func (x *PvpInCmdReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pvp_pvp_msg_proto_msgTypes[10]
+	mi := &file_pvp_pvp_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -610,7 +704,7 @@ func (x *PvpInCmdReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PvpInCmdReq.ProtoReflect.Descriptor instead.
 func (*PvpInCmdReq) Descriptor() ([]byte, []int) {
-	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{10}
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *PvpInCmdReq) GetBattleid() string {
@@ -641,7 +735,7 @@ type PvpInCmdResp struct {
 func (x *PvpInCmdResp) Reset() {
 	*x = PvpInCmdResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pvp_pvp_msg_proto_msgTypes[11]
+		mi := &file_pvp_pvp_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -654,7 +748,7 @@ func (x *PvpInCmdResp) String() string {
 func (*PvpInCmdResp) ProtoMessage() {}
 
 func (x *PvpInCmdResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pvp_pvp_msg_proto_msgTypes[11]
+	mi := &file_pvp_pvp_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -667,7 +761,7 @@ func (x *PvpInCmdResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PvpInCmdResp.ProtoReflect.Descriptor instead.
 func (*PvpInCmdResp) Descriptor() ([]byte, []int) {
-	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{11}
+	return file_pvp_pvp_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *PvpInCmdResp) GetCode() ErrorCode {
@@ -728,38 +822,44 @@ var file_pvp_pvp_msg_proto_rawDesc = []byte{
 	0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
 	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62,
 	0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x5d, 0x0a, 0x0f, 0x50, 0x76, 0x70, 0x46, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2a, 0x0a, 0x10, 0x50, 0x76, 0x70, 0x46, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73,
-	0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75,
-	0x63, 0x63, 0x22, 0x4f, 0x0a, 0x0c, 0x50, 0x76, 0x70, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75,
-	0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f,
-	0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
-	0x6e, 0x66, 0x6f, 0x22, 0x49, 0x0a, 0x0d, 0x50, 0x76, 0x70, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64,
-	0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
-	0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x47,
-	0x0a, 0x0b, 0x50, 0x76, 0x70, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x30, 0x0a, 0x12, 0x50, 0x76, 0x70, 0x41, 0x63,
+	0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
 	0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
-	0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x68, 0x0a, 0x0c, 0x50, 0x76, 0x70, 0x49, 0x6e,
-	0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64,
-	0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d,
-	0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x50, 0x76, 0x70,
+	0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5d, 0x0a, 0x0f, 0x50, 0x76, 0x70, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2a, 0x0a, 0x10, 0x50, 0x76, 0x70, 0x46, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
+	0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
+	0x75, 0x63, 0x63, 0x22, 0x4f, 0x0a, 0x0c, 0x50, 0x76, 0x70, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50,
+	0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63,
+	0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
+	0x69, 0x6e, 0x66, 0x6f, 0x22, 0x49, 0x0a, 0x0d, 0x50, 0x76, 0x70, 0x4f, 0x75, 0x74, 0x43, 0x6d,
+	0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a,
+	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22,
+	0x47, 0x0a, 0x0b, 0x50, 0x76, 0x70, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x68, 0x0a, 0x0c, 0x50, 0x76, 0x70, 0x49,
+	0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f,
+	0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63,
+	0x6d, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -774,41 +874,43 @@ func file_pvp_pvp_msg_proto_rawDescGZIP() []byte {
 	return file_pvp_pvp_msg_proto_rawDescData
 }
 
-var file_pvp_pvp_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_pvp_pvp_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_pvp_pvp_msg_proto_goTypes = []interface{}{
-	(*PvpListReq)(nil),       // 0: PvpListReq
-	(*PvpListResp)(nil),      // 1: PvpListResp
-	(*PvpIntoReq)(nil),       // 2: PvpIntoReq
-	(*PvpIntoResp)(nil),      // 3: PvpIntoResp
-	(*PvpReadyPush)(nil),     // 4: PvpReadyPush
-	(*PvpCancelPush)(nil),    // 5: PvpCancelPush
-	(*PvpFormationReq)(nil),  // 6: PvpFormationReq
-	(*PvpFormationResp)(nil), // 7: PvpFormationResp
-	(*PvpStartPush)(nil),     // 8: PvpStartPush
-	(*PvpOutCmdPush)(nil),    // 9: PvpOutCmdPush
-	(*PvpInCmdReq)(nil),      // 10: PvpInCmdReq
-	(*PvpInCmdResp)(nil),     // 11: PvpInCmdResp
-	(*DBPvpBattle)(nil),      // 12: DBPvpBattle
-	(ErrorCode)(0),           // 13: ErrorCode
-	(*BattleStateInfo)(nil),  // 14: BattleStateInfo
-	(*PvpUserInfo)(nil),      // 15: PvpUserInfo
-	(*BattleFormation)(nil),  // 16: BattleFormation
-	(*BattleInfo)(nil),       // 17: BattleInfo
-	(*BattleCmd)(nil),        // 18: BattleCmd
+	(*PvpListReq)(nil),          // 0: PvpListReq
+	(*PvpListResp)(nil),         // 1: PvpListResp
+	(*PvpIntoReq)(nil),          // 2: PvpIntoReq
+	(*PvpIntoResp)(nil),         // 3: PvpIntoResp
+	(*PvpReadyPush)(nil),        // 4: PvpReadyPush
+	(*PvpCancelPush)(nil),       // 5: PvpCancelPush
+	(*PvpActiveCancelReq)(nil),  // 6: PvpActiveCancelReq
+	(*PvpActiveCancelResp)(nil), // 7: PvpActiveCancelResp
+	(*PvpFormationReq)(nil),     // 8: PvpFormationReq
+	(*PvpFormationResp)(nil),    // 9: PvpFormationResp
+	(*PvpStartPush)(nil),        // 10: PvpStartPush
+	(*PvpOutCmdPush)(nil),       // 11: PvpOutCmdPush
+	(*PvpInCmdReq)(nil),         // 12: PvpInCmdReq
+	(*PvpInCmdResp)(nil),        // 13: PvpInCmdResp
+	(*DBPvpBattle)(nil),         // 14: DBPvpBattle
+	(ErrorCode)(0),              // 15: ErrorCode
+	(*BattleStateInfo)(nil),     // 16: BattleStateInfo
+	(*PvpUserInfo)(nil),         // 17: PvpUserInfo
+	(*BattleFormation)(nil),     // 18: BattleFormation
+	(*BattleInfo)(nil),          // 19: BattleInfo
+	(*BattleCmd)(nil),           // 20: BattleCmd
 }
 var file_pvp_pvp_msg_proto_depIdxs = []int32{
-	12, // 0: PvpListResp.list:type_name -> DBPvpBattle
-	13, // 1: PvpIntoResp.code:type_name -> ErrorCode
-	14, // 2: PvpIntoResp.info:type_name -> BattleStateInfo
-	15, // 3: PvpReadyPush.red:type_name -> PvpUserInfo
-	15, // 4: PvpReadyPush.blue:type_name -> PvpUserInfo
-	16, // 5: PvpFormationReq.formation:type_name -> BattleFormation
-	13, // 6: PvpStartPush.code:type_name -> ErrorCode
-	17, // 7: PvpStartPush.info:type_name -> BattleInfo
-	18, // 8: PvpOutCmdPush.cmd:type_name -> BattleCmd
-	18, // 9: PvpInCmdReq.cmd:type_name -> BattleCmd
-	13, // 10: PvpInCmdResp.code:type_name -> ErrorCode
-	18, // 11: PvpInCmdResp.cmd:type_name -> BattleCmd
+	14, // 0: PvpListResp.list:type_name -> DBPvpBattle
+	15, // 1: PvpIntoResp.code:type_name -> ErrorCode
+	16, // 2: PvpIntoResp.info:type_name -> BattleStateInfo
+	17, // 3: PvpReadyPush.red:type_name -> PvpUserInfo
+	17, // 4: PvpReadyPush.blue:type_name -> PvpUserInfo
+	18, // 5: PvpFormationReq.formation:type_name -> BattleFormation
+	15, // 6: PvpStartPush.code:type_name -> ErrorCode
+	19, // 7: PvpStartPush.info:type_name -> BattleInfo
+	20, // 8: PvpOutCmdPush.cmd:type_name -> BattleCmd
+	20, // 9: PvpInCmdReq.cmd:type_name -> BattleCmd
+	15, // 10: PvpInCmdResp.code:type_name -> ErrorCode
+	20, // 11: PvpInCmdResp.cmd:type_name -> BattleCmd
 	12, // [12:12] is the sub-list for method output_type
 	12, // [12:12] is the sub-list for method input_type
 	12, // [12:12] is the sub-list for extension type_name
@@ -898,7 +1000,7 @@ func file_pvp_pvp_msg_proto_init() {
 			}
 		}
 		file_pvp_pvp_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PvpFormationReq); i {
+			switch v := v.(*PvpActiveCancelReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -910,7 +1012,7 @@ func file_pvp_pvp_msg_proto_init() {
 			}
 		}
 		file_pvp_pvp_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PvpFormationResp); i {
+			switch v := v.(*PvpActiveCancelResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -922,7 +1024,7 @@ func file_pvp_pvp_msg_proto_init() {
 			}
 		}
 		file_pvp_pvp_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PvpStartPush); i {
+			switch v := v.(*PvpFormationReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -934,7 +1036,7 @@ func file_pvp_pvp_msg_proto_init() {
 			}
 		}
 		file_pvp_pvp_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PvpOutCmdPush); i {
+			switch v := v.(*PvpFormationResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -946,7 +1048,7 @@ func file_pvp_pvp_msg_proto_init() {
 			}
 		}
 		file_pvp_pvp_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PvpInCmdReq); i {
+			switch v := v.(*PvpStartPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -958,6 +1060,30 @@ func file_pvp_pvp_msg_proto_init() {
 			}
 		}
 		file_pvp_pvp_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PvpOutCmdPush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pvp_pvp_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PvpInCmdReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pvp_pvp_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PvpInCmdResp); i {
 			case 0:
 				return &v.state
@@ -976,7 +1102,7 @@ func file_pvp_pvp_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_pvp_pvp_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

From 2d871aed9a1c8e51f70a39a4ca58f84dda4d9ac3 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 30 Mar 2023 18:49:43 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E5=A5=96=E5=8A=B1?=
 =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/smithy/api_atlasaward.go |  64 ++++++---
 modules/smithy/api_forgeequip.go |   2 +-
 pb/errorcode.pb.go               |  46 ++++---
 pb/smithy_msg.pb.go              | 220 ++++++++++++++++---------------
 4 files changed, 186 insertions(+), 146 deletions(-)

diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go
index 118983fd6..efcc769a7 100644
--- a/modules/smithy/api_atlasaward.go
+++ b/modules/smithy/api_atlasaward.go
@@ -3,6 +3,7 @@ package smithy
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -13,9 +14,12 @@ func (this *apiComp) AtlasAwardCheck(session comm.IUserSession, req *pb.SmithyAt
 	return
 }
 
-// 获取铁匠铺图鉴信息
+// 一键领取所有可以领取的奖励
 func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode, data proto.Message) {
-
+	var (
+		res     []*cfg.Gameatn
+		respRes []*pb.UserAssets
+	)
 	code = this.AtlasAwardCheck(session, req)
 	if code != pb.ErrorCode_Success {
 		return // 参数校验失败直接返回
@@ -25,31 +29,49 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw
 		code = pb.ErrorCode_DBError
 		return
 	}
+	for {
+		conf := this.module.configure.GetSmithyAtlasLvConf(atlas.Award + 1)
+		if conf == nil {
+			break
+		}
+		if atlas.Score < conf.AtlasScore { // 校验积分够不够
+			break
+		}
+		atlas.Award += 1
+		res = append(res, conf.ItemId...)
+	}
+	if len(res) == 0 { // 没有奖励可领取
+		code = pb.ErrorCode_MartialhallAtlasNoReward
+		return
+	}
+	this.module.DispenseRes(session, res, true)
 
-	conf := this.module.configure.GetSmithyAtlasLvConf(atlas.Award)
-	if conf == nil {
-		code = pb.ErrorCode_ConfigNoFound
-		return
-	}
-	nexLv := this.module.configure.GetSmithyAtlasLvConf(atlas.Award + 1)
-	if nexLv == nil { //满级
-		code = pb.ErrorCode_SmithyAtlasMaxLv
-		return
-	}
-	// 校验能否领取奖励
-	if atlas.Score < nexLv.AtlasLv {
-		code = pb.ErrorCode_SmithyAtlasLackLv
-		return
-	}
-	if code = this.module.DispenseRes(session, conf.ItemId, true); code != pb.ErrorCode_Success {
-		return
+	for _, v := range res {
+		bFind := false
+		for _, v1 := range respRes {
+
+			if v1.A == v.A && v1.T == v.T {
+				v1.N += v.N
+				bFind = true
+			}
+
+		}
+		if !bFind {
+			respRes = append(respRes, &pb.UserAssets{
+				A: v.A,
+				T: v.T,
+				N: v.N,
+			})
+		}
 	}
 	//修改数据
-	atlas.Award += 1
 	update := make(map[string]interface{}, 0)
 	update["award"] = atlas.Award
 	this.module.modelAtlas.modifySmithyAtlasList(session.GetUserId(), update)
 
-	session.SendMsg(string(this.module.GetType()), "atlasaward", &pb.SmithyAtlasAwardResp{Data: atlas})
+	session.SendMsg(string(this.module.GetType()), "atlasaward", &pb.SmithyAtlasAwardResp{
+		Data: atlas,
+		Res:  respRes,
+	})
 	return
 }
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index f412ce5c2..ae407e6bb 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -217,7 +217,6 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 	stove.Data[req.ReelId].Value += 1
 	stove.Forge[req.ReelId] += 1
 
-	this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
 	// 检查是否提升了熟练度等级
 	nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1)
 	if nextProficiency != nil && nextProficiency.Proficiency <= stove.Data[req.ReelId].Value { // 提升熟练度
@@ -244,6 +243,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 	update["data"] = stove.Data
 
 	update["forge"] = stove.Forge // 打造次数
+	this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
 	rsp.Data = stove
 	session.SendMsg(string(this.module.GetType()), "forgeequip", rsp)
 	// 更新图鉴信息
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 2487e459a..b752f263e 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -340,6 +340,7 @@ const (
 	ErrorCode_SmithyNoActivateAtlas       ErrorCode = 4113 // 没有图鉴更新数据
 	ErrorCode_SmithyLvToolsFailed         ErrorCode = 4114 //
 	ErrorCode_SmithyLvToolsPre            ErrorCode = 4115 // 前置条件不足
+	ErrorCode_SmithyAtlasTypeErr          ErrorCode = 4116 //图鉴类型错误
 	// dispatch
 	ErrorCode_DispatchHeroNoReached  ErrorCode = 4201 //英雄条件未达标
 	ErrorCode_DispatchNoFree         ErrorCode = 4202 //免费次数用尽
@@ -644,6 +645,7 @@ var (
 		4113: "SmithyNoActivateAtlas",
 		4114: "SmithyLvToolsFailed",
 		4115: "SmithyLvToolsPre",
+		4116: "SmithyAtlasTypeErr",
 		4201: "DispatchHeroNoReached",
 		4202: "DispatchNoFree",
 		4203: "DispatchTicketNoEnough",
@@ -943,6 +945,7 @@ var (
 		"SmithyNoActivateAtlas":       4113,
 		"SmithyLvToolsFailed":         4114,
 		"SmithyLvToolsPre":            4115,
+		"SmithyAtlasTypeErr":          4116,
 		"DispatchHeroNoReached":       4201,
 		"DispatchNoFree":              4202,
 		"DispatchTicketNoEnough":      4203,
@@ -989,7 +992,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xff, 0x35, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0x98, 0x36, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1402,27 +1405,28 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f,
 	0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53,
 	0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10,
-	0x93, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65,
-	0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13,
-	0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65,
-	0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54,
-	0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20,
+	0x93, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61,
+	0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0x94, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44,
+	0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61,
+	0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61,
+	0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16,
+	0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f,
+	0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73,
+	0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65,
+	0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68,
+	0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17,
+	0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
+	0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61,
+	0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20,
 	0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f,
-	0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44,
-	0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72,
-	0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63,
-	0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17,
-	0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69,
-	0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61,
-	0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
-	0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69,
-	0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a,
-	0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54,
-	0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76,
-	0x10, 0xd0, 0x21, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50,
+	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67,
+	0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53,
+	0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
+	0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10,
+	0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69,
+	0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xd0, 0x21, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go
index 5df349f28..7334c1d37 100644
--- a/pb/smithy_msg.pb.go
+++ b/pb/smithy_msg.pb.go
@@ -1058,7 +1058,8 @@ type SmithyAtlasAwardResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Data *DBAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` // 奖励信息
+	Data *DBAtlas      `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` // 奖励信息
+	Res  []*UserAssets `protobuf:"bytes,2,rep,name=res,proto3" json:"res"`   // 获得的奖励
 }
 
 func (x *SmithyAtlasAwardResp) Reset() {
@@ -1100,6 +1101,13 @@ func (x *SmithyAtlasAwardResp) GetData() *DBAtlas {
 	return nil
 }
 
+func (x *SmithyAtlasAwardResp) GetRes() []*UserAssets {
+	if x != nil {
+		return x.Res
+	}
+	return nil
+}
+
 //图鉴任务奖励领取
 type SmithyTaskAwardReq struct {
 	state         protoimpl.MessageState
@@ -1288,103 +1296,106 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
 	0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x73, 0x6d, 0x69, 0x74, 0x68,
 	0x79, 0x2f, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75,
-	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76,
-	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74,
-	0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x22, 0xfa, 0x01, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65,
-	0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x65, 0x6c,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64,
-	0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x6c, 0x61, 0x76, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x18,
-	0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x03, 0x68, 0x69, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45,
-	0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x2e, 0x48, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x03, 0x68, 0x69, 0x74, 0x1a, 0x36, 0x0a, 0x08, 0x48, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x59, 0x0a,
-	0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69,
-	0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d,
-	0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f,
-	0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74,
-	0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x11,
-	0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
-	0x3d, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x71,
-	0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e,
-	0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
-	0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x22,
-	0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52,
-	0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x69, 0x64, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c,
-	0x73, 0x55, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x12, 0x53, 0x6d,
-	0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x4b, 0x0a,
-	0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a,
-	0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
-	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x79, 0x0a, 0x0e, 0x53, 0x6d,
-	0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a,
-	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08,
-	0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08,
-	0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x0f, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52,
-	0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74,
-	0x68, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x09,
+	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x17, 0x0a, 0x15, 0x53,
+	0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65,
+	0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c,
+	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44,
+	0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xfa, 0x01, 0x0a,
+	0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69,
+	0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6c, 0x61, 0x76, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61,
+	0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75,
+	0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69,
+	0x74, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x2f, 0x0a, 0x03, 0x68, 0x69, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e,
+	0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70,
+	0x52, 0x65, 0x71, 0x2e, 0x48, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x68, 0x69,
+	0x74, 0x1a, 0x36, 0x0a, 0x08, 0x48, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x59, 0x0a, 0x14, 0x53, 0x6d, 0x69,
+	0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x23, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52,
+	0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74,
+	0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74,
+	0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42,
+	0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3d, 0x0a, 0x0d, 0x53,
+	0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
+	0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74,
+	0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0e, 0x53, 0x6d,
+	0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53,
+	0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x22, 0x0a, 0x10, 0x53, 0x6d,
+	0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x71, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x31,
+	0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f,
+	0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+	0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x09,
 	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
 	0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09,
-	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69,
-	0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22,
-	0x33, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69,
-	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x22, 0x28, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74,
-	0x6c, 0x61, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e,
-	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x37,
-	0x0a, 0x17, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63, 0x74,
-	0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61,
-	0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68,
-	0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34,
-	0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61,
-	0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61,
-	0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
-	0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b,
-	0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
-	0x64, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x6c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
-	0x54, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05,
-	0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x54, 0x75,
-	0x6a, 0x69, 0x61, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x53, 0x6d, 0x69,
+	0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71,
+	0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71,
+	0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74,
+	0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x79, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+	0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74,
+	0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69,
+	0x70, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69,
+	0x70, 0x49, 0x64, 0x73, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+	0x73, 0x22, 0x31, 0x0a, 0x0f, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73,
+	0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x65, 0x72, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65,
+	0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74,
+	0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74,
+	0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41,
+	0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x13, 0x53,
+	0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x22, 0x28, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41,
+	0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x17, 0x53, 0x6d,
+	0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64,
+	0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c,
+	0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x14, 0x53, 0x6d,
+	0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x12, 0x1d, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22,
+	0x2c, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a,
+	0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11,
+	0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x71, 0x22, 0x37, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x6c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x54,
+	0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1432,7 +1443,8 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{
 	(*DB_Equipment)(nil),            // 28: DB_Equipment
 	(*CustomerInfo)(nil),            // 29: CustomerInfo
 	(*DBAtlas)(nil),                 // 30: DBAtlas
-	(*TujianTask)(nil),              // 31: TujianTask
+	(*UserAssets)(nil),              // 31: UserAssets
+	(*TujianTask)(nil),              // 32: TujianTask
 }
 var file_smithy_smithy_msg_proto_depIdxs = []int32{
 	27, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
@@ -1448,12 +1460,13 @@ var file_smithy_smithy_msg_proto_depIdxs = []int32{
 	30, // 10: SmithyAtlasListResp.data:type_name -> DBAtlas
 	30, // 11: SmithyAtlasActivateResp.data:type_name -> DBAtlas
 	30, // 12: SmithyAtlasAwardResp.data:type_name -> DBAtlas
-	31, // 13: SmithyTasklistResp.tasks:type_name -> TujianTask
-	14, // [14:14] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for method input_type
-	14, // [14:14] is the sub-list for extension type_name
-	14, // [14:14] is the sub-list for extension extendee
-	0,  // [0:14] is the sub-list for field type_name
+	31, // 13: SmithyAtlasAwardResp.res:type_name -> UserAssets
+	32, // 14: SmithyTasklistResp.tasks:type_name -> TujianTask
+	15, // [15:15] is the sub-list for method output_type
+	15, // [15:15] is the sub-list for method input_type
+	15, // [15:15] is the sub-list for extension type_name
+	15, // [15:15] is the sub-list for extension extendee
+	0,  // [0:15] is the sub-list for field type_name
 }
 
 func init() { file_smithy_smithy_msg_proto_init() }
@@ -1463,6 +1476,7 @@ func file_smithy_smithy_msg_proto_init() {
 	}
 	file_smithy_smithy_db_proto_init()
 	file_equipment_equipment_db_proto_init()
+	file_comm_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_smithy_smithy_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SmithyGetStoveInfoReq); i {

From 9823de2ac596b594101d4f2fe85f6bc2648a39c7 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 30 Mar 2023 20:05:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0pvp=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/pvp/module.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/pvp/module.go b/modules/pvp/module.go
index ac6119bc0..dfddca3eb 100644
--- a/modules/pvp/module.go
+++ b/modules/pvp/module.go
@@ -228,7 +228,20 @@ func (this *Pvp) readyTimeOut(task *timewheel.Task, args ...interface{}) {
 		}, battle.RedSession, battle.BlueSession); err != nil {
 			this.Errorln(err)
 		}
-		go this.practice.ChallengeResults(battle.Id, battle.Red.Uid, battle.Blue.Uid, 0)
+
+		switch battle.Ptype {
+		case pb.PvpType_friends:
+			var winside int32 = 0
+			if battle.Redformation != nil {
+				winside = 1
+			}
+			if battle.Blueformation != nil {
+				winside = 2
+			}
+			go this.practice.ChallengeResults(battle.Id, battle.Red.Uid, battle.Blue.Uid, winside)
+			break
+		}
+
 	}
 }