形象配置

This commit is contained in:
zhaocy 2022-07-25 17:53:01 +08:00
parent 4b2873db8e
commit b1e30b250b
24 changed files with 3024 additions and 382 deletions

View File

@ -2958,5 +2958,9 @@
{
"key": "mainline_name_10070",
"text_cn": "Chapter 70"
},
{
"key": "mainline_name_10071",
"text_cn": "故事发生在很久以前的古代中国,而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
}
]

View File

@ -2958,5 +2958,9 @@
{
"key": "mainline_name_10070",
"text_en": ""
},
{
"key": "mainline_name_10071",
"text_en": ""
}
]

View File

@ -2958,5 +2958,9 @@
{
"key": "mainline_name_10070",
"text_tw": ""
},
{
"key": "mainline_name_10071",
"text_tw": ""
}
]

332
bin/json/game_facemod.json Normal file
View File

@ -0,0 +1,332 @@
[
{
"id": 1001,
"suitintr": "预设1",
"figure": [
{
"id": 1,
"key": "hair",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 2,
"key": "eye",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 3,
"key": "mouth",
"color": "",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 4,
"key": "height",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 5,
"key": "size",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 6,
"key": "color",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
}
]
},
{
"id": 1002,
"suitintr": "预设2",
"figure": [
{
"id": 1,
"key": "hair",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 2,
"key": "eye",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 3,
"key": "mouth",
"color": "",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 4,
"key": "height",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 5,
"key": "size",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 6,
"key": "color",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
}
]
},
{
"id": 1003,
"suitintr": "预设3",
"figure": [
{
"id": 1,
"key": "hair",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 2,
"key": "eye",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 3,
"key": "mouth",
"color": "",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 4,
"key": "height",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 5,
"key": "size",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 6,
"key": "color",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
}
]
},
{
"id": 1004,
"suitintr": "预设4",
"figure": [
{
"id": 1,
"key": "hair",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 2,
"key": "eye",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 3,
"key": "mouth",
"color": "",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 4,
"key": "height",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 5,
"key": "size",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 6,
"key": "color",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
}
]
},
{
"id": 1005,
"suitintr": "预设5",
"figure": [
{
"id": 1,
"key": "hair",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 2,
"key": "eye",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 3,
"key": "mouth",
"color": "",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": "face_icon_01"
},
{
"id": 4,
"key": "height",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 5,
"key": "size",
"color": "",
"val": 5,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
},
{
"id": 6,
"key": "color",
"color": "#fffff",
"val": 0,
"positon_x": 0,
"positon_y": 0,
"positon_z": 0,
"icon": ""
}
]
}
]

View File

@ -3,7 +3,7 @@
"key": 1,
"id": "25001",
"star": 4,
"needhero": "25001",
"needhero": 25001,
"needherostar": 4,
"needheronum": 1,
"needrace": [
@ -17,7 +17,7 @@
"key": 2,
"id": "25001",
"star": 5,
"needhero": "25001",
"needhero": 25001,
"needherostar": 5,
"needheronum": 1,
"needrace": [
@ -31,7 +31,7 @@
"key": 3,
"id": "25001",
"star": 6,
"needhero": "",
"needhero": 0,
"needherostar": 0,
"needheronum": 0,
"needrace": [],
@ -43,7 +43,7 @@
"key": 4,
"id": "25002",
"star": 5,
"needhero": "25002",
"needhero": 25002,
"needherostar": 5,
"needheronum": 1,
"needrace": [
@ -57,7 +57,7 @@
"key": 5,
"id": "25002",
"star": 6,
"needhero": "",
"needhero": 0,
"needherostar": 0,
"needheronum": 0,
"needrace": [],
@ -69,7 +69,7 @@
"key": 6,
"id": "25003",
"star": 5,
"needhero": "25003",
"needhero": 25003,
"needherostar": 5,
"needheronum": 1,
"needrace": [
@ -83,7 +83,7 @@
"key": 7,
"id": "25003",
"star": 6,
"needhero": "",
"needhero": 0,
"needherostar": 0,
"needheronum": 0,
"needrace": [],
@ -95,7 +95,7 @@
"key": 8,
"id": "15004",
"star": 5,
"needhero": "15004",
"needhero": 15004,
"needherostar": 5,
"needheronum": 1,
"needrace": [
@ -109,7 +109,7 @@
"key": 9,
"id": "15004",
"star": 6,
"needhero": "",
"needhero": 0,
"needherostar": 0,
"needheronum": 0,
"needrace": [],
@ -121,7 +121,7 @@
"key": 10,
"id": "43901",
"star": 3,
"needhero": "43901",
"needhero": 43901,
"needherostar": 3,
"needheronum": 1,
"needrace": [
@ -138,7 +138,7 @@
"key": 11,
"id": "43901",
"star": 4,
"needhero": "43901",
"needhero": 43901,
"needherostar": 4,
"needheronum": 1,
"needrace": [
@ -155,7 +155,7 @@
"key": 12,
"id": "43901",
"star": 5,
"needhero": "43901",
"needhero": 43901,
"needherostar": 5,
"needheronum": 1,
"needrace": [
@ -172,7 +172,7 @@
"key": 13,
"id": "43901",
"star": 6,
"needhero": "",
"needhero": 0,
"needherostar": 0,
"needheronum": 0,
"needrace": [],

File diff suppressed because it is too large Load Diff

View File

@ -410,7 +410,7 @@
"active": 0,
"id_after": 0,
"jump_interface": "mainworld",
"icon": "wp_icon_0001",
"icon": "rw_cj_icon01",
"reword": [
{
"a": "attr",
@ -430,7 +430,7 @@
"active": 0,
"id_after": 30102,
"jump_interface": "mainworld",
"icon": "rw_cj_icon04",
"icon": "rw_cj_icon02",
"reword": [
{
"a": "attr",
@ -450,7 +450,7 @@
"active": 0,
"id_after": 30103,
"jump_interface": "mainworld",
"icon": "rw_cj_icon05",
"icon": "rw_cj_icon09",
"reword": [
{
"a": "attr",
@ -470,7 +470,7 @@
"active": 0,
"id_after": 30104,
"jump_interface": "mainworld",
"icon": "rw_cj_icon06",
"icon": "rw_cj_icon10",
"reword": [
{
"a": "attr",
@ -490,7 +490,7 @@
"active": 0,
"id_after": 30105,
"jump_interface": "mainworld",
"icon": "rw_cj_icon07",
"icon": "rw_cj_icon11",
"reword": [
{
"a": "attr",
@ -510,7 +510,7 @@
"active": 0,
"id_after": 30106,
"jump_interface": "mainworld",
"icon": "rw_cj_icon08",
"icon": "rw_cj_icon12",
"reword": [
{
"a": "attr",
@ -530,7 +530,7 @@
"active": 0,
"id_after": 30107,
"jump_interface": "mainworld",
"icon": "rw_cj_icon09",
"icon": "rw_cj_icon13",
"reword": [
{
"a": "attr",
@ -550,7 +550,7 @@
"active": 0,
"id_after": 30108,
"jump_interface": "mainworld",
"icon": "rw_cj_icon10",
"icon": "rw_cj_icon14",
"reword": [
{
"a": "attr",
@ -570,7 +570,7 @@
"active": 0,
"id_after": 30109,
"jump_interface": "mainworld",
"icon": "rw_cj_icon11",
"icon": "rw_cj_icon15",
"reword": [
{
"a": "attr",
@ -590,7 +590,7 @@
"active": 0,
"id_after": 30110,
"jump_interface": "mainworld",
"icon": "rw_cj_icon12",
"icon": "rw_cj_icon16",
"reword": [
{
"a": "attr",
@ -610,7 +610,7 @@
"active": 0,
"id_after": 30111,
"jump_interface": "mainworld",
"icon": "rw_cj_icon13",
"icon": "rw_cj_icon17",
"reword": [
{
"a": "attr",
@ -630,7 +630,7 @@
"active": 0,
"id_after": 30112,
"jump_interface": "mainworld",
"icon": "rw_cj_icon14",
"icon": "rw_cj_icon18",
"reword": [
{
"a": "attr",
@ -650,7 +650,7 @@
"active": 0,
"id_after": 30113,
"jump_interface": "mainworld",
"icon": "rw_cj_icon15",
"icon": "rw_cj_icon01",
"reword": [
{
"a": "attr",
@ -670,7 +670,7 @@
"active": 0,
"id_after": 30114,
"jump_interface": "mainworld",
"icon": "rw_cj_icon16",
"icon": "rw_cj_icon02",
"reword": [
{
"a": "attr",
@ -690,7 +690,7 @@
"active": 0,
"id_after": 30115,
"jump_interface": "mainworld",
"icon": "rw_cj_icon17",
"icon": "rw_cj_icon09",
"reword": [
{
"a": "attr",
@ -710,7 +710,7 @@
"active": 0,
"id_after": 30116,
"jump_interface": "mainworld",
"icon": "rw_cj_icon18",
"icon": "rw_cj_icon10",
"reword": [
{
"a": "attr",
@ -730,7 +730,7 @@
"active": 0,
"id_after": 30117,
"jump_interface": "mainworld",
"icon": "rw_cj_icon01",
"icon": "rw_cj_icon11",
"reword": [
{
"a": "attr",
@ -750,7 +750,7 @@
"active": 0,
"id_after": 30118,
"jump_interface": "mainworld",
"icon": "rw_cj_icon02",
"icon": "rw_cj_icon12",
"reword": [
{
"a": "attr",
@ -770,7 +770,7 @@
"active": 0,
"id_after": 30119,
"jump_interface": "mainworld",
"icon": "rw_cj_icon03",
"icon": "rw_cj_icon13",
"reword": [
{
"a": "attr",
@ -790,7 +790,7 @@
"active": 0,
"id_after": 0,
"jump_interface": "mainworld",
"icon": "rw_cj_icon04",
"icon": "rw_cj_icon14",
"reword": [
{
"a": "attr",
@ -810,7 +810,7 @@
"active": 0,
"id_after": 0,
"jump_interface": "mainworld",
"icon": "rw_cj_icon05",
"icon": "rw_cj_icon15",
"reword": [
{
"a": "attr",
@ -830,7 +830,7 @@
"active": 0,
"id_after": 0,
"jump_interface": "mainworld",
"icon": "rw_cj_icon06",
"icon": "rw_cj_icon16",
"reword": [
{
"a": "attr",
@ -850,7 +850,7 @@
"active": 0,
"id_after": 0,
"jump_interface": "mainworld",
"icon": "rw_cj_icon07",
"icon": "rw_cj_icon17",
"reword": [
{
"a": "attr",

View File

@ -53,7 +53,7 @@ var (
mainType: string(comm.ModuleHero),
subType: hero.HeroSubTypeChouka,
req: &pb.HeroChoukaReq{
HeroIds: []int32{14001, 14002, 14003, 14004, 14005, 14006, 14007},
HeroIds: []string{"14001"},
},
rsp: &pb.HeroChoukaResp{},
// enabled: true,

View File

@ -13,6 +13,7 @@ const (
game_global = "game_global.json" //全局配置表
game_initial = "game_initial.json" //初始化表
game_playerlv = "game_playerlv.json" //玩家等级
// 形象配置表
)
///配置管理基础组件
@ -106,6 +107,7 @@ func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.Game_playerlvData
return
}
// 玩家等级经验配置表
func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.Game_playerlvData) {
if v, err := this.GetConfigure(game_playerlv); err != nil {
return
@ -121,3 +123,4 @@ func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.Game_playerlvDa
}
return
}

View File

@ -20,6 +20,7 @@ const (
UserGetTujianResp = "gettujian" //获取图鉴信息
UserSubTypeLvChangedPush = "lvChangedPush" //等级变化推送
UserSubTypeModifyName = "modifyname" //修改名称
UserSubTypeFigure = "figure" //形象
)
type apiComp struct {

View File

@ -0,0 +1,94 @@
package user
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"go_dreamfactory/utils"
"google.golang.org/protobuf/proto"
)
// 主角形象设置
func (this *apiComp) FigureCheck(session comm.IUserSession, req *pb.UserFigureReq) (code pb.ErrorCode) {
if req.Preinstall < 1 || req.Preinstall > 5 || req.Action < 0 ||
req.Hair == nil || req.Eyes == nil || req.Mouth == nil || req.Body == nil || req.Complexion == nil {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (this *apiComp) Figure(session comm.IUserSession, req *pb.UserFigureReq) (code pb.ErrorCode, data proto.Message) {
if code = this.FigureCheck(session, req); code != pb.ErrorCode_Success {
return
}
expand, err := this.module.modelUser.GetUserExpand(session.GetUserId())
if err != nil {
code = pb.ErrorCode_DBError
return
}
//当前形象
var curFigure *pb.Figure
if v, ok := expand.Preinstall[req.Preinstall]; ok {
curFigure = v
} else {
//TODO 设置默认形象
curFigure = &pb.Figure{}
return
}
rsp := &pb.UserFigureResp{
Uid: session.GetUserId(),
Action: req.Action,
}
if req.Action == 0 {
//直接返回预设形象
rsp.Figure = curFigure
} else {
update := make(map[string]interface{})
switch req.Action {
// 头发
case 1:
if req.Hair != nil {
curFigure.Hair = req.Hair
}
// 眼睛
case 2:
if req.Eyes != nil {
curFigure.Eyes = req.Eyes
}
// 嘴巴
case 3:
if req.Mouth != nil {
curFigure.Mouth = req.Mouth
}
// 体型
case 4:
if req.Body != nil {
curFigure.Body = req.Body
}
// 肤色
case 5:
if req.Complexion != nil {
curFigure.Complexion = req.Complexion
}
default:
code = pb.ErrorCode_ReqParameterError
return
}
update = utils.StructToMap(curFigure)
this.module.modelUser.ChanageUserExpand(session.GetUserId(), update)
}
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeFigure, rsp); err != nil {
code = pb.ErrorCode_SystemError
return
}
return
}

View File

@ -20,7 +20,9 @@ func (this *apiComp) Initdata(session comm.IUserSession, req *pb.UserInitdataReq
return
}
rsp := &pb.UserInitdataResp{}
rsp := &pb.UserInitdataResp{
Uid: session.GetUserId(),
}
defer func() {
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeInitData, rsp); err != nil {

View File

@ -133,6 +133,8 @@ func (this *ModelUser) modifyName(uid string, newName string) (code pb.ErrorCode
return
}
// 默认
// change exp
func (this *ModelUser) ChangeExp(event interface{}, next func(event interface{})) {
ul := event.(*UserListen)

View File

@ -70,7 +70,7 @@ message UserGetSettingResp {
//
message UserUpdateSettingReq { DBUserSetting setting = 1; }
message UserUpdateSettingResp {}
message UserUpdateSettingResp { string uid = 1; }
//
message UserVeriCodeReq {}
@ -82,7 +82,7 @@ message UserVeriCodeResp {
message UserInitdataReq {
int32 code = 1; //
}
message UserInitdataResp {}
message UserInitdataResp { string uid = 1; }
//
message UserModifynameReq {
@ -102,4 +102,21 @@ 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;
}

View File

@ -1,14 +1,53 @@
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
string uid = 2; //id
int64 lastreadnotiftime = 3; //
int64 lastInitdataTime = 4; //
uint32 initdataCount = 5; //
int32 chatchannel = 6; //
int32 modifynameCount = 7; //
map<string,bool> tujian = 8; //
string id = 1; //id
string uid = 2; //id
int64 lastreadnotiftime = 3; //
int64 lastInitdataTime = 4; //
uint32 initdataCount = 5; //
int32 chatchannel = 6; //
int32 modifynameCount = 7; //
map<string, bool> tujian = 8; //
int32 curFigure = 9; //
map<int32, Figure> preinstall = 10; //
}

View File

@ -774,6 +774,8 @@ type UserUpdateSettingResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
}
func (x *UserUpdateSettingResp) Reset() {
@ -808,6 +810,13 @@ func (*UserUpdateSettingResp) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{15}
}
func (x *UserUpdateSettingResp) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
// 初始化验证码
type UserVeriCodeReq struct {
state protoimpl.MessageState
@ -946,6 +955,8 @@ type UserInitdataResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
}
func (x *UserInitdataResp) Reset() {
@ -980,6 +991,13 @@ func (*UserInitdataResp) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{19}
}
func (x *UserInitdataResp) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
//修改玩家名字
type UserModifynameReq struct {
state protoimpl.MessageState
@ -1233,6 +1251,165 @@ func (x *UserChangedPush) GetLv() int32 {
return 0
}
//主角形象
type UserFigureReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Preinstall int32 `protobuf:"varint,1,opt,name=preinstall,proto3" json:"preinstall"` //预设编号 1-5
Action int32 `protobuf:"varint,2,opt,name=action,proto3" json:"action"` //部位 1-5 0不修改任何数据
Hair *Hair `protobuf:"bytes,3,opt,name=hair,proto3" json:"hair"` //部位 1
Eyes *Eyes `protobuf:"bytes,4,opt,name=eyes,proto3" json:"eyes"` //部位 2
Mouth *Mouth `protobuf:"bytes,5,opt,name=mouth,proto3" json:"mouth"` //部位 3
Body *Body `protobuf:"bytes,6,opt,name=body,proto3" json:"body"` //部位 4
Complexion *Complexion `protobuf:"bytes,7,opt,name=complexion,proto3" json:"complexion"` //部位 5
}
func (x *UserFigureReq) Reset() {
*x = UserFigureReq{}
if protoimpl.UnsafeEnabled {
mi := &file_user_user_msg_proto_msgTypes[25]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *UserFigureReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*UserFigureReq) ProtoMessage() {}
func (x *UserFigureReq) ProtoReflect() protoreflect.Message {
mi := &file_user_user_msg_proto_msgTypes[25]
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 UserFigureReq.ProtoReflect.Descriptor instead.
func (*UserFigureReq) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{25}
}
func (x *UserFigureReq) GetPreinstall() int32 {
if x != nil {
return x.Preinstall
}
return 0
}
func (x *UserFigureReq) GetAction() int32 {
if x != nil {
return x.Action
}
return 0
}
func (x *UserFigureReq) GetHair() *Hair {
if x != nil {
return x.Hair
}
return nil
}
func (x *UserFigureReq) GetEyes() *Eyes {
if x != nil {
return x.Eyes
}
return nil
}
func (x *UserFigureReq) GetMouth() *Mouth {
if x != nil {
return x.Mouth
}
return nil
}
func (x *UserFigureReq) GetBody() *Body {
if x != nil {
return x.Body
}
return nil
}
func (x *UserFigureReq) GetComplexion() *Complexion {
if x != nil {
return x.Complexion
}
return nil
}
type UserFigureResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
Action int32 `protobuf:"varint,2,opt,name=action,proto3" json:"action"` //部位
Figure *Figure `protobuf:"bytes,3,opt,name=figure,proto3" json:"figure"`
}
func (x *UserFigureResp) Reset() {
*x = UserFigureResp{}
if protoimpl.UnsafeEnabled {
mi := &file_user_user_msg_proto_msgTypes[26]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *UserFigureResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*UserFigureResp) ProtoMessage() {}
func (x *UserFigureResp) ProtoReflect() protoreflect.Message {
mi := &file_user_user_msg_proto_msgTypes[26]
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 UserFigureResp.ProtoReflect.Descriptor instead.
func (*UserFigureResp) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{26}
}
func (x *UserFigureResp) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
func (x *UserFigureResp) GetAction() int32 {
if x != nil {
return x.Action
}
return 0
}
func (x *UserFigureResp) GetFigure() *Figure {
if x != nil {
return x.Figure
}
return nil
}
var File_user_user_msg_proto protoreflect.FileDescriptor
var file_user_user_msg_proto_rawDesc = []byte{
@ -1292,32 +1469,54 @@ var file_user_user_msg_proto_rawDesc = []byte{
0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a,
0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07,
0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x17, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55,
0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55,
0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70,
0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65,
0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43,
0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55,
0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12,
0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f,
0x64, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61,
0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f,
0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e,
0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
0x3c, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d,
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x12, 0x0a,
0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65,
0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69,
0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64,
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73,
0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50,
0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20,
0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f,
0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72,
0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a,
0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71,
0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74,
0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73,
0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12,
0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66,
0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63,
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
0x74, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69,
0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74,
0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65,
0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72,
0x6f, 0x69, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e,
0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0xe3, 0x01, 0x0a, 0x0d,
0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a,
0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x0a,
0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61,
0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52, 0x04, 0x68, 0x61, 0x69, 0x72,
0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05,
0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x05, 0x6d,
0x6f, 0x75, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x4d, 0x6f, 0x75,
0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x04, 0x62, 0x6f, 0x64,
0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04,
0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69,
0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f,
0x6e, 0x22, 0x5b, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52,
0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a,
0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e,
0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -1332,7 +1531,7 @@ func file_user_user_msg_proto_rawDescGZIP() []byte {
return file_user_user_msg_proto_rawDescData
}
var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
var file_user_user_msg_proto_goTypes = []interface{}{
(*UserLoginReq)(nil), // 0: UserLoginReq
(*UserLoginResp)(nil), // 1: UserLoginResp
@ -1359,27 +1558,41 @@ var file_user_user_msg_proto_goTypes = []interface{}{
(*UserGetTujianReq)(nil), // 22: UserGetTujianReq
(*UserGetTujianResp)(nil), // 23: UserGetTujianResp
(*UserChangedPush)(nil), // 24: UserChangedPush
(*DBUser)(nil), // 25: DBUser
(*DBUserExpand)(nil), // 26: DBUserExpand
(ErrorCode)(0), // 27: ErrorCode
(*CacheUser)(nil), // 28: CacheUser
(*UserAssets)(nil), // 29: UserAssets
(*DBUserSetting)(nil), // 30: DBUserSetting
(*UserFigureReq)(nil), // 25: UserFigureReq
(*UserFigureResp)(nil), // 26: UserFigureResp
(*DBUser)(nil), // 27: DBUser
(*DBUserExpand)(nil), // 28: DBUserExpand
(ErrorCode)(0), // 29: ErrorCode
(*CacheUser)(nil), // 30: CacheUser
(*UserAssets)(nil), // 31: UserAssets
(*DBUserSetting)(nil), // 32: DBUserSetting
(*Hair)(nil), // 33: Hair
(*Eyes)(nil), // 34: Eyes
(*Mouth)(nil), // 35: Mouth
(*Body)(nil), // 36: Body
(*Complexion)(nil), // 37: Complexion
(*Figure)(nil), // 38: Figure
}
var file_user_user_msg_proto_depIdxs = []int32{
25, // 0: UserLoginResp.data:type_name -> DBUser
26, // 1: UserLoginResp.ex:type_name -> DBUserExpand
27, // 2: UserRegisterResp.Code:type_name -> ErrorCode
28, // 3: UserLoadResp.data:type_name -> CacheUser
29, // 4: UserAddResReq.res:type_name -> UserAssets
29, // 5: UserAddResResp.res:type_name -> UserAssets
30, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
30, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
8, // [8:8] is the sub-list for method output_type
8, // [8:8] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension type_name
8, // [8:8] is the sub-list for extension extendee
0, // [0:8] is the sub-list for field type_name
27, // 0: UserLoginResp.data:type_name -> DBUser
28, // 1: UserLoginResp.ex:type_name -> DBUserExpand
29, // 2: UserRegisterResp.Code:type_name -> ErrorCode
30, // 3: UserLoadResp.data:type_name -> CacheUser
31, // 4: UserAddResReq.res:type_name -> UserAssets
31, // 5: UserAddResResp.res:type_name -> UserAssets
32, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
32, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
33, // 8: UserFigureReq.hair:type_name -> Hair
34, // 9: UserFigureReq.eyes:type_name -> Eyes
35, // 10: UserFigureReq.mouth:type_name -> Mouth
36, // 11: UserFigureReq.body:type_name -> Body
37, // 12: UserFigureReq.complexion:type_name -> Complexion
38, // 13: UserFigureResp.figure:type_name -> Figure
14, // [14:14] is the sub-list for method output_type
14, // [14:14] is the sub-list for method input_type
14, // [14:14] is the sub-list for extension type_name
14, // [14:14] is the sub-list for extension extendee
0, // [0:14] is the sub-list for field type_name
}
func init() { file_user_user_msg_proto_init() }
@ -1692,6 +1905,30 @@ func file_user_user_msg_proto_init() {
return nil
}
}
file_user_user_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UserFigureReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_user_user_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UserFigureResp); 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{
@ -1699,7 +1936,7 @@ func file_user_user_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_user_user_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 25,
NumMessages: 27,
NumExtensions: 0,
NumServices: 0,
},

View File

@ -20,26 +20,372 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
// 发型
type Hair struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
ResId int32 `protobuf:"varint,1,opt,name=resId,proto3" json:"resId"` //资源ID
Color string `protobuf:"bytes,2,opt,name=color,proto3" json:"color"` //颜色
}
func (x *Hair) Reset() {
*x = Hair{}
if protoimpl.UnsafeEnabled {
mi := &file_userexpand_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Hair) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Hair) ProtoMessage() {}
func (x *Hair) ProtoReflect() protoreflect.Message {
mi := &file_userexpand_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 Hair.ProtoReflect.Descriptor instead.
func (*Hair) Descriptor() ([]byte, []int) {
return file_userexpand_proto_rawDescGZIP(), []int{0}
}
func (x *Hair) GetResId() int32 {
if x != nil {
return x.ResId
}
return 0
}
func (x *Hair) GetColor() string {
if x != nil {
return x.Color
}
return ""
}
// 眼睛
type Eyes struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
ResId int32 `protobuf:"varint,1,opt,name=resId,proto3" json:"resId"` //资源ID
Color string `protobuf:"bytes,2,opt,name=color,proto3" json:"color"` //颜色
}
func (x *Eyes) Reset() {
*x = Eyes{}
if protoimpl.UnsafeEnabled {
mi := &file_userexpand_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Eyes) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Eyes) ProtoMessage() {}
func (x *Eyes) ProtoReflect() protoreflect.Message {
mi := &file_userexpand_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 Eyes.ProtoReflect.Descriptor instead.
func (*Eyes) Descriptor() ([]byte, []int) {
return file_userexpand_proto_rawDescGZIP(), []int{1}
}
func (x *Eyes) GetResId() int32 {
if x != nil {
return x.ResId
}
return 0
}
func (x *Eyes) GetColor() string {
if x != nil {
return x.Color
}
return ""
}
// 嘴巴
type Mouth struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
ResId string `protobuf:"bytes,1,opt,name=resId,proto3" json:"resId"` //资源ID
}
func (x *Mouth) Reset() {
*x = Mouth{}
if protoimpl.UnsafeEnabled {
mi := &file_userexpand_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Mouth) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Mouth) ProtoMessage() {}
func (x *Mouth) ProtoReflect() protoreflect.Message {
mi := &file_userexpand_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 Mouth.ProtoReflect.Descriptor instead.
func (*Mouth) Descriptor() ([]byte, []int) {
return file_userexpand_proto_rawDescGZIP(), []int{2}
}
func (x *Mouth) GetResId() string {
if x != nil {
return x.ResId
}
return ""
}
// 身体
type Body struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
High int32 `protobuf:"varint,1,opt,name=high,proto3" json:"high"` //身高
Shape int32 `protobuf:"varint,2,opt,name=shape,proto3" json:"shape"` //体型
}
func (x *Body) Reset() {
*x = Body{}
if protoimpl.UnsafeEnabled {
mi := &file_userexpand_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Body) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Body) ProtoMessage() {}
func (x *Body) ProtoReflect() protoreflect.Message {
mi := &file_userexpand_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 Body.ProtoReflect.Descriptor instead.
func (*Body) Descriptor() ([]byte, []int) {
return file_userexpand_proto_rawDescGZIP(), []int{3}
}
func (x *Body) GetHigh() int32 {
if x != nil {
return x.High
}
return 0
}
func (x *Body) GetShape() int32 {
if x != nil {
return x.Shape
}
return 0
}
// 肤色
type Complexion struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Color string `protobuf:"bytes,1,opt,name=color,proto3" json:"color"` //颜色值
}
func (x *Complexion) Reset() {
*x = Complexion{}
if protoimpl.UnsafeEnabled {
mi := &file_userexpand_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Complexion) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Complexion) ProtoMessage() {}
func (x *Complexion) ProtoReflect() protoreflect.Message {
mi := &file_userexpand_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 Complexion.ProtoReflect.Descriptor instead.
func (*Complexion) Descriptor() ([]byte, []int) {
return file_userexpand_proto_rawDescGZIP(), []int{4}
}
func (x *Complexion) GetColor() string {
if x != nil {
return x.Color
}
return ""
}
// 形象
type Figure struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Hair *Hair `protobuf:"bytes,1,opt,name=hair,proto3" json:"hair"`
Eyes *Eyes `protobuf:"bytes,2,opt,name=eyes,proto3" json:"eyes"`
Mouth *Mouth `protobuf:"bytes,3,opt,name=mouth,proto3" json:"mouth"`
Body *Body `protobuf:"bytes,4,opt,name=body,proto3" json:"body"`
Complexion *Complexion `protobuf:"bytes,5,opt,name=complexion,proto3" json:"complexion"`
}
func (x *Figure) Reset() {
*x = Figure{}
if protoimpl.UnsafeEnabled {
mi := &file_userexpand_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Figure) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Figure) ProtoMessage() {}
func (x *Figure) ProtoReflect() protoreflect.Message {
mi := &file_userexpand_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 Figure.ProtoReflect.Descriptor instead.
func (*Figure) Descriptor() ([]byte, []int) {
return file_userexpand_proto_rawDescGZIP(), []int{5}
}
func (x *Figure) GetHair() *Hair {
if x != nil {
return x.Hair
}
return nil
}
func (x *Figure) GetEyes() *Eyes {
if x != nil {
return x.Eyes
}
return nil
}
func (x *Figure) GetMouth() *Mouth {
if x != nil {
return x.Mouth
}
return nil
}
func (x *Figure) GetBody() *Body {
if x != nil {
return x.Body
}
return nil
}
func (x *Figure) GetComplexion() *Complexion {
if x != nil {
return x.Complexion
}
return nil
}
//用户扩展数据
type DBUserExpand struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id
Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间
LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间
InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数
Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道
ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数
Tujian map[string]bool `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 图鉴
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id
Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间
LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间
InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数
Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道
ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数
Tujian map[string]bool `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 图鉴
CurFigure int32 `protobuf:"varint,9,opt,name=curFigure,proto3" json:"curFigure"` //当前形象
Preinstall map[int32]*Figure `protobuf:"bytes,10,rep,name=preinstall,proto3" json:"preinstall" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //形象预设
}
func (x *DBUserExpand) Reset() {
*x = DBUserExpand{}
if protoimpl.UnsafeEnabled {
mi := &file_userexpand_proto_msgTypes[0]
mi := &file_userexpand_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -52,7 +398,7 @@ func (x *DBUserExpand) String() string {
func (*DBUserExpand) ProtoMessage() {}
func (x *DBUserExpand) ProtoReflect() protoreflect.Message {
mi := &file_userexpand_proto_msgTypes[0]
mi := &file_userexpand_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -65,7 +411,7 @@ func (x *DBUserExpand) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBUserExpand.ProtoReflect.Descriptor instead.
func (*DBUserExpand) Descriptor() ([]byte, []int) {
return file_userexpand_proto_rawDescGZIP(), []int{0}
return file_userexpand_proto_rawDescGZIP(), []int{6}
}
func (x *DBUserExpand) GetId() string {
@ -124,34 +470,83 @@ func (x *DBUserExpand) GetTujian() map[string]bool {
return nil
}
func (x *DBUserExpand) GetCurFigure() int32 {
if x != nil {
return x.CurFigure
}
return 0
}
func (x *DBUserExpand) GetPreinstall() map[int32]*Figure {
if x != nil {
return x.Preinstall
}
return nil
}
var File_userexpand_proto protoreflect.FileDescriptor
var file_userexpand_proto_rawDesc = []byte{
0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x22, 0xea, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
0x61, 0x6e, 0x64, 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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61,
0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74,
0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64,
0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6c,
0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12,
0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74,
0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61,
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61,
0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74,
0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66,
0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e,
0x74, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x08, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64,
0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75,
0x6a, 0x69, 0x61, 0x6e, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x08, 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,
0x74, 0x6f, 0x22, 0x32, 0x0a, 0x04, 0x48, 0x61, 0x69, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65,
0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64,
0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x32, 0x0a, 0x04, 0x45, 0x79, 0x65, 0x73, 0x12, 0x14,
0x0a, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72,
0x65, 0x73, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x1d, 0x0a, 0x05, 0x4d, 0x6f,
0x75, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x04, 0x42, 0x6f, 0x64,
0x79, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x67, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x04, 0x68, 0x69, 0x67, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x70, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x68, 0x61, 0x70, 0x65, 0x22, 0x22, 0x0a, 0x0a, 0x43,
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c,
0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22,
0xa4, 0x01, 0x0a, 0x06, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61,
0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52,
0x04, 0x68, 0x61, 0x69, 0x72, 0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, 0x65, 0x73, 0x18, 0x02, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73,
0x12, 0x1c, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x06, 0x2e, 0x4d, 0x6f, 0x75, 0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19,
0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42,
0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d,
0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70,
0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x8f, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65,
0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73,
0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03,
0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f,
0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49,
0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
0x03, 0x52, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54,
0x69, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x43,
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x69, 0x6e, 0x69, 0x74,
0x64, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61,
0x74, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b,
0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d,
0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65,
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18,
0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78,
0x70, 0x61, 0x6e, 0x64, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x46,
0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x75, 0x72,
0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x3d, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73,
0x74, 0x61, 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x55,
0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73,
0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e,
0x73, 0x74, 0x61, 0x6c, 0x6c, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x1a, 0x46, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 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, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 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 (
@ -166,18 +561,32 @@ func file_userexpand_proto_rawDescGZIP() []byte {
return file_userexpand_proto_rawDescData
}
var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_userexpand_proto_goTypes = []interface{}{
(*DBUserExpand)(nil), // 0: DBUserExpand
nil, // 1: DBUserExpand.TujianEntry
(*Hair)(nil), // 0: Hair
(*Eyes)(nil), // 1: Eyes
(*Mouth)(nil), // 2: Mouth
(*Body)(nil), // 3: Body
(*Complexion)(nil), // 4: Complexion
(*Figure)(nil), // 5: Figure
(*DBUserExpand)(nil), // 6: DBUserExpand
nil, // 7: DBUserExpand.TujianEntry
nil, // 8: DBUserExpand.PreinstallEntry
}
var file_userexpand_proto_depIdxs = []int32{
1, // 0: DBUserExpand.tujian:type_name -> DBUserExpand.TujianEntry
1, // [1:1] is the sub-list for method output_type
1, // [1:1] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name
1, // [1:1] is the sub-list for extension extendee
0, // [0:1] is the sub-list for field type_name
0, // 0: Figure.hair:type_name -> Hair
1, // 1: Figure.eyes:type_name -> Eyes
2, // 2: Figure.mouth:type_name -> Mouth
3, // 3: Figure.body:type_name -> Body
4, // 4: Figure.complexion:type_name -> Complexion
7, // 5: DBUserExpand.tujian:type_name -> DBUserExpand.TujianEntry
8, // 6: DBUserExpand.preinstall:type_name -> DBUserExpand.PreinstallEntry
5, // 7: DBUserExpand.PreinstallEntry.value:type_name -> Figure
8, // [8:8] is the sub-list for method output_type
8, // [8:8] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension type_name
8, // [8:8] is the sub-list for extension extendee
0, // [0:8] is the sub-list for field type_name
}
func init() { file_userexpand_proto_init() }
@ -187,6 +596,78 @@ func file_userexpand_proto_init() {
}
if !protoimpl.UnsafeEnabled {
file_userexpand_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Hair); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_userexpand_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Eyes); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_userexpand_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Mouth); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_userexpand_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Body); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_userexpand_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Complexion); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_userexpand_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Figure); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_userexpand_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBUserExpand); i {
case 0:
return &v.state
@ -205,7 +686,7 @@ func file_userexpand_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_userexpand_proto_rawDesc,
NumEnums: 0,
NumMessages: 2,
NumMessages: 9,
NumExtensions: 0,
NumServices: 0,
},

View File

@ -16,9 +16,7 @@ type Tables struct {
LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory
LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory
global *Game_global
hero *Game_hero
ui *Game_ui
skill *Game_skill
plot *Game_plot
extservers *Game_extservers
skillAtk *Game_skillAtk
@ -68,6 +66,8 @@ type Tables struct {
monster *Game_monster
equipPos *Game_equipPos
playerlv *Game_playerlv
propsgroup *Game_propsgroup
facemod *Game_facemod
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -99,24 +99,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.global, err = NewGame_global(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_hero") ; err != nil {
return nil, err
}
if tables.hero, err = NewGame_hero(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_ui") ; err != nil {
return nil, err
}
if tables.ui, err = NewGame_ui(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_skill") ; err != nil {
return nil, err
}
if tables.skill, err = NewGame_skill(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_plot") ; err != nil {
return nil, err
}
@ -411,5 +399,17 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.playerlv, err = NewGame_playerlv(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_propsgroup") ; err != nil {
return nil, err
}
if tables.propsgroup, err = NewGame_propsgroup(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_facemod") ; err != nil {
return nil, err
}
if tables.facemod, err = NewGame_facemod(buf) ; err != nil {
return nil, err
}
return tables, nil
}

View File

@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type Game_Figure struct {
Id int32
Key string
Color string
Val int32
PositonX int32
PositonY int32
PositonZ int32
Icon string
}
func (Game_Figure) GetTypeId() int {
return -1818502016
}
func NewGame_Figure(_buf map[string]interface{}) (_v *Game_Figure, err error) {
_v = &Game_Figure{}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; if _v.Color, _ok_ = _buf["color"].(string); !_ok_ { err = errors.New("color error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["val"].(float64); !_ok_ { err = errors.New("val error"); return }; _v.Val = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["positon_x"].(float64); !_ok_ { err = errors.New("positon_x error"); return }; _v.PositonX = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["positon_y"].(float64); !_ok_ { err = errors.New("positon_y error"); return }; _v.PositonY = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["positon_z"].(float64); !_ok_ { err = errors.New("positon_z error"); return }; _v.PositonZ = int32(_tempNum_) }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
return
}

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type Game_facemod struct {
_dataMap map[int32]*Game_facemodData
_dataList []*Game_facemodData
}
func NewGame_facemod(_buf []map[string]interface{}) (*Game_facemod, error) {
_dataList := make([]*Game_facemodData, 0, len(_buf))
dataMap := make(map[int32]*Game_facemodData)
for _, _ele_ := range _buf {
if _v, err2 := NewGame_facemodData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &Game_facemod{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *Game_facemod) GetDataMap() map[int32]*Game_facemodData {
return table._dataMap
}
func (table *Game_facemod) GetDataList() []*Game_facemodData {
return table._dataList
}
func (table *Game_facemod) Get(key int32) *Game_facemodData {
return table._dataMap[key]
}

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type Game_facemodData struct {
Id int32
Suitintr string
Figure []*Game_Figure
}
func (Game_facemodData) GetTypeId() int {
return -214755117
}
func NewGame_facemodData(_buf map[string]interface{}) (_v *Game_facemodData, err error) {
_v = &Game_facemodData{}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Suitintr, _ok_ = _buf["suitintr"].(string); !_ok_ { err = errors.New("suitintr error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["figure"].([]interface{}); !_ok_ { err = errors.New("figure error"); return }
_v.Figure = make([]*Game_Figure, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Game_Figure
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_Figure(_x_); err != nil { return } }
_v.Figure = append(_v.Figure, _list_v_)
}
}
return
}

View File

@ -14,7 +14,7 @@ type Game_heroStarupData struct {
Key int32
Id string
Star int32
Needhero string
Needhero int32
Needherostar int32
Needheronum int32
Needrace []int32
@ -32,7 +32,7 @@ func NewGame_heroStarupData(_buf map[string]interface{}) (_v *Game_heroStarupDat
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; if _v.Needhero, _ok_ = _buf["needhero"].(string); !_ok_ { err = errors.New("needhero error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needhero"].(float64); !_ok_ { err = errors.New("needhero error"); return }; _v.Needhero = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needherostar"].(float64); !_ok_ { err = errors.New("needherostar error"); return }; _v.Needherostar = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needheronum"].(float64); !_ok_ { err = errors.New("needheronum error"); return }; _v.Needheronum = int32(_tempNum_) }
{

View File

@ -25,11 +25,7 @@ func (Game_monsterData) GetTypeId() int {
func NewGame_monsterData(_buf map[string]interface{}) (_v *Game_monsterData, err error) {
_v = &Game_monsterData{}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_id"].(float64); !_ok_ { err = errors.New("monster_id error"); return }; _v.MonsterId = int32(_tempNum_) }
<<<<<<< HEAD
{ var _ok_ bool; if _v.HeroId, _ok_ = _buf["hero_id"].(string); !_ok_ { err = errors.New("hero_id error"); return } }
=======
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero_id"].(float64); !_ok_ { err = errors.New("hero_id error"); return }; _v.HeroId = int32(_tempNum_) }
>>>>>>> bb00032 (玩家等级优化)
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; if _v.Equip, _ok_ = _buf["equip"].(string); !_ok_ { err = errors.New("equip error"); return } }

View File

@ -19,6 +19,7 @@ type Game_newHeroData struct {
Race int32
Job int32
Type int32
Handbook int32
Prefab int32
Icon int32
Sound string
@ -33,6 +34,8 @@ type Game_newHeroData struct {
Skill2 int32
Skill3 int32
Txt string
Enteranivalue int32
Camerainterval float32
}
func (Game_newHeroData) GetTypeId() int {
@ -48,6 +51,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ { err = errors.New("handbook error"); return }; _v.Handbook = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ { err = errors.New("prefab error"); return }; _v.Prefab = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["sound"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sound error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sound, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
@ -95,5 +99,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ { err = errors.New("skill3 error"); return }; _v.Skill3 = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enteranivalue"].(float64); !_ok_ { err = errors.New("enteranivalue error"); return }; _v.Enteranivalue = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camerainterval"].(float64); !_ok_ { err = errors.New("camerainterval error"); return }; _v.Camerainterval = float32(_tempNum_) }
return
}