上传月之秘境相关代码

modules/chat/api_getlist.go

@@ -49,6 +49,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq)
 	case pb.ChatChannel_CrossServer:
 		if result, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil {
 			this.module.Errorf("err:%v", err)
+			code = pb.ErrorCode_DBError
 			return
 		}
 		if req.ChannelId != result.Chatchannel {

modules/moonfantasy/api_dare.go

@@ -3,6 +3,8 @@ package moonfantasy
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"time"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -14,11 +16,36 @@ func (this *apiComp) DareCheck(session comm.IUserSession, req *pb.MoonfantasyDar
 
 ///获取本服聊天消息记录
 func (this *apiComp) Dare(session comm.IUserSession, req *pb.MoonfantasyDareReq) (code pb.ErrorCode, data proto.Message) {
-	var ()
+	var (
+		globalconf *cfg.GameGlobalData
+		mdata      *pb.DBMoonfantasy
+		err        error
+	)
 	if code = this.DareCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
+	if mdata, err = this.module.modelDream.queryDreamData(req.Uid, req.Mid); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	if mdata == nil {
+		code = pb.ErrorCode_MoonfantasyHasExpired
+		return
+	}
+	if mdata.Joinnum >= mdata.Numup {
+		code = pb.ErrorCode_MoonfantasyJoinUp
+		return
+	}
 
+	globalconf = this.module.configure.GetGlobalConf()
+
+	if time.Now().Sub(time.Unix(mdata.Ctime, 0)).Seconds() >= float64(globalconf.DreamlandLimit) {
+		code = pb.ErrorCode_MoonfantasyHasExpired
+		return
+	}
+	this.module.modelDream.ChangeList(req.Uid, req.Mid, map[string]interface{}{
+		"joinnum": mdata.Joinnum + 1,
+	})
 	session.SendMsg(string(this.module.GetType()), "dare", &pb.MoonfantasyDareResp{})
 	return
 }

modules/moonfantasy/api_trigger.go

@@ -1,8 +1,12 @@
 package moonfantasy
 
 import (
+	"crypto/rand"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"math/big"
+	"time"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -14,11 +18,48 @@ func (this *apiComp) TriggerCheck(session comm.IUserSession, req *pb.Moonfantasy
 
 ///获取本服聊天消息记录
 func (this *apiComp) Trigger(session comm.IUserSession, req *pb.MoonfantasyTriggerReq) (code pb.ErrorCode, data proto.Message) {
-	var ()
+	var (
+		globalconf *cfg.GameGlobalData
+		uexpand    *pb.DBUserExpand
+		boss       *cfg.GameDreamlandBoosData
+		mdata      *pb.DBMoonfantasy
+		issucc     bool
+		err        error
+	)
 	if code = this.TriggerCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
-
+	globalconf = this.module.configure.GetGlobalConf()
-	session.SendMsg(string(this.module.GetType()), "trigger", &pb.MoonfantasyTriggerResp{})
+	n, _ := rand.Int(rand.Reader, big.NewInt(100))
+	if int32(n.Int64()) < globalconf.DreamlandPro {
+		issucc = true
+	} else {
+		issucc = false
+	}
+	if issucc {
+		if uexpand, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil {
+			code = pb.ErrorCode_DBError
+			this.module.Errorln(err)
+			return
+		}
+		if uexpand.MoonfantasyTriggerNum >= globalconf.DreamlandTriggernum {
+			return
+		}
+		if boss, err = this.module.configure.GetMonster(); err != nil {
+			code = pb.ErrorCode_ConfigNoFound
+			return
+		}
+		if mdata, err = this.module.modelDream.addDreamData(session.GetUserId(), boss); err != nil {
+			code = pb.ErrorCode_DBError
+			return
+		}
+		this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
+			"moonfantasyTriggerNum":  uexpand.MoonfantasyTriggerNum + 1,
+			"moonfantasyLastTrigger": time.Now().Unix(),
+		})
+		session.SendMsg(string(this.module.GetType()), "trigger", &pb.MoonfantasyTriggerResp{Issucc: true, Mid: mdata.Id, Monster: mdata.Monster})
+	} else {
+		session.SendMsg(string(this.module.GetType()), "trigger", &pb.MoonfantasyTriggerResp{Issucc: false})
+	}
 	return
 }

modules/moonfantasy/configure.go

@@ -1,7 +1,9 @@
 package moonfantasy
 
 import (
+	"go_dreamfactory/comm"
 	"go_dreamfactory/modules"
+	cfg "go_dreamfactory/sys/configure/structs"
 
 	"go_dreamfactory/lego/core"
 )
@@ -13,11 +15,36 @@ const (
 ///背包配置管理组件
 type configureComp struct {
 	modules.MCompConfigure
+	module *Moonfantasy
 }
 
 //组件初始化接口
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 	this.ModuleCompBase.Init(service, module, comp, options)
-
+	this.module = module.(*Moonfantasy)
+	err = this.LoadConfigure(game_dreamlandboos, cfg.NewGameDreamlandBoos)
 	return
 }
+
+//获取随机monster
+func (this *configureComp) GetMonster() (result *cfg.GameDreamlandBoosData, err error) {
+	var (
+		v         interface{}
+		configure *cfg.GameDreamlandBoos
+		waget     []int32
+		index     int32
+	)
+	if v, err = this.GetConfigure(game_dreamlandboos); err != nil {
+		this.module.Errorf("err:%v", err)
+		return
+	} else {
+		configure = v.(*cfg.GameDreamlandBoos)
+		waget = make([]int32, len(configure.GetDataList()))
+		for i, m := range configure.GetDataList() {
+			waget[i] = m.Pro
+		}
+		index = comm.GetRandW(waget)
+		result = configure.GetDataList()[index]
+		return
+	}
+}

modules/moonfantasy/modelDream.go

@@ -4,7 +4,11 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"time"
 
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/x/bsonx"
 )
@@ -26,3 +30,27 @@ func (this *modelDreamComp) Init(service core.IService, module core.IModule, com
 	})
 	return
 }
+
+///添加月之秘境记录
+func (this *modelDreamComp) queryDreamData(uid string, mid string) (result *pb.DBMoonfantasy, err error) {
+	result = &pb.DBMoonfantasy{}
+	if err = this.GetListObj(uid, mid, result); err != nil && err != mongo.ErrNilDocument {
+		this.module.Errorln(err)
+	}
+	return
+}
+
+///添加月之秘境记录
+func (this *modelDreamComp) addDreamData(uid string, boss *cfg.GameDreamlandBoosData) (result *pb.DBMoonfantasy, err error) {
+	result = &pb.DBMoonfantasy{
+		Id:      primitive.NewObjectID().Hex(),
+		Uid:     uid,
+		Monster: boss.Bossid,
+		Ctime:   time.Now().Unix(),
+		Joinnum: 0,
+	}
+	if err = this.AddList(uid, result.Id, result); err != nil {
+		this.module.Errorln(err)
+	}
+	return
+}

pb/errorcode.pb.go

@@ -164,6 +164,9 @@ const (
 	ErrorCode_VikingLvErr       ErrorCode = 2301 // 关卡难度不匹配
 	ErrorCode_VikingBoosType    ErrorCode = 2302 // BOSS 类型不对
 	ErrorCode_VikingBuyMaxCount ErrorCode = 2303 // 购买达到最大次数
+	// moonfantasy  月之秘境
+	ErrorCode_MoonfantasyHasExpired ErrorCode = 2401 // boos 连接已失效
+	ErrorCode_MoonfantasyJoinUp     ErrorCode = 2402 // boos 参与人数已达上限
 )
 
 // Enum value maps for ErrorCode.
@@ -296,6 +299,8 @@ var (
 		2301: "VikingLvErr",
 		2302: "VikingBoosType",
 		2303: "VikingBuyMaxCount",
+		2401: "MoonfantasyHasExpired",
+		2402: "MoonfantasyJoinUp",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                   0,
@@ -425,6 +430,8 @@ var (
 		"VikingLvErr":               2301,
 		"VikingBoosType":            2302,
 		"VikingBuyMaxCount":         2303,
+		"MoonfantasyHasExpired":     2401,
+		"MoonfantasyJoinUp":         2402,
 	}
 )
 
@@ -459,7 +466,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xb3, 0x15, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xe7, 0x15, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -630,8 +637,11 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56, 0x69,
 	0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11, 0x12,
 	0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43,
-	0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64,
+	0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61,
+	0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/moonfantasy_db.pb.go

@@ -26,9 +26,11 @@ type DBMoonfantasy struct {
 	unknownFields protoimpl.UnknownFields
 
 	Id      string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
-	Monster int32  `protobuf:"varint,2,opt,name=monster,proto3" json:"monster"` //怪物id
+	Uid     string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`          //用户id
-	Ctime   int64  `protobuf:"varint,3,opt,name=ctime,proto3" json:"ctime"`     //创建时间
+	Monster int32  `protobuf:"varint,3,opt,name=monster,proto3" json:"monster"` //怪物id
-	Joinnum int32  `protobuf:"varint,4,opt,name=joinnum,proto3" json:"joinnum"` //参与人数
+	Ctime   int64  `protobuf:"varint,4,opt,name=ctime,proto3" json:"ctime"`     //创建时间
+	Joinnum int32  `protobuf:"varint,5,opt,name=joinnum,proto3" json:"joinnum"` //参与人数
+	Numup   int32  `protobuf:"varint,6,opt,name=numup,proto3" json:"numup"`     //人数上限
 }
 
 func (x *DBMoonfantasy) Reset() {
@@ -70,6 +72,13 @@ func (x *DBMoonfantasy) GetId() string {
 	return ""
 }
 
+func (x *DBMoonfantasy) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
 func (x *DBMoonfantasy) GetMonster() int32 {
 	if x != nil {
 		return x.Monster
@@ -91,19 +100,29 @@ func (x *DBMoonfantasy) GetJoinnum() int32 {
 	return 0
 }
 
+func (x *DBMoonfantasy) GetNumup() int32 {
+	if x != nil {
+		return x.Numup
+	}
+	return 0
+}
+
 var File_moonfantasy_moonfantasy_db_proto protoreflect.FileDescriptor
 
 var file_moonfantasy_moonfantasy_db_proto_rawDesc = []byte{
 	0x0a, 0x20, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x2f, 0x6d, 0x6f,
 	0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x69, 0x0a, 0x0d, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74,
+	0x74, 0x6f, 0x22, 0x91, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
-	0x61, 0x73, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x74, 0x61, 0x73, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65,
-	0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74,
+	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72,
-	0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6a, 0x6f, 0x69, 0x6e, 0x6e, 0x75, 0x6d, 0x18, 0x04,
+	0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6a, 0x6f, 0x69, 0x6e, 0x6e, 0x75, 0x6d, 0x42, 0x06, 0x5a,
+	0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6a, 0x6f, 0x69, 0x6e, 0x6e, 0x75,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6a, 0x6f, 0x69, 0x6e, 0x6e, 0x75, 0x6d,
+	0x12, 0x14, 0x0a, 0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/moonfantasy_msg.pb.go

@@ -129,7 +129,8 @@ type MoonfantasyDareReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid"` //唯一id
+	Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //发布者用户id
+	Mid string `protobuf:"bytes,2,opt,name=mid,proto3" json:"mid"` //唯一id
 }
 
 func (x *MoonfantasyDareReq) Reset() {
@@ -164,6 +165,13 @@ func (*MoonfantasyDareReq) Descriptor() ([]byte, []int) {
 	return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{2}
 }
 
+func (x *MoonfantasyDareReq) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
 func (x *MoonfantasyDareReq) GetMid() string {
 	if x != nil {
 		return x.Mid
@@ -230,14 +238,15 @@ var file_moonfantasy_moonfantasy_msg_proto_rawDesc = []byte{
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x10,
 	0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64,
 	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x22, 0x26, 0x0a, 0x12, 0x4d, 0x6f,
+	0x05, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x22, 0x38, 0x0a, 0x12, 0x4d, 0x6f,
 	0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x52, 0x65, 0x71,
-	0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73,
+	0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x79, 0x44, 0x61, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
+	0x03, 0x6d, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74,
-	0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+	0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
-	0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
-	0x33,
+	0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (

pb/userexpand.pb.go

@@ -377,15 +377,17 @@ type DBUserExpand struct {
 	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"`          // 图鉴
+	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"` //形象预设
 	Activeday              int32             `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"`                                                                                           //日活跃度
 	Activeweek             int32             `protobuf:"varint,12,opt,name=activeweek,proto3" json:"activeweek"`                                                                                         //周活跃度
 	Sign                   string            `protobuf:"bytes,13,opt,name=sign,proto3" json:"sign"`                                                                                                      //用户签名
-	FriendPoint       int32             `protobuf:"varint,14,opt,name=friendPoint,proto3" json:"friendPoint"`                                                                                       //友情点
+	FriendPoint            int32             `protobuf:"varint,14,opt,name=friendPoint,proto3" json:"friendPoint" bson:"friendPoint"`                                                                    //友情点
-	FriendPointID     int32             `protobuf:"varint,15,opt,name=friendPointID,proto3" json:"friendPointID"`                                                                                   //每日获赠友情点
+	FriendPointID          int32             `protobuf:"varint,15,opt,name=friendPointID,proto3" json:"friendPointID" bson:"friendPointID"`                                                              //每日获赠友情点
-	FriendPointOD     int32             `protobuf:"varint,16,opt,name=friendPointOD,proto3" json:"friendPointOD"`                                                                                   //每日送出友情点
+	FriendPointOD          int32             `protobuf:"varint,16,opt,name=friendPointOD,proto3" json:"friendPointOD" bson:"friendPointOD"`                                                              //每日送出友情点
+	MoonfantasyTriggerNum  int32             `protobuf:"varint,17,opt,name=moonfantasyTriggerNum,proto3" json:"moonfantasyTriggerNum" bson:"moonfantasyTriggerNum"`                                      //  月之秘境触发次数
+	MoonfantasyLastTrigger int64             `protobuf:"varint,18,opt,name=moonfantasyLastTrigger,proto3" json:"moonfantasyLastTrigger" bson:"moonfantasyTriggerlast"`                                   // 月之秘境最后触发时间
 }
 
 func (x *DBUserExpand) Reset() {
@@ -532,6 +534,20 @@ func (x *DBUserExpand) GetFriendPointOD() int32 {
 	return 0
 }
 
+func (x *DBUserExpand) GetMoonfantasyTriggerNum() int32 {
+	if x != nil {
+		return x.MoonfantasyTriggerNum
+	}
+	return 0
+}
+
+func (x *DBUserExpand) GetMoonfantasyLastTrigger() int64 {
+	if x != nil {
+		return x.MoonfantasyLastTrigger
+	}
+	return 0
+}
+
 var File_userexpand_proto protoreflect.FileDescriptor
 
 var file_userexpand_proto_rawDesc = []byte{
@@ -560,7 +576,7 @@ var file_userexpand_proto_rawDesc = []byte{
 	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, 0xcf, 0x05, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65,
+	0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0xbd, 0x06, 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,
@@ -597,16 +613,23 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x52, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x12,
 	0x24, 0x0a, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4f, 0x44,
 	0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f,
-	0x69, 0x6e, 0x74, 0x4f, 0x44, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45,
+	0x69, 0x6e, 0x74, 0x4f, 0x44, 0x12, 0x34, 0x0a, 0x15, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x74, 0x61, 0x73, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x11,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x16, 0x6d,
-	0x1a, 0x46, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e,
+	0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x72,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x12, 0x20, 0x01, 0x28, 0x03, 0x52, 0x16, 0x6d, 0x6f, 0x6f,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x72, 0x69, 0x67,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x05, 0x76,
+	0x67, 0x65, 0x72, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	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 (