上传vue代码

src/pb/proto.js

@@ -486,7 +486,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       TaskActiveNoenough: 1606,
       TaskNoFinished: 1607,
       TaskFinished: 1608,
-      ShopGoodsIsSoldOut: 1700
+      ShopGoodsIsSoldOut: 1700,
+      ShopNoSurplusRefreshNum: 1701
     }
   },
   google: {
@@ -1876,10 +1877,22 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   },
   ShopGetListResp: {
     fields: {
+      sType: {
+        type: "ShopType",
+        id: 1
+      },
+      IsManualRefresh: {
+        type: "bool",
+        id: 2
+      },
       Goods: {
         rule: "repeated",
         type: "ShopItem",
-        id: 1
+        id: 4
+      },
+      SurplusRefreshNum: {
+        type: "int32",
+        id: 5
       }
     }
   },
@@ -1940,6 +1953,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       typeId: {
         type: "int32",
         id: 9
+      },
+      sort: {
+        type: "int32",
+        id: 10
       }
     }
   },
@@ -2372,7 +2389,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
     }
   },
   UserUpdateSettingResp: {
-    fields: {}
+    fields: {
+      uid: {
+        type: "string",
+        id: 1
+      }
+    }
   },
   UserVeriCodeReq: {
     fields: {}
@@ -2394,7 +2416,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
     }
   },
   UserInitdataResp: {
-    fields: {}
+    fields: {
+      uid: {
+        type: "string",
+        id: 1
+      }
+    }
   },
   UserModifynameReq: {
     fields: {
@@ -2428,6 +2455,146 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  UserChangedPush: {
+    fields: {
+      uid: {
+        type: "string",
+        id: 1
+      },
+      exp: {
+        type: "int32",
+        id: 2
+      },
+      lv: {
+        type: "int32",
+        id: 3
+      }
+    }
+  },
+  UserFigureReq: {
+    fields: {
+      preinstall: {
+        type: "int32",
+        id: 1
+      },
+      action: {
+        type: "int32",
+        id: 2
+      },
+      hair: {
+        type: "Hair",
+        id: 3
+      },
+      eyes: {
+        type: "Eyes",
+        id: 4
+      },
+      mouth: {
+        type: "Mouth",
+        id: 5
+      },
+      body: {
+        type: "Body",
+        id: 6
+      },
+      complexion: {
+        type: "Complexion",
+        id: 7
+      }
+    }
+  },
+  UserFigureResp: {
+    fields: {
+      uid: {
+        type: "string",
+        id: 1
+      },
+      action: {
+        type: "int32",
+        id: 2
+      },
+      figure: {
+        type: "Figure",
+        id: 3
+      }
+    }
+  },
+  Hair: {
+    fields: {
+      resId: {
+        type: "int32",
+        id: 1
+      },
+      color: {
+        type: "string",
+        id: 2
+      }
+    }
+  },
+  Eyes: {
+    fields: {
+      resId: {
+        type: "int32",
+        id: 1
+      },
+      color: {
+        type: "string",
+        id: 2
+      }
+    }
+  },
+  Mouth: {
+    fields: {
+      resId: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  Body: {
+    fields: {
+      high: {
+        type: "int32",
+        id: 1
+      },
+      shape: {
+        type: "int32",
+        id: 2
+      }
+    }
+  },
+  Complexion: {
+    fields: {
+      color: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  Figure: {
+    fields: {
+      hair: {
+        type: "Hair",
+        id: 1
+      },
+      eyes: {
+        type: "Eyes",
+        id: 2
+      },
+      mouth: {
+        type: "Mouth",
+        id: 3
+      },
+      body: {
+        type: "Body",
+        id: 4
+      },
+      complexion: {
+        type: "Complexion",
+        id: 5
+      }
+    }
+  },
   DBUserExpand: {
     fields: {
       id: {
@@ -2462,6 +2629,15 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         keyType: "string",
         type: "bool",
         id: 8
+      },
+      curFigure: {
+        type: "int32",
+        id: 9
+      },
+      preinstall: {
+        keyType: "int32",
+        type: "Figure",
+        id: 10
       }
     }
   },

src/pb/proto/chat_msg.proto

@@ -1,17 +1,25 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "chat_db.proto";
+import "chat/chat_db.proto";
 
 //聊天消息推送
-message ChatMessagePush { DBChat chat = 1; }
+message ChatMessagePush{
+    DBChat chat = 1;
+}
 
 //申请跨服频道号
-message ChatCrossChannelReq {}
+message ChatCrossChannelReq {
+
+}
 //申请跨服频道号 回应
-message ChatCrossChannelResp { int32 channelId = 1; }
+message ChatCrossChannelResp {
+    int32 channelId = 1;
+}
 
 //申请切换频道
-message ChatChanageChannelReq { int32 channelId = 1; }
+message ChatChanageChannelReq {
+    int32 channelId = 1;
+}
 //申请切换频道 回应
 message ChatChanageChannelResp {
     int32 channelId = 1;
@@ -23,7 +31,10 @@ message ChatGetListReq {
     ChatChannel channel = 1;    //频道
 }
 //请求聊天消息 回应
-message ChatGetListResp { repeated DBChat chats = 1; }
+message ChatGetListResp {
+    repeated DBChat chats = 1;
+}
+
 
 //请求跨服聊天消息
 message ChatSpanGetListReq {
@@ -31,7 +42,9 @@ message ChatSpanGetListReq {
     int32 channelId = 2;        //跨服频道id
 }
 //请求跨服聊天消息 回应
-message ChatSpanGetListResp { repeated DBChat chats = 1; }
+message ChatSpanGetListResp {
+    repeated DBChat chats = 1;
+}
 
 //消息发送请求
 message ChatSendReq {
@@ -40,7 +53,10 @@ message ChatSendReq {
     string content = 3;         //内容
 }
 //消息发送请求 回应
-message ChatSendResp {}
+message ChatSendResp {
+
+}
+
 
 //跨服消息发送请求
 message ChatSpanSendReq {
@@ -48,4 +64,7 @@ message ChatSpanSendReq {
     string content = 2;         //内容
 }
 //跨服消息发送请求 回应
-message ChatSpanSendResp {}
+message ChatSpanSendResp {
+
+}
+

src/pb/proto/comm.proto

@@ -3,7 +3,7 @@ option go_package = ".;pb";
 import "errorcode.proto";
 import "google/protobuf/any.proto";
 
-//用户消息流结构
+//用户消息流结构1
 message UserMessage {
   string MainType = 1; //用户消息处理 模块名 例如:user 对应项目中 user的模块
   string SubType = 2; //用户消息处理函数名 例如:login  对应项目中 user的模块中

src/pb/proto/equipment_msg.proto

@@ -1,9 +1,11 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "equipment_db.proto";
+import "equipment/equipment_db.proto";
 
 //获取装备列表请求
-message EquipmentGetListReq {}
+message EquipmentGetListReq {
+
+}
 //获取装备列表请求 回应
 message EquipmentGetListResp {
     repeated DB_Equipment Equipments = 1;   //装备列表
@@ -33,6 +35,5 @@ message EquipmentUpgradeReq {
 //装备升级 回应
 message EquipmentUpgradeResp{
     bool IsSucc = 1;
-  repeated DB_Equipment Equipment =
+    repeated DB_Equipment Equipment = 2;             //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
-      2; //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
 }

src/pb/proto/errorcode.proto

@@ -106,4 +106,5 @@ enum ErrorCode {
 
   // shop
   ShopGoodsIsSoldOut = 1700;  //商品已售罄
+  ShopNoSurplusRefreshNum = 1701;  //剩余刷新次数已用完
 }

src/pb/proto/hero_msg.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "hero_db.proto";
+import "hero/hero_db.proto";
 
 //英雄基础信息
 message HeroInfoReq {
@@ -150,4 +150,6 @@ message HeroDrawCardResp {
 }
 
 // 英雄变化推送
-message HeroChangePush { repeated DBHero list = 1; }
+message HeroChangePush{
+  repeated DBHero list = 1;
+}

src/pb/proto/items_msg.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "items_db.proto";
+import "items/items_db.proto";
 
 //查询用户背包请求
 message ItemsGetlistReq {

src/pb/proto/mail_msg.proto

@@ -1,24 +1,38 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "mail_db.proto";
+import "mail/mail_db.proto";
 
-message MailGetListReq {}
+message MailGetListReq {
+
+}
 
 // 查询邮件信息
-message MailGetListResp { repeated DBMailData Mails = 1; }
+message MailGetListResp {
+   repeated DBMailData Mails = 1;
+}
 
 // 查看邮件
-message MailReadMailReq { string ObjID = 1; }
+message MailReadMailReq {
+   string ObjID = 1;
+}
 
-message MailReadMailResp { DBMailData Mail = 1; }
+message MailReadMailResp {
+   DBMailData Mail = 1;
+}
 
 // 领取附件
-message MailGetUserMailAttachmentReq { string ObjID = 1; }
+message MailGetUserMailAttachmentReq {
+   string ObjID = 1;
+}
 
-message MailGetUserMailAttachmentResp { DBMailData Mail = 1; }
+message MailGetUserMailAttachmentResp {
+   DBMailData Mail = 1;
+}
 
 // 删除某个邮件
-message MailDelMailReq { string ObjID = 1; }
+message MailDelMailReq {
+   string ObjID = 1;
+}
 
 message MailDelMailResp {
    string ObjID = 1; // 返回删除邮件id

src/pb/proto/mainline_msg.proto

@@ -1,11 +1,15 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "mainline_db.proto";
+import "mainline/mainline_db.proto";
 
 // 查询关卡进度
-message MainlineGetListReq {}
+message MainlineGetListReq {
+
+}
 // 返回进度信息
-message MainlineGetListResp { repeated DBMainline data = 1; }
+message MainlineGetListResp { 
+    repeated DBMainline data = 1; 
+}
 
 // 领取关卡宝箱
 message MainlineGetRewardReq {
@@ -27,4 +31,6 @@ message MainlineChallengeResp {
 }
 
 // 推送新章节
-message MainlineNewChapterPush { DBMainline data = 1; }
+message MainlineNewChapterPush{
+    DBMainline data = 1; 
+}

src/pb/proto/notify_msg.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "errorcode.proto";
-import "notify_db.proto";
+import "notify/notify_db.proto";
 import "google/protobuf/any.proto";
 
 //统一错误码推送

src/pb/proto/shop_msg.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "shop_db.proto";
+import "shop/shop_db.proto";
 import "comm.proto";
 
+
 //商品对象数据
 message ShopItem {
    int32  GoodsId = 1;                  //商品Id
@@ -20,7 +21,10 @@ message ShopGetListReq {
 
 //获取装备列表请求
 message ShopGetListResp {
-  repeated ShopItem Goods = 1; //商品列表
+    ShopType sType = 1;             //商城类型
+    bool IsManualRefresh = 2;   //是否手动刷新
+    repeated ShopItem Goods = 4;    //商品列表
+    int32 SurplusRefreshNum = 5;    //剩余手动刷新次数
 }
 
 //购买商品 请求

src/pb/proto/task_db.proto

@@ -11,6 +11,7 @@ message DBTask {
   int32 status = 7; //@go_tags(`bson:"status"`)  任务状态 默认0未完成 1已完成
   int32 received = 8; //@go_tags(`bson:"received"`) 领取状态 默认0未领取 1已领取
   int32 typeId = 9; //@go_tags(`bson:"typeId"`)
+  int32 sort = 10;  //@go_tags(`bson:"sort"`)
 }
 
 message DBTaskActive {

src/pb/proto/task_msg.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "task_db.proto";
+import "task/task_db.proto";
 
 //领取
 message TaskReceiveReq {
@@ -46,4 +46,6 @@ message TaskDoStrategyResp {
 }
 
 //任务完成推送
-message TaskFinishedPush { int32 taskId = 1; }
+message TaskFinishedPush {
+  int32 taskId = 1;
+}

src/pb/proto/user_db.proto

@@ -5,8 +5,7 @@ message CacheUser {
   string uid = 1;                       //@go_tags(`json:"uid"`) 用户id
   string SessionId = 2;                 //@go_tags(`json:"sessionId"`) 会话id
   string ServiceTag = 3;                //@go_tags(`json:"serviceTag"`) 所在服务集群 区服id
-  string GatewayServiceId =
+  string GatewayServiceId = 4;          //@go_tags(`json:"gatewayServiceId"`) 所在网关服务id
-      4;         //@go_tags(`json:"gatewayServiceId"`) 所在网关服务id
   string ip = 5;                        //@go_tags(`json:"ip"`) 远程ip
 }
 

src/pb/proto/user_msg.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "errorcode.proto";
-import "user_db.proto";
+import "user/user_db.proto";
 import "comm.proto";
 import "userexpand.proto";
 
@@ -39,7 +39,9 @@ message UserCreateReq {
   string NickName = 1; //昵称
 }
 
-message UserCreateResp { bool IsSucc = 1; }
+message UserCreateResp {
+  bool IsSucc = 1;
+}
 
 //添加用户资源
 message UserAddResReq {
@@ -68,7 +70,7 @@ message UserGetSettingResp {
 
 // 更新用户设置
 message UserUpdateSettingReq { DBUserSetting setting = 1; }
-message UserUpdateSettingResp {}
+message UserUpdateSettingResp { string uid = 1; }
 
 // 初始化验证码
 message UserVeriCodeReq {}
@@ -80,7 +82,7 @@ message UserVeriCodeResp {
 message UserInitdataReq {
   int32 code = 1; //验证码
 }
-message UserInitdataResp {}
+message UserInitdataResp { string uid = 1; }
 
 //修改玩家名字
 message UserModifynameReq {
@@ -91,6 +93,30 @@ message UserModifynameResp {
   uint32 count = 2; //剩余修改次数
 }
 
+// 图鉴
 message UserGetTujianReq {}
-
 message UserGetTujianResp { repeated string heroids = 1; }
+
+//玩家等级经验变化推送
+message UserChangedPush {
+  string uid = 1;
+  int32 exp = 2;
+  int32 lv = 3;
+}
+
+//主角形象
+message UserFigureReq {
+  int32 preinstall = 1;      //预设编号 1-5
+  int32 action = 2;          //部位 1-5 0不修改任何数据
+  Hair hair = 3;             //部位 1
+  Eyes eyes = 4;             //部位 2
+  Mouth mouth = 5;           //部位 3
+  Body body = 6;             //部位 4
+  Complexion complexion = 7; //部位 5
+}
+
+message UserFigureResp {
+  string uid = 1;
+  int32 action = 2; //部位
+  Figure figure = 3;
+}

src/pb/proto/userexpand.proto

@@ -1,6 +1,43 @@
 syntax = "proto3";
 option go_package = ".;pb";
 
+// 发型
+message Hair {
+  int32 resId = 1;  //资源ID
+  string color = 2; //颜色
+}
+
+// 眼睛
+message Eyes {
+  int32 resId = 1;  //资源ID
+  string color = 2; //颜色
+}
+
+// 嘴巴
+message Mouth {
+  string resId = 1; //资源ID
+}
+
+// 身体
+message Body {
+  int32 high = 1;  //身高
+  int32 shape = 2; //体型
+}
+
+// 肤色
+message Complexion {
+  string color = 1; //颜色值
+}
+
+// 形象
+message Figure {
+  Hair hair = 1;
+  Eyes eyes = 2;
+  Mouth mouth = 3;
+  Body body = 4;
+  Complexion complexion = 5;
+}
+
 //用户扩展数据
 message DBUserExpand {
   string id = 1;                      //主键id
@@ -11,4 +48,6 @@ message DBUserExpand {
   int32 chatchannel = 6;              //跨服聊天频道
   int32 modifynameCount = 7;          //修改昵称次数
   map<string, bool> tujian = 8;       // 图鉴
+  int32 curFigure = 9;                //当前形象
+  map<int32, Figure> preinstall = 10; //形象预设
 }