liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-11-14 18:23:52 +08:00
commit 930cc9a4f0
4 changed files with 56 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/shop/api_buy.go
View File

@ -27,7 +27,6 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
conf *cfg.GameShopitemData conf *cfg.GameShopitemData
shopData *pb.DBShop shopData *pb.DBShop
good *pb.UserShopGood good *pb.UserShopGood
filed string
record *pb.UserShopData record *pb.UserShopData
need []*cfg.Gameatn need []*cfg.Gameatn
give []*cfg.Gameatn give []*cfg.Gameatn
@ -46,43 +45,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
} }
return return
} }
record = shopData.Shops[int32(req.ShopType)]
switch req.ShopType {
case pb.ShopType_GoldShop:
filed = "goldShop"
record = shopData.GoldShop
break
case pb.ShopType_DiamondShop:
filed = "diamondShop"
record = shopData.DiamondShop
break
case pb.ShopType_PVEShop:
filed = "pveShop"
record = shopData.PveShop
break
case pb.ShopType_PVPShop:
filed = "pvpShop"
record = shopData.PvpShop
break
case pb.ShopType_AllianceShop:
filed = "allianceShop"
record = shopData.AllianceShop
break
case pb.ShopType_HeroShop:
filed = "heroShop"
record = shopData.HeroShop
break
case pb.ShopType_SmithyShop:
filed = "smithyShop"
record = shopData.SmithyShop
break
default:
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
if record == nil { if record == nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
@ -146,7 +109,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
return return
} }
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: record}) this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"shops": shopData.Shops})
if !conf.Preview { if !conf.Preview {
if errdata, award = this.module.DispenseAtno(session, give, true); errdata != nil { if errdata, award = this.module.DispenseAtno(session, give, true); errdata != nil {
return return

39
modules/shop/api_getlist.go
View File

@ -66,48 +66,15 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
} }
return return
} }
sdata = shopData.Shops[int32(req.SType)]
switch req.SType { if req.SType == pb.ShopType_GoldShop {
case pb.ShopType_GoldShop:
sdata = shopData.GoldShop
filed = "goldShop"
refresh = this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType2) refresh = this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType2)
break
case pb.ShopType_DiamondShop:
sdata = shopData.DiamondShop
filed = "diamondShop"
break
case pb.ShopType_PVPShop:
sdata = shopData.PvpShop
filed = "pvpShop"
break
case pb.ShopType_PVEShop:
sdata = shopData.PveShop
filed = "pveShop"
break
case pb.ShopType_AllianceShop:
sdata = shopData.AllianceShop
filed = "allianceShop"
break
case pb.ShopType_HeroShop:
sdata = shopData.HeroShop
filed = "heroShop"
break
case pb.ShopType_SmithyShop:
sdata = shopData.SmithyShop
filed = "smithyShop"
break
default:
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
} }
if sdata == nil { if sdata == nil {
sdata = &pb.UserShopData{ sdata = &pb.UserShopData{
Items: make([]*pb.UserShopGood, 0), Items: make([]*pb.UserShopGood, 0),
} }
shopData.Shops[int32(req.SType)] = sdata
} }
if shopconf.Rnum > 0 { if shopconf.Rnum > 0 {
leftrefnum = shopconf.Rnum - sdata.ManualRefreshNum leftrefnum = shopconf.Rnum - sdata.ManualRefreshNum

18
pb/catchbugs_msg.pb.go
View File

@ -200,7 +200,7 @@ func (x *CatchbugsAwardResp) GetAward() []*UserAtno {
return nil return nil
} }
//游戏准备推送 //游戏准备推送4
type CatchbugsSingleGameReq struct { type CatchbugsSingleGameReq struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -343,7 +343,7 @@ func (x *CatchbugsGameReadyPush) GetRoom() *DBCatchBugsRoom {
return nil return nil
} }
//加载完毕请求 //加载完毕请求5
type CatchbugsReadyReq struct { type CatchbugsReadyReq struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -447,7 +447,7 @@ func (x *CatchbugsReadyResp) GetIssucc() bool {
return false return false
} }
//回合数结束推送 //回合数开始推送6
type CatchbugsRoundStartPush struct { type CatchbugsRoundStartPush struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -503,7 +503,7 @@ func (x *CatchbugsRoundStartPush) GetHandleplayer() string {
return "" return ""
} }
//发送操作请求 //发送操作请求7
type CatchbugsHandleReq struct { type CatchbugsHandleReq struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -605,7 +605,7 @@ func (*CatchbugsHandleResp) Descriptor() ([]byte, []int) {
return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11} return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11}
} }
//玩家操作推送 //玩家操作推送8
type CatchbugsOpenCardPush struct { type CatchbugsOpenCardPush struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -685,7 +685,7 @@ func (x *CatchbugsOpenCardPush) GetIssucc() bool {
return false return false
} }
//操作结束请求 //操作结束请求9 时间到
type CatchbugsHandleEndReq struct { type CatchbugsHandleEndReq struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -772,7 +772,7 @@ func (*CatchbugsHandleEndResp) Descriptor() ([]byte, []int) {
return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14} return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14}
} }
//桌面变化推送 //桌面变化推送10 a
type CatchbugsTablesChangePush struct { type CatchbugsTablesChangePush struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -828,7 +828,7 @@ func (x *CatchbugsTablesChangePush) GetCard() []*DBCatchBugsCard {
return nil return nil
} }
//回个结束通知 //回个结束通知11 b, 然后两边发ready, 新的回合开始
type CatchbugsRoundEndPush struct { type CatchbugsRoundEndPush struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -867,7 +867,7 @@ func (*CatchbugsRoundEndPush) Descriptor() ([]byte, []int) {
return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{16} return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{16}
} }
//游戏结束推送 //游戏结束推送12
type CatchbugsGameOverPush struct { type CatchbugsGameOverPush struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache

148
pb/shop_db.pb.go
View File

@ -286,17 +286,11 @@ type DBShop struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id
RefreshnumgoldShop int32 `protobuf:"varint,3,opt,name=refreshnumgoldShop,proto3" json:"refreshnumgoldShop" bson:"refreshnumgoldShop"` //刷新金币商店次数 RefreshnumgoldShop int32 `protobuf:"varint,3,opt,name=refreshnumgoldShop,proto3" json:"refreshnumgoldShop" bson:"refreshnumgoldShop"` //刷新金币商店次数
RefreshtimegoldShop int64 `protobuf:"varint,4,opt,name=refreshtimegoldShop,proto3" json:"refreshtimegoldShop" bson:"refreshtimegoldShop"` //刷新金币商店的时间 RefreshtimegoldShop int64 `protobuf:"varint,4,opt,name=refreshtimegoldShop,proto3" json:"refreshtimegoldShop" bson:"refreshtimegoldShop"` //刷新金币商店的时间
GoldShop *UserShopData `protobuf:"bytes,5,opt,name=goldShop,proto3" json:"goldShop" bson:"goldShop"` //金币商店数据 Shops map[int32]*UserShopData `protobuf:"bytes,5,rep,name=shops,proto3" json:"shops" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //商店数据
DiamondShop *UserShopData `protobuf:"bytes,6,opt,name=diamondShop,proto3" json:"diamondShop" bson:"diamondShop"` //金币商店数据
PvpShop *UserShopData `protobuf:"bytes,7,opt,name=pvpShop,proto3" json:"pvpShop" bson:"pvpShop"` //金币商店数据
PveShop *UserShopData `protobuf:"bytes,8,opt,name=pveShop,proto3" json:"pveShop" bson:"pveShop"` //金币商店数据
AllianceShop *UserShopData `protobuf:"bytes,9,opt,name=allianceShop,proto3" json:"allianceShop" bson:"allianceShop"` //金币商店数据
HeroShop *UserShopData `protobuf:"bytes,10,opt,name=heroShop,proto3" json:"heroShop" bson:"heroShop"` //金币商店数据
SmithyShop *UserShopData `protobuf:"bytes,11,opt,name=smithyShop,proto3" json:"smithyShop" bson:"smithyShop"` //金币商店数据
} }
func (x *DBShop) Reset() { func (x *DBShop) Reset() {
@ -359,51 +353,9 @@ func (x *DBShop) GetRefreshtimegoldShop() int64 {
return 0 return 0
} }
func (x *DBShop) GetGoldShop() *UserShopData { func (x *DBShop) GetShops() map[int32]*UserShopData {
if x != nil { if x != nil {
return x.GoldShop return x.Shops
}
return nil
}
func (x *DBShop) GetDiamondShop() *UserShopData {
if x != nil {
return x.DiamondShop
}
return nil
}
func (x *DBShop) GetPvpShop() *UserShopData {
if x != nil {
return x.PvpShop
}
return nil
}
func (x *DBShop) GetPveShop() *UserShopData {
if x != nil {
return x.PveShop
}
return nil
}
func (x *DBShop) GetAllianceShop() *UserShopData {
if x != nil {
return x.AllianceShop
}
return nil
}
func (x *DBShop) GetHeroShop() *UserShopData {
if x != nil {
return x.HeroShop
}
return nil
}
func (x *DBShop) GetSmithyShop() *UserShopData {
if x != nil {
return x.SmithyShop
} }
return nil return nil
} }
@ -445,7 +397,7 @@ var file_shop_shop_db_proto_rawDesc = []byte{
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
0x12, 0x1f, 0x0a, 0x04, 0x4e, 0x65, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x12, 0x1f, 0x0a, 0x04, 0x4e, 0x65, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x4e, 0x65, 0x65, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x4e, 0x65, 0x65,
0x64, 0x22, 0xc7, 0x03, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x64, 0x22, 0xff, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e,
0x0a, 0x12, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x67, 0x6f, 0x6c, 0x64, 0x0a, 0x12, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x67, 0x6f, 0x6c, 0x64,
@ -454,35 +406,23 @@ var file_shop_shop_db_proto_rawDesc = []byte{
0x0a, 0x13, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67, 0x6f, 0x6c, 0x0a, 0x13, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67, 0x6f, 0x6c,
0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x72, 0x65, 0x66, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x72, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70,
0x12, 0x29, 0x0a, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x05, 0x20, 0x01, 0x12, 0x28, 0x0a, 0x05, 0x73, 0x68, 0x6f, 0x70, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x12, 0x2e, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x73, 0x45, 0x6e,
0x61, 0x52, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2f, 0x0a, 0x0b, 0x64, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x68, 0x6f, 0x70, 0x73, 0x1a, 0x47, 0x0a, 0x0a, 0x53, 0x68,
0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x6f, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61,
0x0b, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72,
0x70, 0x76, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x02, 0x38, 0x01, 0x2a, 0x7d, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12,
0x70, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c,
0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f,
0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x31, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53,
0x0a, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x09, 0x68, 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68,
0x61, 0x74, 0x61, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x6f, 0x70, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70,
0x70, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x0a, 0x20, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70,
0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2d, 0x0a, 0x0a, 0x6f, 0x33,
0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52,
0x0a, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x2a, 0x7d, 0x0a, 0x08, 0x53,
0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10,
0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12,
0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02,
0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a,
0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c,
0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08,
0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x6d,
0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -498,7 +438,7 @@ func file_shop_shop_db_proto_rawDescGZIP() []byte {
} }
var file_shop_shop_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_shop_shop_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_shop_shop_db_proto_goTypes = []interface{}{ var file_shop_shop_db_proto_goTypes = []interface{}{
(ShopType)(0), // 0: ShopType (ShopType)(0), // 0: ShopType
(*UserShopGood)(nil), // 1: UserShopGood (*UserShopGood)(nil), // 1: UserShopGood
@ -506,27 +446,23 @@ var file_shop_shop_db_proto_goTypes = []interface{}{
(*UserShopDataEx)(nil), // 3: UserShopDataEx (*UserShopDataEx)(nil), // 3: UserShopDataEx
(*DBShop)(nil), // 4: DBShop (*DBShop)(nil), // 4: DBShop
nil, // 5: UserShopData.PreviewEntry nil, // 5: UserShopData.PreviewEntry
(*DB_Equipment)(nil), // 6: DB_Equipment nil, // 6: DBShop.ShopsEntry
(*UserAssets)(nil), // 7: UserAssets (*DB_Equipment)(nil), // 7: DB_Equipment
(*UserAssets)(nil), // 8: UserAssets
} }
var file_shop_shop_db_proto_depIdxs = []int32{ var file_shop_shop_db_proto_depIdxs = []int32{
1, // 0: UserShopData.Items:type_name -> UserShopGood 1, // 0: UserShopData.Items:type_name -> UserShopGood
5, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry 5, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry
6, // 2: UserShopDataEx.equipment:type_name -> DB_Equipment 7, // 2: UserShopDataEx.equipment:type_name -> DB_Equipment
7, // 3: UserShopDataEx.Need:type_name -> UserAssets 8, // 3: UserShopDataEx.Need:type_name -> UserAssets
2, // 4: DBShop.goldShop:type_name -> UserShopData 6, // 4: DBShop.shops:type_name -> DBShop.ShopsEntry
2, // 5: DBShop.diamondShop:type_name -> UserShopData 3, // 5: UserShopData.PreviewEntry.value:type_name -> UserShopDataEx
2, // 6: DBShop.pvpShop:type_name -> UserShopData 2, // 6: DBShop.ShopsEntry.value:type_name -> UserShopData
2, // 7: DBShop.pveShop:type_name -> UserShopData 7, // [7:7] is the sub-list for method output_type
2, // 8: DBShop.allianceShop:type_name -> UserShopData 7, // [7:7] is the sub-list for method input_type
2, // 9: DBShop.heroShop:type_name -> UserShopData 7, // [7:7] is the sub-list for extension type_name
2, // 10: DBShop.smithyShop:type_name -> UserShopData 7, // [7:7] is the sub-list for extension extendee
3, // 11: UserShopData.PreviewEntry.value:type_name -> UserShopDataEx 0, // [0:7] is the sub-list for field type_name
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
12, // [12:12] is the sub-list for extension extendee
0, // [0:12] is the sub-list for field type_name
} }
func init() { file_shop_shop_db_proto_init() } func init() { file_shop_shop_db_proto_init() }
@ -592,7 +528,7 @@ func file_shop_shop_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_shop_shop_db_proto_rawDesc, RawDescriptor: file_shop_shop_db_proto_rawDesc,
NumEnums: 1, NumEnums: 1,
NumMessages: 5, NumMessages: 6,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },