Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
3dd57b242e
@ -392,9 +392,9 @@ type (
|
||||
BingoJumpTask(session IUserSession, groupId, rtaskId int32) error
|
||||
// 查询我的世界任务
|
||||
GetMyWorldtask(uid string) *pb.DBWorldtask
|
||||
//
|
||||
GetWorldTaskBy(uid string, groupId int32) int32
|
||||
|
||||
// 获取分组任务
|
||||
GetWorldTaskBy(session IUserSession, groupId int32) int32
|
||||
//更新接取任务
|
||||
UpdateTaskStatus(uid string, taskId int32)
|
||||
}
|
||||
// 支线剧情任务
|
||||
|
@ -46,7 +46,7 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
|
||||
return
|
||||
}
|
||||
if wt, ok := module.(comm.IWorldtask); ok {
|
||||
list.Taskid = wt.GetWorldTaskBy(session.GetUserId(), conf.Worldtask)
|
||||
list.Taskid = wt.GetWorldTaskBy(session, conf.Worldtask)
|
||||
if list.Taskid != 0 { // 任务接取成功
|
||||
bAccept = true
|
||||
list.Eventid = req.Citystory
|
||||
|
@ -51,6 +51,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
|
||||
Sid: req.Sid,
|
||||
Binduid: req.Account,
|
||||
Lastloginip: session.GetIP(),
|
||||
Perlist: make([]string, 0),
|
||||
}
|
||||
err = this.module.modelUser.User_Create(user)
|
||||
if err != nil {
|
||||
|
107
modules/user/api_switchdefper.go
Normal file
107
modules/user/api_switchdefper.go
Normal file
@ -0,0 +1,107 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
func (this *apiComp) SwitchDefPerCheck(session comm.IUserSession, req *pb.UserSwitchDefPerReq) (code pb.ErrorCode) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
//登录
|
||||
func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchDefPerReq) (code pb.ErrorCode, data *pb.ErrorData) {
|
||||
var (
|
||||
change map[string]interface{} = make(map[string]interface{})
|
||||
user *pb.DBUser
|
||||
conf *cfg.GamePlayerInfor_overviewData
|
||||
err error
|
||||
keep bool
|
||||
)
|
||||
|
||||
if code = this.SwitchDefPerCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
user = this.module.GetUser(session.GetUserId())
|
||||
|
||||
if req.Defper1 != "" {
|
||||
if conf, err = this.module.configure.GetPlayerOverview(req.Defper1); err != nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
if conf.Type != 1 {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
return
|
||||
}
|
||||
for _, v := range user.Perlist {
|
||||
if v == req.Defper1 {
|
||||
keep = true
|
||||
}
|
||||
}
|
||||
if !keep {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
return
|
||||
}
|
||||
user.Defper1 = req.Defper1
|
||||
change["defper1"] = req.Defper1
|
||||
}
|
||||
|
||||
if req.Defper2 != "" {
|
||||
if conf, err = this.module.configure.GetPlayerOverview(req.Defper2); err != nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
if conf.Type != 2 {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
return
|
||||
}
|
||||
for _, v := range user.Perlist {
|
||||
if v == req.Defper2 {
|
||||
keep = true
|
||||
}
|
||||
}
|
||||
if !keep {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
return
|
||||
}
|
||||
user.Defper2 = req.Defper2
|
||||
change["defper2"] = req.Defper2
|
||||
}
|
||||
|
||||
if req.Defper3 != "" {
|
||||
if conf, err = this.module.configure.GetPlayerOverview(req.Defper3); err != nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
if conf.Type != 3 {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
return
|
||||
}
|
||||
for _, v := range user.Perlist {
|
||||
if v == req.Defper3 {
|
||||
keep = true
|
||||
}
|
||||
}
|
||||
if !keep {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
return
|
||||
}
|
||||
user.Defper3 = req.Defper3
|
||||
change["defper3"] = req.Defper3
|
||||
}
|
||||
if err = this.module.modelUser.Change(session.GetUserId(), change); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "sign", &pb.UserSwitchDefPerResp{
|
||||
Issucc: true,
|
||||
Defper1: user.Defper1,
|
||||
Defper2: user.Defper2,
|
||||
Defper3: user.Defper3,
|
||||
})
|
||||
return
|
||||
}
|
@ -3,7 +3,6 @@ package user
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
@ -11,17 +10,19 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
game_signreset = "game_signreset.json"
|
||||
game_sign = "game_sign.json"
|
||||
gameOpencond = "game_opencond.json"
|
||||
game_SignExtra = "game_signextra.json"
|
||||
game_initial = "game_initial.json" //初始化表
|
||||
game_signreset = "game_signreset.json"
|
||||
game_sign = "game_sign.json"
|
||||
gameOpencond = "game_opencond.json"
|
||||
game_SignExtra = "game_signextra.json"
|
||||
game_initial = "game_initial.json" //初始化表
|
||||
game_playerinfor_overview = "game_playerinfor_overview.json" //皮肤配置表
|
||||
)
|
||||
|
||||
///配置管理基础组件
|
||||
type configureComp struct {
|
||||
hlock sync.RWMutex
|
||||
modules.MCompConfigure
|
||||
module *User
|
||||
_sign map[int32]*cfg.GameSignData
|
||||
_signExtra map[int32]*cfg.GameSignExtraData
|
||||
}
|
||||
@ -29,12 +30,14 @@ type configureComp struct {
|
||||
//组件初始化接口
|
||||
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
err = this.MCompConfigure.Init(service, module, comp, options)
|
||||
module = module.(*User)
|
||||
err = this.LoadConfigure(game_initial, cfg.NewGameInitial)
|
||||
this._sign = make(map[int32]*cfg.GameSignData, 0)
|
||||
configure.RegisterConfigure(game_sign, cfg.NewGameSign, this.LoadSignData)
|
||||
this.LoadConfigure(gameOpencond, cfg.NewGameOpencond)
|
||||
this._signExtra = make(map[int32]*cfg.GameSignExtraData, 0)
|
||||
configure.RegisterConfigure(game_SignExtra, cfg.NewGameSignExtra, this.LoadSignExtraData)
|
||||
err = this.LoadConfigure(game_playerinfor_overview, cfg.NewGamePlayerInfor_overview)
|
||||
return
|
||||
}
|
||||
|
||||
@ -43,7 +46,7 @@ func (this *configureComp) GetSignConf(day, group int32) *cfg.GameSignData {
|
||||
if v, ok := this._sign[group<<8+day]; ok {
|
||||
return v
|
||||
}
|
||||
log.Errorf("get GetSignConf conf err day:%d,group:%d", day, group)
|
||||
this.module.Errorf("get GetSignConf conf err day:%d,group:%d", day, group)
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -72,7 +75,7 @@ func (this *configureComp) LoadSignData() {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
log.Errorf("get game_sign conf err:%v", err)
|
||||
this.module.Errorf("get game_sign conf err:%v", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -97,6 +100,7 @@ func (this *configureComp) FindFunc(lv int32) (funcIds []string) {
|
||||
data, ok := v.(*cfg.GameOpencond)
|
||||
if !ok {
|
||||
err = fmt.Errorf("%T no is *cfg.GameOpencond", v)
|
||||
this.module.Errorln(err)
|
||||
return nil
|
||||
}
|
||||
for _, d := range data.GetDataList() {
|
||||
@ -122,7 +126,7 @@ func (this *configureComp) LoadSignExtraData() {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
log.Errorf("get SignExtra conf err:%v", err)
|
||||
this.module.Errorf("get SignExtra conf err:%v", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -141,6 +145,25 @@ func (this *configureComp) GetGlobalInitConf() (configure *cfg.GameInitial, err
|
||||
if v, err = this.GetConfigure(game_initial); err == nil {
|
||||
if configure, ok = v.(*cfg.GameInitial); !ok {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_comInitial", v)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetPlayerOverview(id string) (configure *cfg.GamePlayerInfor_overviewData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(game_playerinfor_overview); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
return
|
||||
} else {
|
||||
if configure, ok = v.(*cfg.GamePlayerInfor_overview).GetDataMap()[id]; !ok {
|
||||
err = fmt.Errorf("GetPlayerOverview not found:%s ", id)
|
||||
this.module.Errorf("err:%v", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
@ -955,8 +955,10 @@ func (this *User) BingoSetUserVipLv(session comm.IUserSession, lv int32) error {
|
||||
func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush bool) (code pb.ErrorCode) {
|
||||
var (
|
||||
err error
|
||||
conf *cfg.GamePlayerInfor_overviewData
|
||||
user *pb.DBUser
|
||||
adds []string = make([]string, 0)
|
||||
change map[string]interface{} = make(map[string]interface{})
|
||||
adds []string = make([]string, 0)
|
||||
iskeep bool
|
||||
)
|
||||
if user = this.GetUser(session.GetUserId()); user == nil {
|
||||
@ -973,12 +975,33 @@ func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush
|
||||
}
|
||||
}
|
||||
if !iskeep {
|
||||
if user.Defper1 == "" || user.Defper2 == "" || user.Defper3 == "" {
|
||||
if conf, err = this.configure.GetPlayerOverview(k); err != nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
} else {
|
||||
if user.Defper1 == "" && conf.Type == 1 {
|
||||
user.Defper1 = k
|
||||
change["defper1"] = k
|
||||
}
|
||||
if user.Defper2 == "" && conf.Type == 2 {
|
||||
user.Defper2 = k
|
||||
change["defper2"] = k
|
||||
}
|
||||
|
||||
if user.Defper3 == "" && conf.Type == 3 {
|
||||
user.Defper3 = k
|
||||
change["defper2"] = k
|
||||
}
|
||||
}
|
||||
}
|
||||
adds = append(adds, k)
|
||||
}
|
||||
}
|
||||
|
||||
user.Perlist = append(user.Perlist, adds...)
|
||||
if err = this.modelUser.Change(session.GetUserId(), map[string]interface{}{"perlist": user.Perlist}); err != nil {
|
||||
change["perlist"] = user.Perlist
|
||||
if err = this.modelUser.Change(session.GetUserId(), change); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
}
|
||||
|
@ -212,24 +212,107 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
|
||||
}
|
||||
|
||||
// 返回任务ID
|
||||
func (this *Worldtask) GetWorldTaskBy(uid string, groupId int32) (taskId int32) {
|
||||
func (this *Worldtask) GetWorldTaskBy(session comm.IUserSession, groupId int32) (taskId int32) {
|
||||
uid := session.GetUserId()
|
||||
mytask, err := this.modelWorldtask.getWorldtask(uid)
|
||||
if err != nil {
|
||||
return 0
|
||||
}
|
||||
|
||||
if gwt, err := this.configure.getWorldtaskCfg(); err == nil {
|
||||
for _, v := range gwt.GetDataList() {
|
||||
if v.Group == groupId && v.Des == 5 {
|
||||
if _, ok := utils.Findx(mytask.TaskList, v.Key); !ok {
|
||||
return v.Key
|
||||
taskId = v.Key
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if taskId == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
myWorldtask, err := this.modelWorldtask.getWorldtask(uid)
|
||||
if err != nil {
|
||||
this.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// 当前任务配置
|
||||
curTaskConf, err := this.configure.getWorldtaskById(taskId)
|
||||
if err != nil || curTaskConf == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if myWorldtask.CurrentTask == nil {
|
||||
myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask)
|
||||
}
|
||||
myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
|
||||
TaskId: taskId,
|
||||
TaskType: curTaskConf.Des,
|
||||
NpcStatus: 1,
|
||||
}
|
||||
|
||||
update := map[string]interface{}{
|
||||
"currentTask": myWorldtask.CurrentTask,
|
||||
}
|
||||
|
||||
if err := this.modelWorldtask.Change(uid, update); err != nil {
|
||||
|
||||
}
|
||||
|
||||
//判断是否要结束任务
|
||||
if ((len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) ||
|
||||
len(curTaskConf.Completetask) == 0) &&
|
||||
curTaskConf.DeliverNpc == 0 {
|
||||
//结束任务
|
||||
this.modelWorldtask.taskFinish(session, groupId, taskId, myWorldtask, curTaskConf)
|
||||
this.modelWorldtask.taskFinishPush(session, groupId, myWorldtask, curTaskConf)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func(this *Worldtask) UpdateTaskStatus(uid string,taskId int32) {
|
||||
func (this *Worldtask) UpdateTaskStatus(uid string, taskId int32) {
|
||||
myWorldtask, err := this.modelWorldtask.getWorldtask(uid)
|
||||
if err != nil {
|
||||
this.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
curTaskConf, err := this.configure.getWorldtaskById(taskId)
|
||||
if err != nil || curTaskConf == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if curTaskConf.Des != 5 {
|
||||
return
|
||||
}
|
||||
|
||||
var wt *pb.Worldtask
|
||||
if curTaskConf.Ontxe != 0 {
|
||||
//pre task
|
||||
wt = &pb.Worldtask{
|
||||
TaskId: curTaskConf.Ontxe,
|
||||
TaskType: curTaskConf.Des,
|
||||
NpcStatus: 1,
|
||||
}
|
||||
} else {
|
||||
wt = &pb.Worldtask{
|
||||
TaskId: taskId,
|
||||
TaskType: curTaskConf.Des,
|
||||
NpcStatus: 1,
|
||||
}
|
||||
}
|
||||
|
||||
myWorldtask.CurrentTask[curTaskConf.Group] = wt
|
||||
update := map[string]interface{}{
|
||||
"currentTask": myWorldtask.CurrentTask,
|
||||
}
|
||||
|
||||
if err := this.modelWorldtask.Change(uid, update); err != nil {
|
||||
|
||||
}
|
||||
}
|
@ -2803,6 +2803,142 @@ func (x *UserSellResResp) GetIsSucc() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
//请求设置默认皮肤
|
||||
type UserSwitchDefPerReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Defper1 string `protobuf:"bytes,1,opt,name=defper1,proto3" json:"defper1"`
|
||||
Defper2 string `protobuf:"bytes,2,opt,name=defper2,proto3" json:"defper2"`
|
||||
Defper3 string `protobuf:"bytes,3,opt,name=defper3,proto3" json:"defper3"`
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerReq) Reset() {
|
||||
*x = UserSwitchDefPerReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_user_user_msg_proto_msgTypes[54]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerReq) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*UserSwitchDefPerReq) ProtoMessage() {}
|
||||
|
||||
func (x *UserSwitchDefPerReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_user_user_msg_proto_msgTypes[54]
|
||||
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 UserSwitchDefPerReq.ProtoReflect.Descriptor instead.
|
||||
func (*UserSwitchDefPerReq) Descriptor() ([]byte, []int) {
|
||||
return file_user_user_msg_proto_rawDescGZIP(), []int{54}
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerReq) GetDefper1() string {
|
||||
if x != nil {
|
||||
return x.Defper1
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerReq) GetDefper2() string {
|
||||
if x != nil {
|
||||
return x.Defper2
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerReq) GetDefper3() string {
|
||||
if x != nil {
|
||||
return x.Defper3
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
//请求设置默认皮肤
|
||||
type UserSwitchDefPerResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"`
|
||||
Defper1 string `protobuf:"bytes,2,opt,name=defper1,proto3" json:"defper1"`
|
||||
Defper2 string `protobuf:"bytes,3,opt,name=defper2,proto3" json:"defper2"`
|
||||
Defper3 string `protobuf:"bytes,4,opt,name=defper3,proto3" json:"defper3"`
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerResp) Reset() {
|
||||
*x = UserSwitchDefPerResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_user_user_msg_proto_msgTypes[55]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerResp) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*UserSwitchDefPerResp) ProtoMessage() {}
|
||||
|
||||
func (x *UserSwitchDefPerResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_user_user_msg_proto_msgTypes[55]
|
||||
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 UserSwitchDefPerResp.ProtoReflect.Descriptor instead.
|
||||
func (*UserSwitchDefPerResp) Descriptor() ([]byte, []int) {
|
||||
return file_user_user_msg_proto_rawDescGZIP(), []int{55}
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerResp) GetIssucc() bool {
|
||||
if x != nil {
|
||||
return x.Issucc
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerResp) GetDefper1() string {
|
||||
if x != nil {
|
||||
return x.Defper1
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerResp) GetDefper2() string {
|
||||
if x != nil {
|
||||
return x.Defper2
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *UserSwitchDefPerResp) GetDefper3() string {
|
||||
if x != nil {
|
||||
return x.Defper3
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
var File_user_user_msg_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_user_user_msg_proto_rawDesc = []byte{
|
||||
@ -3019,8 +3155,22 @@ var file_user_user_msg_proto_rawDesc = []byte{
|
||||
0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
|
||||
0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
|
||||
0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
|
||||
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x63, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53,
|
||||
0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, 0x66, 0x50, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18,
|
||||
0x0a, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x31, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x70,
|
||||
0x65, 0x72, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65,
|
||||
0x72, 0x32, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x33, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x33, 0x22, 0x7c, 0x0a, 0x14,
|
||||
0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, 0x66, 0x50, 0x65, 0x72,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x18, 0x0a, 0x07,
|
||||
0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64,
|
||||
0x65, 0x66, 0x70, 0x65, 0x72, 0x31, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72,
|
||||
0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x32,
|
||||
0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x33, 0x18, 0x04, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x33, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -3035,7 +3185,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, 54)
|
||||
var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 56)
|
||||
var file_user_user_msg_proto_goTypes = []interface{}{
|
||||
(*UserLoginReq)(nil), // 0: UserLoginReq
|
||||
(*UserLoginResp)(nil), // 1: UserLoginResp
|
||||
@ -3091,40 +3241,42 @@ var file_user_user_msg_proto_goTypes = []interface{}{
|
||||
(*UserChangeTipsResp)(nil), // 51: UserChangeTipsResp
|
||||
(*UserSellResReq)(nil), // 52: UserSellResReq
|
||||
(*UserSellResResp)(nil), // 53: UserSellResResp
|
||||
(*DBUser)(nil), // 54: DBUser
|
||||
(*DBUserExpand)(nil), // 55: DBUserExpand
|
||||
(ErrorCode)(0), // 56: ErrorCode
|
||||
(*CacheUser)(nil), // 57: CacheUser
|
||||
(*DBUserSetting)(nil), // 58: DBUserSetting
|
||||
(*DBPagodaRecord)(nil), // 59: DBPagodaRecord
|
||||
(*DBHuntingRank)(nil), // 60: DBHuntingRank
|
||||
(*DBVikingRank)(nil), // 61: DBVikingRank
|
||||
(*DBServerData)(nil), // 62: DBServerData
|
||||
(*DBSign)(nil), // 63: DBSign
|
||||
(*UserAtno)(nil), // 64: UserAtno
|
||||
(*UserAssets)(nil), // 65: UserAssets
|
||||
(*UserSwitchDefPerReq)(nil), // 54: UserSwitchDefPerReq
|
||||
(*UserSwitchDefPerResp)(nil), // 55: UserSwitchDefPerResp
|
||||
(*DBUser)(nil), // 56: DBUser
|
||||
(*DBUserExpand)(nil), // 57: DBUserExpand
|
||||
(ErrorCode)(0), // 58: ErrorCode
|
||||
(*CacheUser)(nil), // 59: CacheUser
|
||||
(*DBUserSetting)(nil), // 60: DBUserSetting
|
||||
(*DBPagodaRecord)(nil), // 61: DBPagodaRecord
|
||||
(*DBHuntingRank)(nil), // 62: DBHuntingRank
|
||||
(*DBVikingRank)(nil), // 63: DBVikingRank
|
||||
(*DBServerData)(nil), // 64: DBServerData
|
||||
(*DBSign)(nil), // 65: DBSign
|
||||
(*UserAtno)(nil), // 66: UserAtno
|
||||
(*UserAssets)(nil), // 67: UserAssets
|
||||
}
|
||||
var file_user_user_msg_proto_depIdxs = []int32{
|
||||
54, // 0: UserLoginResp.data:type_name -> DBUser
|
||||
55, // 1: UserLoginResp.ex:type_name -> DBUserExpand
|
||||
54, // 2: UserInfoResp.data:type_name -> DBUser
|
||||
55, // 3: UserInfoResp.ex:type_name -> DBUserExpand
|
||||
56, // 4: UserRegisterResp.Code:type_name -> ErrorCode
|
||||
57, // 5: UserLoadResp.data:type_name -> CacheUser
|
||||
58, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
|
||||
58, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
|
||||
54, // 8: UserBattlerecordResp.data:type_name -> DBUser
|
||||
55, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand
|
||||
59, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
|
||||
60, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
|
||||
61, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
|
||||
57, // 13: UserOnlineResp.users:type_name -> CacheUser
|
||||
54, // 14: UserDataListResp.users:type_name -> DBUser
|
||||
62, // 15: UserGetServerDataResp.data:type_name -> DBServerData
|
||||
63, // 16: UserSignResp.data:type_name -> DBSign
|
||||
63, // 17: UserChangeTipsResp.data:type_name -> DBSign
|
||||
64, // 18: UserSellResReq.atno:type_name -> UserAtno
|
||||
65, // 19: UserSellResResp.atn:type_name -> UserAssets
|
||||
56, // 0: UserLoginResp.data:type_name -> DBUser
|
||||
57, // 1: UserLoginResp.ex:type_name -> DBUserExpand
|
||||
56, // 2: UserInfoResp.data:type_name -> DBUser
|
||||
57, // 3: UserInfoResp.ex:type_name -> DBUserExpand
|
||||
58, // 4: UserRegisterResp.Code:type_name -> ErrorCode
|
||||
59, // 5: UserLoadResp.data:type_name -> CacheUser
|
||||
60, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
|
||||
60, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
|
||||
56, // 8: UserBattlerecordResp.data:type_name -> DBUser
|
||||
57, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand
|
||||
61, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
|
||||
62, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
|
||||
63, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
|
||||
59, // 13: UserOnlineResp.users:type_name -> CacheUser
|
||||
56, // 14: UserDataListResp.users:type_name -> DBUser
|
||||
64, // 15: UserGetServerDataResp.data:type_name -> DBServerData
|
||||
65, // 16: UserSignResp.data:type_name -> DBSign
|
||||
65, // 17: UserChangeTipsResp.data:type_name -> DBSign
|
||||
66, // 18: UserSellResReq.atno:type_name -> UserAtno
|
||||
67, // 19: UserSellResResp.atn:type_name -> UserAssets
|
||||
20, // [20:20] is the sub-list for method output_type
|
||||
20, // [20:20] is the sub-list for method input_type
|
||||
20, // [20:20] is the sub-list for extension type_name
|
||||
@ -3794,6 +3946,30 @@ func file_user_user_msg_proto_init() {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_user_user_msg_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*UserSwitchDefPerReq); 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[55].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*UserSwitchDefPerResp); 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{
|
||||
@ -3801,7 +3977,7 @@ func file_user_user_msg_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_user_user_msg_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 54,
|
||||
NumMessages: 56,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user