From abfeeef0ad1e8c25aa73656b36d401ea8fc2c375 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 23 Feb 2023 15:03:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/api_atlasactivate.go | 9 +- modules/smithy/api_getlist.go | 2 + modules/smithy/model_atlas.go | 46 ++++---- modules/smithy/model_stove.go | 8 +- pb/smithy_db.pb.go | 173 +++++++++++++++------------- 5 files changed, 127 insertions(+), 111 deletions(-) diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go index 255fb2d80..d2e8892d6 100644 --- a/modules/smithy/api_atlasactivate.go +++ b/modules/smithy/api_atlasactivate.go @@ -37,11 +37,12 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla if v, ok := atlas.Atlas[req.Id]; ok { if !v.Activate { // 激活 v.Activate = true - addScore = v.Data[0].Score + addScore = v.Data1.Score } else { //更新操作 - if len(v.Data) > 1 { - addScore = v.Data[1].Score - v.Data[0].Score - v.Data = append(v.Data[:0], v.Data[1:]...) + if v.Data2 != nil { + addScore = v.Data2.Score - v.Data1.Score + v.Data1 = v.Data2 + v.Data2 = nil } else { code = pb.ErrorCode_SmithyNoActivateAtlas return diff --git a/modules/smithy/api_getlist.go b/modules/smithy/api_getlist.go index 3b66b7061..5620b8e43 100644 --- a/modules/smithy/api_getlist.go +++ b/modules/smithy/api_getlist.go @@ -15,6 +15,8 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.SmithyGetLi ///获取美食城基本信息 func (this *apiComp) GetList(session comm.IUserSession, req *pb.SmithyGetListReq) (code pb.ErrorCode, data proto.Message) { + this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), "10110", 1, 1, 1) + this.AtlasList(session, &pb.SmithyAtlasListReq{}) code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index 4e5102ba6..2d229adce 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -74,48 +74,50 @@ func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, qual update := make(map[string]interface{}, 0) if v, ok := list.Atlas[id]; ok { // 找到相同的 if v.Activate { // 已经激活的 - if len(v.Data) > 1 { - if v.Data[1].Score <= scoreConf.Score { - v.Data[1].ForgeCount = forgeCount - v.Data[1].Lv = lv - v.Data[1].Quality = quality - v.Data[1].Score = scoreConf.Score - v.Data[1].Time = configure.Now().Unix() + if v.Data2 == nil { + if v.Data1.Score <= scoreConf.Score { + v.Data1.ForgeCount = forgeCount + v.Data1.Lv = lv + v.Data1.Quality = quality + v.Data1.Score = scoreConf.Score + v.Data1.Time = configure.Now().Unix() } } } else { // 没有激活的 - if len(v.Data) == 1 { - if v.Data[0].Score <= scoreConf.Score { - v.Data[0].ForgeCount = forgeCount - v.Data[0].Lv = lv - v.Data[0].Quality = quality - v.Data[0].Score = scoreConf.Score - v.Data[0].Time = configure.Now().Unix() + if v.Data2 == nil { + if v.Data1.Score <= scoreConf.Score { + v.Data1.ForgeCount = forgeCount + v.Data1.Lv = lv + v.Data1.Quality = quality + v.Data1.Score = scoreConf.Score + v.Data1.Time = configure.Now().Unix() } } else { - v.Data = make([]*pb.ForgeData, 0) - newData := &pb.ForgeData{ + + v.Data1 = &pb.ForgeData{ ForgeCount: forgeCount, Lv: lv, Quality: quality, Score: scoreConf.Score, Time: configure.Now().Unix(), } - v.Data = append(v.Data, newData) } } } else { - sz := &pb.ForgeList{} - newData := &pb.ForgeData{ + data := &pb.ForgeList{ + Data1: &pb.ForgeData{}, + Data2: nil, + Activate: false, + } + data.Data1 = &pb.ForgeData{ ForgeCount: forgeCount, Lv: lv, Quality: quality, Score: scoreConf.Score, Time: configure.Now().Unix(), } - sz.Data = append(sz.Data, newData) - sz.Activate = false // 第一次获得 默认是非激活状态 - list.Atlas[id] = sz + list.Atlas[id] = data + } update["atlas"] = list.Atlas this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index 22b501184..ca9f86ae7 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -156,7 +156,7 @@ func (this *modelStove) StoveToolsQualityProbability(stove *pb.DBStove) int32 { // 所有装备售价提升{0}% func (this *modelStove) StoveToolsSellUp(uid string) int32 { if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill2]); conf != nil { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill2, stove.Skill[comm.SmithyToolsSkill2]); conf != nil { return conf.Value } } @@ -165,7 +165,7 @@ func (this *modelStove) StoveToolsSellUp(uid string) int32 { // 所有图纸炉温消耗减少 func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill3]); conf != nil { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill3, stove.Skill[comm.SmithyToolsSkill3]); conf != nil { return conf.Value } return 0 @@ -174,7 +174,7 @@ func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 { //每日顾客数量提升至{0}人 func (this *modelStove) StoveSkillAddCustomer(uid string) int32 { if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill4]); conf != nil { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill4, stove.Skill[comm.SmithyToolsSkill4]); conf != nil { return conf.Value } } @@ -184,7 +184,7 @@ func (this *modelStove) StoveSkillAddCustomer(uid string) int32 { //顾客购买装备数量上限提高至{0}件 func (this *modelStove) StoveSkillBuyEquip(uid string) int32 { if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill5]); conf != nil { + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill5, stove.Skill[comm.SmithyToolsSkill5]); conf != nil { return conf.Value } } diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go index 98431e475..99ea37345 100644 --- a/pb/smithy_db.pb.go +++ b/pb/smithy_db.pb.go @@ -477,8 +477,9 @@ type ForgeList struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data []*ForgeData `protobuf:"bytes,1,rep,name=data,proto3" json:"data"` - Activate bool `protobuf:"varint,2,opt,name=activate,proto3" json:"activate"` // 是否激活 + Data1 *ForgeData `protobuf:"bytes,1,opt,name=data1,proto3" json:"data1"` + Data2 *ForgeData `protobuf:"bytes,2,opt,name=data2,proto3" json:"data2"` + Activate bool `protobuf:"varint,3,opt,name=activate,proto3" json:"activate"` // 是否激活 } func (x *ForgeList) Reset() { @@ -513,9 +514,16 @@ func (*ForgeList) Descriptor() ([]byte, []int) { return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6} } -func (x *ForgeList) GetData() []*ForgeData { +func (x *ForgeList) GetData1() *ForgeData { if x != nil { - return x.Data + return x.Data1 + } + return nil +} + +func (x *ForgeList) GetData2() *ForgeData { + if x != nil { + return x.Data2 } return nil } @@ -1009,69 +1017,71 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{ 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, - 0x47, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, - 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x7f, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, - 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x6c, 0x76, 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, - 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x54, 0x0a, 0x0c, 0x44, 0x42, 0x54, - 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, - 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, - 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, - 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, - 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, 0x0a, - 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, 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, 0x1c, 0x0a, 0x05, 0x63, - 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, 0x61, - 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x21, - 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, - 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, 0x6c, - 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, 0x0a, - 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, - 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, - 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, - 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, - 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, - 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6b, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x05, + 0x64, 0x61, 0x74, 0x61, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, + 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x64, 0x61, 0x74, 0x61, 0x31, 0x12, 0x20, + 0x0a, 0x05, 0x64, 0x61, 0x74, 0x61, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, + 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x64, 0x61, 0x74, 0x61, 0x32, + 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x7f, 0x0a, 0x09, + 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, + 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, + 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 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, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x54, 0x0a, + 0x0c, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x64, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, + 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, + 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, + 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, + 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, + 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, + 0x02, 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, + 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, + 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, + 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, + 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, + 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, + 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, + 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, + 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, + 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, + 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, + 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, + 0x6c, 0x6f, 0x6f, 0x72, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1116,20 +1126,21 @@ var file_smithy_smithy_db_proto_depIdxs = []int32{ 2, // 3: DBCustomer.customers:type_name -> CustomerInfo 15, // 4: DBAtlas.atlas:type_name -> DBAtlas.AtlasEntry 16, // 5: DBAtlas.collect:type_name -> DBAtlas.CollectEntry - 7, // 6: ForgeList.data:type_name -> ForgeData - 9, // 7: DBSmithy.clang:type_name -> Clang - 10, // 8: DBSmithy.orders:type_name -> OrderClang - 19, // 9: DBSmithy.items:type_name -> UserAssets - 17, // 10: DBSmithy.skill:type_name -> DBSmithy.SkillEntry - 18, // 11: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry - 0, // 12: DBStove.DataEntry.value:type_name -> Mastery - 6, // 13: DBAtlas.AtlasEntry.value:type_name -> ForgeList - 5, // 14: DBAtlas.CollectEntry.value:type_name -> CollectData - 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 + 7, // 6: ForgeList.data1:type_name -> ForgeData + 7, // 7: ForgeList.data2:type_name -> ForgeData + 9, // 8: DBSmithy.clang:type_name -> Clang + 10, // 9: DBSmithy.orders:type_name -> OrderClang + 19, // 10: DBSmithy.items:type_name -> UserAssets + 17, // 11: DBSmithy.skill:type_name -> DBSmithy.SkillEntry + 18, // 12: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry + 0, // 13: DBStove.DataEntry.value:type_name -> Mastery + 6, // 14: DBAtlas.AtlasEntry.value:type_name -> ForgeList + 5, // 15: DBAtlas.CollectEntry.value:type_name -> CollectData + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_smithy_smithy_db_proto_init() } From a99dfb6bc9233c093229fd9fa9db2728786486e9 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 23 Feb 2023 15:38:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=AD=A6=E9=A6=86=E5=9B=BE=E9=89=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modulebase.go | 2 + modules/smithy/api_atlasactivate.go | 3 + modules/smithy/api_getlist.go | 4 +- modules/smithy/model_atlas.go | 54 ++- pb/atlas_db.pb.go | 259 +++++++++++++ pb/atlas_msg.pb.go | 571 ++++++++++++++++++++++++++++ 6 files changed, 862 insertions(+), 31 deletions(-) create mode 100644 pb/atlas_db.pb.go create mode 100644 pb/atlas_msg.pb.go diff --git a/modules/modulebase.go b/modules/modulebase.go index 12adb0fec..b5a841694 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -407,6 +407,8 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat } case comm.VipType: vip[v.T] += v.N + case comm.AtlasType: + atlas[v.T] = 1 default: this.Errorf("not found res type") // 找不到资源类型 } diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go index d2e8892d6..154791da5 100644 --- a/modules/smithy/api_atlasactivate.go +++ b/modules/smithy/api_atlasactivate.go @@ -41,6 +41,9 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla } else { //更新操作 if v.Data2 != nil { addScore = v.Data2.Score - v.Data1.Score + if addScore < 0 { // 异常校验 防止配置修改导致分数减少 + addScore = 0 + } v.Data1 = v.Data2 v.Data2 = nil } else { diff --git a/modules/smithy/api_getlist.go b/modules/smithy/api_getlist.go index 5620b8e43..4e67c92e3 100644 --- a/modules/smithy/api_getlist.go +++ b/modules/smithy/api_getlist.go @@ -15,9 +15,9 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.SmithyGetLi ///获取美食城基本信息 func (this *apiComp) GetList(session comm.IUserSession, req *pb.SmithyGetListReq) (code pb.ErrorCode, data proto.Message) { - this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), "10110", 1, 1, 1) + // this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), "10110", 1, 1, 1) - this.AtlasList(session, &pb.SmithyAtlasListReq{}) + // this.AtlasList(session, &pb.SmithyAtlasListReq{}) code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index 2d229adce..e1054b7a9 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -75,49 +75,45 @@ func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, qual if v, ok := list.Atlas[id]; ok { // 找到相同的 if v.Activate { // 已经激活的 if v.Data2 == nil { - if v.Data1.Score <= scoreConf.Score { - v.Data1.ForgeCount = forgeCount - v.Data1.Lv = lv - v.Data1.Quality = quality - v.Data1.Score = scoreConf.Score - v.Data1.Time = configure.Now().Unix() - } - } - } else { // 没有激活的 - if v.Data2 == nil { - if v.Data1.Score <= scoreConf.Score { - v.Data1.ForgeCount = forgeCount - v.Data1.Lv = lv - v.Data1.Quality = quality - v.Data1.Score = scoreConf.Score - v.Data1.Time = configure.Now().Unix() - } - } else { - - v.Data1 = &pb.ForgeData{ + v.Data2 = &pb.ForgeData{ ForgeCount: forgeCount, Lv: lv, Quality: quality, Score: scoreConf.Score, Time: configure.Now().Unix(), } + } else { + if v.Data2.Score < scoreConf.Score { + v.Data2.ForgeCount = forgeCount + v.Data2.Lv = lv + v.Data2.Quality = quality + v.Data2.Score = scoreConf.Score + v.Data2.Time = configure.Now().Unix() + } } + } else { // 没有激活的 + if v.Data1.Score < scoreConf.Score { + v.Data1.ForgeCount = forgeCount + v.Data1.Lv = lv + v.Data1.Quality = quality + v.Data1.Score = scoreConf.Score + v.Data1.Time = configure.Now().Unix() + } + v.Data2 = nil } } else { data := &pb.ForgeList{ - Data1: &pb.ForgeData{}, + Data1: &pb.ForgeData{ + ForgeCount: forgeCount, + Lv: lv, + Quality: quality, + Score: scoreConf.Score, + Time: configure.Now().Unix(), + }, Data2: nil, Activate: false, } - data.Data1 = &pb.ForgeData{ - ForgeCount: forgeCount, - Lv: lv, - Quality: quality, - Score: scoreConf.Score, - Time: configure.Now().Unix(), - } list.Atlas[id] = data - } update["atlas"] = list.Atlas this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 diff --git a/pb/atlas_db.pb.go b/pb/atlas_db.pb.go new file mode 100644 index 000000000..1d0d47fdf --- /dev/null +++ b/pb/atlas_db.pb.go @@ -0,0 +1,259 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: atlas/atlas_db.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type DBPandaAtlas struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + 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 + Collect map[string]*Collect `protobuf:"bytes,3,rep,name=collect,proto3" json:"collect" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 收藏品图鉴信息 + Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 总积分 + Award int32 `protobuf:"varint,5,opt,name=award,proto3" json:"award"` // 奖励进度 +} + +func (x *DBPandaAtlas) Reset() { + *x = DBPandaAtlas{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBPandaAtlas) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBPandaAtlas) ProtoMessage() {} + +func (x *DBPandaAtlas) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_db_proto_msgTypes[0] + 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 DBPandaAtlas.ProtoReflect.Descriptor instead. +func (*DBPandaAtlas) Descriptor() ([]byte, []int) { + return file_atlas_atlas_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DBPandaAtlas) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBPandaAtlas) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBPandaAtlas) GetCollect() map[string]*Collect { + if x != nil { + return x.Collect + } + return nil +} + +func (x *DBPandaAtlas) GetScore() int32 { + if x != nil { + return x.Score + } + return 0 +} + +func (x *DBPandaAtlas) GetAward() int32 { + if x != nil { + return x.Award + } + return 0 +} + +type Collect struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Score int32 `protobuf:"varint,1,opt,name=score,proto3" json:"score"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time"` // 获得时间 +} + +func (x *Collect) Reset() { + *x = Collect{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_db_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Collect) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Collect) ProtoMessage() {} + +func (x *Collect) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_db_proto_msgTypes[1] + 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 Collect.ProtoReflect.Descriptor instead. +func (*Collect) Descriptor() ([]byte, []int) { + return file_atlas_atlas_db_proto_rawDescGZIP(), []int{1} +} + +func (x *Collect) GetScore() int32 { + if x != nil { + return x.Score + } + return 0 +} + +func (x *Collect) GetTime() int64 { + if x != nil { + return x.Time + } + return 0 +} + +var File_atlas_atlas_db_proto protoreflect.FileDescriptor + +var file_atlas_atlas_db_proto_rawDesc = []byte{ + 0x0a, 0x14, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x2f, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x5f, 0x64, 0x62, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x6e, + 0x64, 0x61, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x0e, 0x0a, 0x02, 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, 0x34, 0x0a, 0x07, 0x63, 0x6f, 0x6c, + 0x6c, 0x65, 0x63, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x50, + 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x2e, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, + 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x44, 0x0a, 0x0c, 0x43, + 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, + 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0x33, 0x0a, 0x07, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, + 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, + 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_atlas_atlas_db_proto_rawDescOnce sync.Once + file_atlas_atlas_db_proto_rawDescData = file_atlas_atlas_db_proto_rawDesc +) + +func file_atlas_atlas_db_proto_rawDescGZIP() []byte { + file_atlas_atlas_db_proto_rawDescOnce.Do(func() { + file_atlas_atlas_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_atlas_atlas_db_proto_rawDescData) + }) + return file_atlas_atlas_db_proto_rawDescData +} + +var file_atlas_atlas_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_atlas_atlas_db_proto_goTypes = []interface{}{ + (*DBPandaAtlas)(nil), // 0: DBPandaAtlas + (*Collect)(nil), // 1: Collect + nil, // 2: DBPandaAtlas.CollectEntry +} +var file_atlas_atlas_db_proto_depIdxs = []int32{ + 2, // 0: DBPandaAtlas.collect:type_name -> DBPandaAtlas.CollectEntry + 1, // 1: DBPandaAtlas.CollectEntry.value:type_name -> Collect + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_atlas_atlas_db_proto_init() } +func file_atlas_atlas_db_proto_init() { + if File_atlas_atlas_db_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_atlas_atlas_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPandaAtlas); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Collect); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_atlas_atlas_db_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_atlas_atlas_db_proto_goTypes, + DependencyIndexes: file_atlas_atlas_db_proto_depIdxs, + MessageInfos: file_atlas_atlas_db_proto_msgTypes, + }.Build() + File_atlas_atlas_db_proto = out.File + file_atlas_atlas_db_proto_rawDesc = nil + file_atlas_atlas_db_proto_goTypes = nil + file_atlas_atlas_db_proto_depIdxs = nil +} diff --git a/pb/atlas_msg.pb.go b/pb/atlas_msg.pb.go new file mode 100644 index 000000000..77ef09a65 --- /dev/null +++ b/pb/atlas_msg.pb.go @@ -0,0 +1,571 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: atlas/atlas_msg.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// 查看图鉴信息 +type AtlasGetListReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *AtlasGetListReq) Reset() { + *x = AtlasGetListReq{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AtlasGetListReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AtlasGetListReq) ProtoMessage() {} + +func (x *AtlasGetListReq) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_msg_proto_msgTypes[0] + 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 AtlasGetListReq.ProtoReflect.Descriptor instead. +func (*AtlasGetListReq) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{0} +} + +type AtlasGetListResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBPandaAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *AtlasGetListResp) Reset() { + *x = AtlasGetListResp{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AtlasGetListResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AtlasGetListResp) ProtoMessage() {} + +func (x *AtlasGetListResp) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_msg_proto_msgTypes[1] + 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 AtlasGetListResp.ProtoReflect.Descriptor instead. +func (*AtlasGetListResp) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *AtlasGetListResp) GetData() *DBPandaAtlas { + if x != nil { + return x.Data + } + return nil +} + +// 图鉴激活更新 +type AtlasActivateReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` // 图鉴ID +} + +func (x *AtlasActivateReq) Reset() { + *x = AtlasActivateReq{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AtlasActivateReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AtlasActivateReq) ProtoMessage() {} + +func (x *AtlasActivateReq) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_msg_proto_msgTypes[2] + 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 AtlasActivateReq.ProtoReflect.Descriptor instead. +func (*AtlasActivateReq) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *AtlasActivateReq) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +type AtlasActivateResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBPandaAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *AtlasActivateResp) Reset() { + *x = AtlasActivateResp{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AtlasActivateResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AtlasActivateResp) ProtoMessage() {} + +func (x *AtlasActivateResp) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_msg_proto_msgTypes[3] + 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 AtlasActivateResp.ProtoReflect.Descriptor instead. +func (*AtlasActivateResp) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *AtlasActivateResp) GetData() *DBPandaAtlas { + if x != nil { + return x.Data + } + return nil +} + +// 图鉴信息奖励任务领取 +type AtlasAwardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *AtlasAwardReq) Reset() { + *x = AtlasAwardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AtlasAwardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AtlasAwardReq) ProtoMessage() {} + +func (x *AtlasAwardReq) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_msg_proto_msgTypes[4] + 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 AtlasAwardReq.ProtoReflect.Descriptor instead. +func (*AtlasAwardReq) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{4} +} + +type AtlasAwardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBPandaAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` // 奖励信息 +} + +func (x *AtlasAwardResp) Reset() { + *x = AtlasAwardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AtlasAwardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AtlasAwardResp) ProtoMessage() {} + +func (x *AtlasAwardResp) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_msg_proto_msgTypes[5] + 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 AtlasAwardResp.ProtoReflect.Descriptor instead. +func (*AtlasAwardResp) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{5} +} + +func (x *AtlasAwardResp) GetData() *DBPandaAtlas { + if x != nil { + return x.Data + } + return nil +} + +//图鉴任务奖励领取 +type TaskAwardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` +} + +func (x *TaskAwardReq) Reset() { + *x = TaskAwardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TaskAwardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TaskAwardReq) ProtoMessage() {} + +func (x *TaskAwardReq) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_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 TaskAwardReq.ProtoReflect.Descriptor instead. +func (*TaskAwardReq) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *TaskAwardReq) GetTaskId() int32 { + if x != nil { + return x.TaskId + } + return 0 +} + +type TaskAwardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` +} + +func (x *TaskAwardResp) Reset() { + *x = TaskAwardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_atlas_atlas_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TaskAwardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TaskAwardResp) ProtoMessage() {} + +func (x *TaskAwardResp) ProtoReflect() protoreflect.Message { + mi := &file_atlas_atlas_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 TaskAwardResp.ProtoReflect.Descriptor instead. +func (*TaskAwardResp) Descriptor() ([]byte, []int) { + return file_atlas_atlas_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *TaskAwardResp) GetTaskId() int32 { + if x != nil { + return x.TaskId + } + return 0 +} + +var File_atlas_atlas_msg_proto protoreflect.FileDescriptor + +var file_atlas_atlas_msg_proto_rawDesc = []byte{ + 0x0a, 0x15, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x2f, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x5f, 0x6d, 0x73, + 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x2f, 0x61, + 0x74, 0x6c, 0x61, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x11, 0x0a, + 0x0f, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x22, 0x35, 0x0a, 0x10, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, 0x6c, 0x61, + 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x22, 0x0a, 0x10, 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, 0x36, 0x0a, 0x11, 0x41, + 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, + 0x2e, 0x44, 0x42, 0x50, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x0e, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x74, + 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x0c, 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, 0x27, 0x0a, 0x0d, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_atlas_atlas_msg_proto_rawDescOnce sync.Once + file_atlas_atlas_msg_proto_rawDescData = file_atlas_atlas_msg_proto_rawDesc +) + +func file_atlas_atlas_msg_proto_rawDescGZIP() []byte { + file_atlas_atlas_msg_proto_rawDescOnce.Do(func() { + file_atlas_atlas_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_atlas_atlas_msg_proto_rawDescData) + }) + return file_atlas_atlas_msg_proto_rawDescData +} + +var file_atlas_atlas_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_atlas_atlas_msg_proto_goTypes = []interface{}{ + (*AtlasGetListReq)(nil), // 0: AtlasGetListReq + (*AtlasGetListResp)(nil), // 1: AtlasGetListResp + (*AtlasActivateReq)(nil), // 2: AtlasActivateReq + (*AtlasActivateResp)(nil), // 3: AtlasActivateResp + (*AtlasAwardReq)(nil), // 4: AtlasAwardReq + (*AtlasAwardResp)(nil), // 5: AtlasAwardResp + (*TaskAwardReq)(nil), // 6: TaskAwardReq + (*TaskAwardResp)(nil), // 7: TaskAwardResp + (*DBPandaAtlas)(nil), // 8: DBPandaAtlas +} +var file_atlas_atlas_msg_proto_depIdxs = []int32{ + 8, // 0: AtlasGetListResp.data:type_name -> DBPandaAtlas + 8, // 1: AtlasActivateResp.data:type_name -> DBPandaAtlas + 8, // 2: AtlasAwardResp.data:type_name -> DBPandaAtlas + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_atlas_atlas_msg_proto_init() } +func file_atlas_atlas_msg_proto_init() { + if File_atlas_atlas_msg_proto != nil { + return + } + file_atlas_atlas_db_proto_init() + if !protoimpl.UnsafeEnabled { + file_atlas_atlas_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AtlasGetListReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AtlasGetListResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AtlasActivateReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AtlasActivateResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AtlasAwardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AtlasAwardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TaskAwardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_atlas_atlas_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TaskAwardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_atlas_atlas_msg_proto_rawDesc, + NumEnums: 0, + NumMessages: 8, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_atlas_atlas_msg_proto_goTypes, + DependencyIndexes: file_atlas_atlas_msg_proto_depIdxs, + MessageInfos: file_atlas_atlas_msg_proto_msgTypes, + }.Build() + File_atlas_atlas_msg_proto = out.File + file_atlas_atlas_msg_proto_rawDesc = nil + file_atlas_atlas_msg_proto_goTypes = nil + file_atlas_atlas_msg_proto_depIdxs = nil +} From beceeea318dc61fe341e66c47b4e77ac1ca2d1cc Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 23 Feb 2023 16:35:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/api_atlasactivate.go | 2 +- modules/viking/api_challenge.go | 10 +++++++--- modules/viking/api_challengeover.go | 11 ++++++++--- modules/viking/api_getlist.go | 7 ------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go index 154791da5..9d18be003 100644 --- a/modules/smithy/api_atlasactivate.go +++ b/modules/smithy/api_atlasactivate.go @@ -52,7 +52,7 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla } } update := make(map[string]interface{}, 0) - update["atlas"] = v + update["atlas"] = atlas.Atlas atlas.Score += addScore update["score"] = atlas.Score this.module.modelAtlas.modifySmithyAtlasList(session.GetUserId(), update) diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index a301ddfab..8c1f571af 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -51,11 +51,15 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng } } - value, ok := viking.Boss[req.BossId] - if !ok { // 类型校验 + if req.Difficulty == 1 && viking.Boss[req.BossId] == 0 { // 当前难度第一次打 viking.Boss[req.BossId] = 1 } - if value < req.Difficulty { + if value, ok := viking.Boss[req.BossId]; ok { // 类型校验 + if value < req.Difficulty { + code = pb.ErrorCode_HuntingLvErr + return + } + } else { code = pb.ErrorCode_HuntingLvErr return } diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 4332925a5..caaa81eac 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -56,11 +56,16 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal // if code = this.module.CheckRes(session, []*cfg.Gameatn{costRes}); code != pb.ErrorCode_Success { // return // } - value, ok := viking.Boss[req.BossId] - if !ok { // 类型校验 + if req.Difficulty == 1 && viking.Boss[req.BossId] == 0 { viking.Boss[req.BossId] = 1 } - if value < req.Difficulty { + + if value, ok := viking.Boss[req.BossId]; ok { // 类型校验 + if value < req.Difficulty { + code = pb.ErrorCode_HuntingLvErr + return + } + } else { code = pb.ErrorCode_HuntingLvErr return } diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index d4a52250f..25d1f0bb8 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" - "strconv" "go.mongodb.org/mongo-driver/bson/primitive" "google.golang.org/protobuf/proto" @@ -33,12 +32,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq Boss: make(map[int32]int32), BossTime: make(map[string]int32), } - _cfg := this.module.configure.GetVikingBossTypeConfigData() - for k := range _cfg { - list.Boss[k] = 1 - str := strconv.Itoa(int(k)) + "_1" - list.BossTime[str] = 0 - } this.module.modelViking.Add(session.GetUserId(), list) }