From 5ac2fd6137a0ebcaa4c0625d04b7fa9a862283b0 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 22 Jun 2022 19:28:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8B=B1=E9=9B=84=20=E8=A3=85=E5=A4=87=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mail/db_comp.go | 9 --------- pb/proto/equip_db.proto | 15 +++++++++++++++ pb/proto/hero_db.proto | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 pb/proto/equip_db.proto create mode 100644 pb/proto/hero_db.proto diff --git a/modules/mail/db_comp.go b/modules/mail/db_comp.go index d457209f7..e24175257 100644 --- a/modules/mail/db_comp.go +++ b/modules/mail/db_comp.go @@ -21,15 +21,6 @@ const ( type DB_Comp struct { modules.Model_Comp } -type IMail interface { - Mail_QueryUserMail(uId string) (mail []*pb.DB_MailData, err error) - Mail_InsertUserMail(mail *pb.DB_MailData) (err error) - Mail_ReadOneMail(objId string) (mail *pb.DB_MailData, err error) - Mail_GetMailAttachment(objId string) (itmes []*pb.MailAttachment, err error) - Mail_GetMailAttachmentState(objId string) bool - Mail_UpdateMailAttachmentState(objId string) bool - Mail_DelUserMail(objId string) bool -} func (this *DB_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.Model_Comp.Init(service, module, comp, options) diff --git a/pb/proto/equip_db.proto b/pb/proto/equip_db.proto new file mode 100644 index 000000000..3d353db44 --- /dev/null +++ b/pb/proto/equip_db.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +message DB_EquipData { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; + int32 equipID = 3; // 装备的配置表ID + int32 star = 4; // 装备星级 + int32 quality = 5; // 装备品质 + int32 lv = 6; // 装备等级 + map addProperty = 7; // 装备附加属性 + int32 baodi = 8; // 保底次数 + int32 advance = 9; // 强化次数 + int32 failCount = 10; // 连续强化失败次数 +} \ No newline at end of file diff --git a/pb/proto/hero_db.proto b/pb/proto/hero_db.proto new file mode 100644 index 000000000..5e3ec4490 --- /dev/null +++ b/pb/proto/hero_db.proto @@ -0,0 +1,38 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +enum PropertyType{ + Hp = 0; //血量 + Atk = 1; //攻击 + Def = 2; //防御 + Speed = 3; //速度 + Crit = 4; //暴击 +} + +message SkillData{ + int32 skillID = 1; + int8 skillLv = 2; +} +message DB_HeroData { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; + int32 heroID = 3; // 英雄的配置表ID + int8 star = 4; // 英雄星级 + int8 lv = 5; // 英雄等级 + int32 exp = 6; // 英雄经验 + int8 juexingLv = 7; // 觉醒等级 + int32 captainSkill = 8; // 队长技能 + repeated SkillData normalSkill = 9; // 普通技能 + map property = 10; // 属性相关 + map addProperty = 11; // 附加属性相关 + int8 formation = 12; // 阵型类型 + int8 cardType = 13; // 卡片类型(升星卡、经验卡、技能升级卡) + int32 curSkin = 14; // 当前装备的皮肤ID + repeated int32 skins = 15; // 所有皮肤ID + bool block = 16;// 锁定 + repeated string equipID = 17; // 装备 objID + int8 resonateNum = 18; // 共鸣次数 + int16 distributionResonate = 19; // 分配的共鸣能量 + map energy = 20; // 能量分配到哪里 + int16 count = 21; // 数量 +} \ No newline at end of file From 3f4fec35fa9e91de136af9b3f30e2f1307f6ceff Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 22 Jun 2022 19:31:18 +0800 Subject: [PATCH 2/3] update --- probuf转go.cmd | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 probuf转go.cmd diff --git a/probuf转go.cmd b/probuf转go.cmd new file mode 100644 index 000000000..5848191d7 --- /dev/null +++ b/probuf转go.cmd @@ -0,0 +1,3 @@ +@echo off +pb2go.exe +pause \ No newline at end of file From 8e5090d112dfc9141bb9f8b2c32b08ddd79862f8 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 23 Jun 2022 12:07:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E6=95=B4=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/proto/hero_db.proto | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pb/proto/hero_db.proto b/pb/proto/hero_db.proto index 5e3ec4490..55ffe791e 100644 --- a/pb/proto/hero_db.proto +++ b/pb/proto/hero_db.proto @@ -11,28 +11,28 @@ enum PropertyType{ message SkillData{ int32 skillID = 1; - int8 skillLv = 2; + sint32 skillLv = 2; } message DB_HeroData { string id = 1; //@go_tags(`bson:"_id"`) ID string uid = 2; int32 heroID = 3; // 英雄的配置表ID - int8 star = 4; // 英雄星级 - int8 lv = 5; // 英雄等级 + sint32 star = 4; // 英雄星级 + sint32 lv = 5; // 英雄等级 int32 exp = 6; // 英雄经验 - int8 juexingLv = 7; // 觉醒等级 + sint32 juexingLv = 7; // 觉醒等级 int32 captainSkill = 8; // 队长技能 repeated SkillData normalSkill = 9; // 普通技能 - map property = 10; // 属性相关 - map addProperty = 11; // 附加属性相关 - int8 formation = 12; // 阵型类型 - int8 cardType = 13; // 卡片类型(升星卡、经验卡、技能升级卡) + map property = 10; // 属性相关 + map addProperty = 11; // 附加属性相关 + sint32 formation = 12; // 阵型类型 + sint32 cardType = 13; // 卡片类型(升星卡、经验卡、技能升级卡) int32 curSkin = 14; // 当前装备的皮肤ID repeated int32 skins = 15; // 所有皮肤ID bool block = 16;// 锁定 repeated string equipID = 17; // 装备 objID - int8 resonateNum = 18; // 共鸣次数 - int16 distributionResonate = 19; // 分配的共鸣能量 - map energy = 20; // 能量分配到哪里 - int16 count = 21; // 数量 + sint32 resonateNum = 18; // 共鸣次数 + sint32 distributionResonate = 19; // 分配的共鸣能量 + map energy = 20; // 能量分配到哪里 + sint32 count = 21; // 数量 } \ No newline at end of file