From d999e6c81b337ff12ee111fab014e6a06f6b5f42 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 9 Sep 2022 16:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A3=85=E5=A4=87=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=20=E5=85=B3=E9=97=ADc#=E5=85=B3=E9=94=AE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/equipment/api_lock.go  |  4 ++--
 modules/equipment/api_sellI.go |  2 +-
 pb/equipment_db.pb.go          | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/equipment/api_lock.go b/modules/equipment/api_lock.go
index 610b09f9e..141745059 100644
--- a/modules/equipment/api_lock.go
+++ b/modules/equipment/api_lock.go
@@ -29,9 +29,9 @@ func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (
 		code = pb.ErrorCode_EquipmentOnFoundEquipment
 		return
 	}
-	equipment.Lock = req.IsLock
+	equipment.Islock = req.IsLock
 	if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{
-		"lock": equipment.Lock,
+		"islock": equipment.Islock,
 	}); err != nil {
 		this.module.Errorln(err)
 		code = pb.ErrorCode_DBError
diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go
index 6829e838b..2594b571c 100644
--- a/modules/equipment/api_sellI.go
+++ b/modules/equipment/api_sellI.go
@@ -33,7 +33,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (
 	}
 	confs = make([]*cfg.GameEquipData, len(equipments))
 	for i, v := range equipments {
-		if v.HeroId != "" || v.Lock {
+		if v.HeroId != "" || v.Islock {
 			code = pb.ErrorCode_EquipmentNoCanSell
 			this.module.Errorf("NoCanSell %v", v)
 			return
diff --git a/pb/equipment_db.pb.go b/pb/equipment_db.pb.go
index d003ad8f3..6597d9fb2 100644
--- a/pb/equipment_db.pb.go
+++ b/pb/equipment_db.pb.go
@@ -116,7 +116,7 @@ type DB_Equipment struct {
 	AdverbEntry    []*EquipmentAttributeEntry `protobuf:"bytes,8,rep,name=adverbEntry,proto3" json:"adverbEntry" bson:"adverbEntry"`            //装备副词条
 	OverlayNum     uint32                     `protobuf:"varint,9,opt,name=overlayNum,proto3" json:"overlayNum" bson:"overlayNum"`              //叠加数量
 	IsInitialState bool                       `protobuf:"varint,10,opt,name=isInitialState,proto3" json:"isInitialState" bson:"isInitialState"` //是否初始状态
-	Lock           bool                       `protobuf:"varint,11,opt,name=lock,proto3" json:"lock" bson:"lock"`                               //是否锁
+	Islock         bool                       `protobuf:"varint,11,opt,name=islock,proto3" json:"islock" bson:"islock"`                         //是否锁
 }
 
 func (x *DB_Equipment) Reset() {
@@ -221,9 +221,9 @@ func (x *DB_Equipment) GetIsInitialState() bool {
 	return false
 }
 
-func (x *DB_Equipment) GetLock() bool {
+func (x *DB_Equipment) GetIslock() bool {
 	if x != nil {
-		return x.Lock
+		return x.Islock
 	}
 	return false
 }
@@ -241,7 +241,7 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
 	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x74, 0x74, 0x72,
 	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xdc, 0x02, 0x0a, 0x0c, 0x44,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x44,
 	0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63,
 	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a,
@@ -262,9 +262,9 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
 	0x0d, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a,
 	0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18,
 	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x04, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (