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

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)

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<int32, int32> addProperty = 7; // 装备附加属性   
+  int32 baodi                   = 8; // 保底次数
+  int32 advance                 = 9; // 强化次数
+  int32 failCount               = 10; // 连续强化失败次数
+}

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;
+  sint32 skillLv = 2;
+}
+message DB_HeroData {
+  string id                   = 1; //@go_tags(`bson:"_id"`) ID
+  string uid                  = 2;
+  int32 heroID                = 3; // 英雄的配置表ID
+  sint32 star                   = 4; // 英雄星级
+  sint32 lv                     = 5; // 英雄等级
+  int32 exp                   = 6; // 英雄经验
+  sint32 juexingLv              = 7; // 觉醒等级
+  int32 captainSkill          = 8; // 队长技能
+  repeated SkillData normalSkill  = 9; // 普通技能
+  map<sint32, int32>  property = 10; // 属性相关
+  map<sint32, int32> 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
+  sint32 resonateNum            = 18; // 共鸣次数
+  sint32 distributionResonate  = 19; // 分配的共鸣能量
+  map<sint32, int32> energy  = 20; // 能量分配到哪里
+  sint32 count                      = 21; // 数量
+}

probuf转go.cmd

@@ -0,0 +1,3 @@
+@echo off
+pb2go.exe
+pause