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

上传代码
2024-03-08 17:48:27 +08:00 · 2024-03-08 17:48:22 +08:00
20 changed files with 948 additions and 350 deletions
--- a/bin/json/game_arenarealtimeopentime.json
+++ b/bin/json/game_arenarealtimeopentime.json
@ -0,0 +1,30 @@
+[
+  {
+    "Id": 1,
+    "OpenTime": 86400,
+    "DurationTime": 28800,
+    "IntervalTime": 0,
+    "CycleIndex": 0
+  },
+  {
+    "Id": 2,
+    "OpenTime": 0,
+    "DurationTime": 28800,
+    "IntervalTime": 3600,
+    "CycleIndex": 0
+  },
+  {
+    "Id": 3,
+    "OpenTime": 0,
+    "DurationTime": 28800,
+    "IntervalTime": 3600,
+    "CycleIndex": 0
+  },
+  {
+    "Id": 4,
+    "OpenTime": 0,
+    "DurationTime": 28800,
+    "IntervalTime": 3600,
+    "CycleIndex": -1
+  }
+]
--- a/comm/imodule.go
+++ b/comm/imodule.go
@ -500,7 +500,7 @@ type (
 		//用户离线
 		UserOffline(roomid string, uid string) (err error)
 		//创建pvp战斗
-		CreateRoomById(id string, ptype pb.PlayType, sessions []IUserSession, uinfos []*pb.BaseUserInfo) (err error)
+		AddAndStartRoom(id string, ptype pb.PlayType, sessions []IUserSession, uinfos []*pb.BaseUserInfo, formations []*pb.BattleFormation) (err error)
 	}

 	ISmithy interface {
--- a/modules/hero/api_awakenreward.go
+++ b/modules/hero/api_awakenreward.go
@ -86,7 +86,7 @@ func (this *apiComp) AwakenReward(session comm.IUserSession, req *pb.HeroAwakenR
 		}
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroAwakenRewardResp{
+	session.SendMsg(string(this.module.GetType()), "awakenreward", &pb.HeroAwakenRewardResp{
 		Heroid:       req.Heroid,
 		Awakenreward: hero.Awakenreward,
 		Atno:         atno,
--- a/modules/hero/api_lvreward.go
+++ b/modules/hero/api_lvreward.go
@ -91,7 +91,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.HeroLvRewardReq
 		}
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroLvRewardResp{
+	session.SendMsg(string(this.module.GetType()), "lvreward", &pb.HeroLvRewardResp{
 		Heroid:   req.Heroid,
 		Lvreward: hero.Lvreward,
 		Atno:     atno,
--- a/modules/matchpool/pool.go
+++ b/modules/matchpool/pool.go
@ -87,10 +87,12 @@ locp:
 			group = append(group, players[0:this.MatchNum]...)
 			break locp
 		} else {
-			for _, player := range players {
-				if player.Time >= this.Timeout {
-					group = append(group, players...)
-					break locp
+			if this.Timeout > 0 {
+				for _, player := range players {
+					if player.Time >= this.Timeout {
+						group = append(group, players...)
+						break locp
+					}
 				}
 			}
 		}
--- a/modules/practice/module.go
+++ b/modules/practice/module.go
@ -341,6 +341,8 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) {
 	this.modelPandata.Change(bule, map[string]interface{}{
 		"statuers": buleroom.Statuers,
 	})
+
+	this.SendMsgToUsers(string(this.GetType()), "qiecuofinish", &pb.PracticeQiecuoFinishPush{Winside: winSide})
 }

 // 解锁武馆柱子
--- a/modules/pvp/module.go
+++ b/modules/pvp/module.go
@ -157,22 +157,24 @@ func (this *Pvp) CreateRoom(sessions []comm.IUserSession, rulesStr string) (room
 }

 // 创建Pvp
-func (this *Pvp) CreateRoomById(id string, ptype pb.PlayType, sessions []comm.IUserSession, uinfos []*pb.BaseUserInfo) (err error) {
+func (this *Pvp) AddAndStartRoom(id string, ptype pb.PlayType, sessions []comm.IUserSession, uinfos []*pb.BaseUserInfo, formations []*pb.BattleFormation) (err error) {
 	this.Debug("CreatePvp", log.Field{Key: "ptype", Value: ptype}, log.Field{Key: "sessions", Value: sessions})
 	var (
 		battle *BattleItem
 	)

 	battle = &BattleItem{
-		Id:          id,
-		PlayType:    ptype,
-		State:       pb.PvpState_ready,
-		RedSession:  sessions[0],
-		BlueSession: sessions[1],
-		Red:         uinfos[0],
-		Blue:        uinfos[1],
-		readytimer:  timewheel.Add(time.Second*60, this.readyTimeOut, id),
-		curroperate: &pb.ComWaitInputSkill{},
+		Id:            id,
+		PlayType:      ptype,
+		State:         pb.PvpState_ready,
+		RedSession:    sessions[0],
+		BlueSession:   sessions[1],
+		Red:           uinfos[0],
+		Blue:          uinfos[1],
+		Redformation:  formations[0],
+		Blueformation: formations[1],
+		readytimer:    timewheel.Add(time.Second*60, this.readyTimeOut, id),
+		curroperate:   &pb.ComWaitInputSkill{},
 	}

 	this.lock.Lock()
--- a/modules/realarena/api_battleexit.go
+++ b/modules/realarena/api_battleexit.go
@ -0,0 +1,45 @@
+package realarena
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+//参数校验
+func (this *apiComp) BattleExitCheck(session comm.IUserSession, req *pb.RealArenaBattleExitReq) (errdata *pb.ErrorData) {
+	return
+}
+
+///取消匹配
+func (this *apiComp) BattleExit(session comm.IUserSession, req *pb.RealArenaBattleExitReq) (errdata *pb.ErrorData) {
+	var (
+		room *Room
+		ok   bool
+		err  error
+	)
+	if errdata = this.BattleExitCheck(session, req); errdata != nil {
+		return
+	}
+
+	this.module.lock.RLock()
+	room, ok = this.module.rooms[req.Roomid]
+	this.module.lock.RUnlock()
+	if ok {
+		if err = room.UserOffline(session.GetUserId()); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ReqParameterError,
+				Message: err.Error(),
+			}
+			return
+		}
+	} else {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ReqParameterError,
+			Message: "no found room",
+		}
+		return
+	}
+
+	session.SendMsg(string(this.module.GetType()), "matchcancel", &pb.RealArenaMatchCancelResp{})
+	return
+}
--- a/modules/realarena/api_match.go
+++ b/modules/realarena/api_match.go
@ -40,6 +40,16 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.RealArenaMatchReq)
 		}
 		return
 	}
+	if err = this.module.model.change(session.GetUserId(), map[string]interface{}{
+		"state": 1,
+	}); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
 	session.SendMsg(string(this.module.GetType()), "match", &pb.RealArenaInfoResp{})
 	return
 }
--- a/modules/realarena/api_matchcancel.go
+++ b/modules/realarena/api_matchcancel.go
@ -48,6 +48,6 @@ func (this *apiComp) MatchCancel(session comm.IUserSession, req *pb.RealArenaMat
 			return
 		}
 	}
-	session.SendMsg(string(this.module.GetType()), "racematchcancel", &pb.ParkourRaceMatchCancelResp{})
+	session.SendMsg(string(this.module.GetType()), "matchcancel", &pb.RealArenaMatchCancelResp{})
 	return
 }
--- a/modules/realarena/api_rank.go
+++ b/modules/realarena/api_rank.go
@ -0,0 +1,83 @@
+package realarena
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+// 参数校验
+func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.RealArenaRankReq) (errdata *pb.ErrorData) {
+
+	return
+}
+
+// /排行榜获取
+func (this *apiComp) Rank(session comm.IUserSession, req *pb.RealArenaRankReq) (errdata *pb.ErrorData) {
+	var (
+		info     *pb.DBRealArena
+		uids     []string
+		ranks    []*pb.DBRealArena
+		ranksMap map[string]*pb.DBRealArena
+		players  []*pb.DBRealArena
+		err      error
+	)
+
+	if errdata = this.RankCheck(session, req); errdata != nil {
+		return
+	}
+	if info, err = this.module.model.getinfo(session); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	if uids, err = this.module.modelRank.queryRankUser(); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	if ranks, err = this.module.model.getinfos(uids); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	ranksMap = make(map[string]*pb.DBRealArena)
+	for _, v := range ranks {
+		ranksMap[v.Uid] = v
+	}
+	players = make([]*pb.DBRealArena, 0, len(uids))
+	for i, v := range uids {
+		if player, ok := ranksMap[v]; ok {
+			rank := int32(i + 1)
+			players = append(players, &pb.DBRealArena{
+				Uinfo:    player.Uinfo,
+				Dan:      player.Dan,
+				Rank:     rank,
+				Integral: player.Integral,
+			})
+			if session.GetUserId() == player.Uinfo.Uid && info.Rank != rank {
+				info.Rank = rank
+				if err = this.module.model.change(info.Uid, map[string]interface{}{
+					"rank": info.Rank,
+				}); err != nil {
+					errdata = &pb.ErrorData{
+						Code:    pb.ErrorCode_DBError,
+						Title:   pb.ErrorCode_DBError.ToString(),
+						Message: err.Error(),
+					}
+				}
+			}
+		}
+
+	}
+	session.SendMsg(string(this.module.GetType()), "rank", &pb.RealArenaRankResp{Rank: players})
+	return
+}
--- a/modules/realarena/match.go
+++ b/modules/realarena/match.go
@ -47,7 +47,7 @@ func (this *matchComp) MatchReq(info *pb.DBRealArenaMember) (err error) {
 			Dan:      info.Dan,
 			Data:     data,
 			Matchnum: 2,
-			Timeout:  10,
+			Timeout:  -1,
 		},
 		&pb.JoinMatchPoolResp{})
 	if err != nil {
@ -80,6 +80,7 @@ func (this *matchComp) MatchNotic(players map[string]interface{}) (err error) {

 	if room, err = this.module.createroom(red, bule); err != nil {
 		this.module.Error("createbattle err!", log.Field{Key: "key", Value: err.Error()})
+		return
 	}
 	room.init()
 	return
--- a/modules/realarena/model.go
+++ b/modules/realarena/model.go
@ -34,16 +34,14 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor
 }

 // 更新埋点数据到db中
-func (this *modelComp) getmodel(uid string) (model *realArenaModel, err error) {
-	var m *db.DBModel
-	if db.IsCross() {
-		if m, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
-			return
-		}
-		model = &realArenaModel{module: this.module, model: m}
-	} else {
-		model = &realArenaModel{module: this.module, model: this.DBModel}
+func (this *modelComp) getmodel() (model *realArenaModel, err error) {
+	var (
+		m *db.DBModel
+	)
+	if m, err = this.module.GetCrossDBModel(this.TableName); err != nil {
+		return
 	}
+	model = &realArenaModel{module: this.module, model: m}
 	return
 }

@ -52,19 +50,31 @@ func (this *modelComp) getinfo(session comm.IUserSession) (info *pb.DBRealArena,
 	var (
 		model *realArenaModel
 	)
-	if model, err = this.getmodel(session.GetUserId()); err != nil {
+	if model, err = this.getmodel(); err != nil {
 		return
 	}
 	info, err = model.getinfo(session)
 	return
 }

+func (this *modelComp) getinfos(uIds []string) (infos []*pb.DBRealArena, err error) {
+	var (
+		model *realArenaModel
+	)
+
+	if model, err = this.getmodel(); err != nil {
+		return
+	}
+	infos, err = model.getinfos(uIds)
+	return
+}
+
 // /查询用户的武器背包
 func (this *modelComp) getinfobyuid(uid string) (info *pb.DBRealArena, err error) {
 	var (
 		model *realArenaModel
 	)
-	if model, err = this.getmodel(uid); err != nil {
+	if model, err = this.getmodel(); err != nil {
 		return
 	}
 	info, err = model.getinfobyuid(uid)
@ -76,7 +86,7 @@ func (this *modelComp) change(uid string, update map[string]interface{}) (err er
 	var (
 		model *realArenaModel
 	)
-	if model, err = this.getmodel(uid); err != nil {
+	if model, err = this.getmodel(); err != nil {
 		return
 	}
 	err = model.change(uid, update)
@ -166,14 +176,27 @@ func (this *realArenaModel) getinfo(session comm.IUserSession) (info *pb.DBRealA
 		return
 	}
 	info = &pb.DBRealArena{
-		Id:    primitive.NewObjectID().Hex(),
-		Uid:   session.GetUserId(),
-		Uinfo: comm.GetUserBaseInfo(user),
+		Id:       primitive.NewObjectID().Hex(),
+		Uid:      session.GetUserId(),
+		Uinfo:    comm.GetUserBaseInfo(user),
+		Dan:      1,
+		Integral: 0,
+		Danaward: make(map[int32]int32),
 	}
 	err = this.model.Add(session.GetUserId(), info)
 	return
 }

+// 查询用户装备数据
+func (this *realArenaModel) getinfos(uIds []string) (result []*pb.DBRealArena, err error) {
+	result = make([]*pb.DBRealArena, 0)
+	if _, err = this.model.GetByUids(uIds, &result); err != nil && err != mgo.MongodbNil {
+		this.module.Errorln(err)
+		return
+	}
+	return
+}
+
 // /查询用户的武器背包
 func (this *realArenaModel) getinfobyuid(uid string) (info *pb.DBRealArena, err error) {
 	info = &pb.DBRealArena{}
--- a/modules/realarena/module.go
+++ b/modules/realarena/module.go
@ -47,6 +47,7 @@ func (this *RealArena) Init(service core.IService, module core.IModule, options
 	if err = this.ModuleBase.Init(service, module, options); err != nil {
 		return
 	}
+	this.rooms = make(map[string]*Room)
 	this.service = service.(base.IRPCXService)
 	return
 }
@ -82,6 +83,7 @@ func (this *RealArena) createroom(red, bule *pb.DBRealArenaMember) (room *Room,
 	)
 	room = &Room{
 		Id:          primitive.NewObjectID().Hex(),
+		module:      this,
 		ServicePath: fmt.Sprintf("%s/%s", this.service.GetType(), this.service.GetId()),
 		sessions:    make([]comm.IUserSession, 0),
 		members:     make([]*pb.DBRealArenaMember, 0),
@ -179,6 +181,7 @@ func (this *RealArena) endgame(ctx context.Context, req *pb.RPC_RealArenaTrustee

 //战斗结束
 func (this *RealArena) ChallengeResults(roomid, red, bule string, winSide int32) {
+	this.Debug("ChallengeResults", log.Field{Key: "roomid", Value: roomid})
 	var (
 		room *Room
 		ok   bool
--- a/modules/realarena/romm.go
+++ b/modules/realarena/romm.go
@ -17,7 +17,7 @@ type Room struct {
 	sessions    []comm.IUserSession
 	members     []*pb.DBRealArenaMember
 	state       int    //0 无状态 1选择英雄阶段 2禁用英雄阶段 3选择队长阶段 4战斗中
-	step        int    //阶段
+	step        int    // 阶段
 	handle      string // 操作玩家
 }

@ -31,11 +31,11 @@ func (this *Room) init() (err error) {
 		},
 	})
 	this.handle = this.members[0].User.Uid
-	this.step = 0
+	this.step = 1
 	this.PushMessage("startselecthero", &pb.RealArenaStartSelectHeroPush{
 		Uid:       this.members[0].User.Uid,
-		Num:       2,
-		Countdown: 10,
+		Num:       1,
+		Countdown: 60,
 	})
 	return
 }
@ -62,6 +62,7 @@ func (this *Room) selectheros(uid string, heros []*pb.HeroBase) (err error) {
 			this.handle = v.User.Uid
 		}
 	}
+	this.step++
 	switch this.step {
 	case 1, 6:
 		num = 1
@ -73,22 +74,21 @@ func (this *Room) selectheros(uid string, heros []*pb.HeroBase) (err error) {
 		num = 1
 		break
 	}
-	this.PushMessage("startselecthero", &pb.RealArenaSelectHeroPush{
-		Uid:   this.members[0].User.Uid,
+	this.PushMessage("selecthero", &pb.RealArenaSelectHeroPush{
+		Uid:   uid,
 		Heros: heros,
 	})

-	this.step++
 	if this.step == 7 { //选完了
-		this.PushMessage("startdisableHero", &pb.RealArenaStartDisableHeroPush{
+		this.PushMessage("startdisablehero", &pb.RealArenaStartDisableHeroPush{
 			Uid:       this.members[1].User.Uid,
-			Countdown: 10,
+			Countdown: 60,
 		})
 	} else {
 		this.PushMessage("startselecthero", &pb.RealArenaStartSelectHeroPush{
 			Uid:       this.handle,
 			Num:       num,
-			Countdown: 10,
+			Countdown: 60,
 		})
 	}
 	return
@ -112,12 +112,12 @@ func (this *Room) disableheros(uid string, index int32) (err error) {
 	})
 	if finish {
 		this.PushMessage("startselectleader", &pb.RealArenaStartSelectLeaderPush{
-			Countdown: 10,
+			Countdown: 60,
 		})
 	} else {
-		this.PushMessage("startdisableHero", &pb.RealArenaStartDisableHeroPush{
+		this.PushMessage("startdisablehero", &pb.RealArenaStartDisableHeroPush{
 			Uid:       this.members[0].User.Uid,
-			Countdown: 10,
+			Countdown: 60,
 		})
 	}
 	return
@ -140,20 +140,27 @@ func (this *Room) selectleader(uid string, index int32) (err error) {
 		Index: index,
 	})
 	if finish {
-		var uinfos []*pb.BaseUserInfo = make([]*pb.BaseUserInfo, 0)
-		uinfos = append(uinfos, this.members[0].User, this.members[1].User)
-		err = this.module.pvp.CreateRoomById(this.Id, pb.PlayType_realarena, this.sessions, uinfos)
+		// var (
+		// 	uinfos     []*pb.BaseUserInfo    = make([]*pb.BaseUserInfo, 0)
+		// 	formations []*pb.BattleFormation = make([]*pb.BattleFormation, 0)
+		// )
+		// uinfos = append(uinfos, this.members[0].User, this.members[1].User)
+		// formations = append(formations,
+		// 	&pb.BattleFormation{Leadpos: this.members[0].Leader, Format: this.members[0].Heros},
+		// 	&pb.BattleFormation{Leadpos: this.members[1].Leader, Format: this.members[1].Heros},
+		// )
+		// err = this.module.pvp.AddAndStartRoom(this.Id, pb.PlayType_realarena, this.sessions, uinfos, formations)
 	}
-
 	return
 }

-func (this *Room) UserOffline(uid string) {
+func (this *Room) UserOffline(uid string) (err error) {
 	var winSide int32 = 1
 	if this.members[0].User.Uid == uid {
 		winSide = 2
 	}
 	this.module.ChallengeResults(this.Id, this.members[0].User.Uid, this.members[1].User.Uid, winSide)
+	return
 }

 func (this *Room) ChallengeResults(winSide int32) {
@ -234,5 +241,5 @@ func (this *Room) ChallengeResults(winSide int32) {
 }

 func (this *Room) PushMessage(stype string, msg proto.Message) {
-	this.module.SendMsgToSession(string(this.module.GetType()), stype, msg, this.sessions...)
+	this.module.SendMsgSyncToSession(string(this.module.GetType()), stype, msg, this.sessions...)
 }
--- a/pb/practice_msg.pb.go
+++ b/pb/practice_msg.pb.go
@ -1893,6 +1893,54 @@ func (x *PracticeQiecuonotifyPush) GetNotifyType() int32 {
 	return 0
 }

+//好友切磋结束推送
+type PracticeQiecuoFinishPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Winside int32 `protobuf:"varint,1,opt,name=winside,proto3" json:"winside"`
+}
+
+func (x *PracticeQiecuoFinishPush) Reset() {
+	*x = PracticeQiecuoFinishPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[36]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeQiecuoFinishPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeQiecuoFinishPush) ProtoMessage() {}
+
+func (x *PracticeQiecuoFinishPush) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[36]
+	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 PracticeQiecuoFinishPush.ProtoReflect.Descriptor instead.
+func (*PracticeQiecuoFinishPush) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{36}
+}
+
+func (x *PracticeQiecuoFinishPush) GetWinside() int32 {
+	if x != nil {
+		return x.Winside
+	}
+	return 0
+}
+
 //NPC战斗请求
 type PracticeNPCBattkleReq struct {
 	state         protoimpl.MessageState
@ -1905,7 +1953,7 @@ type PracticeNPCBattkleReq struct {
 func (x *PracticeNPCBattkleReq) Reset() {
 	*x = PracticeNPCBattkleReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_practice_practice_msg_proto_msgTypes[36]
+		mi := &file_practice_practice_msg_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@ -1918,7 +1966,7 @@ func (x *PracticeNPCBattkleReq) String() string {
 func (*PracticeNPCBattkleReq) ProtoMessage() {}

 func (x *PracticeNPCBattkleReq) ProtoReflect() protoreflect.Message {
-	mi := &file_practice_practice_msg_proto_msgTypes[36]
+	mi := &file_practice_practice_msg_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@ -1931,7 +1979,7 @@ func (x *PracticeNPCBattkleReq) ProtoReflect() protoreflect.Message {

 // Deprecated: Use PracticeNPCBattkleReq.ProtoReflect.Descriptor instead.
 func (*PracticeNPCBattkleReq) Descriptor() ([]byte, []int) {
-	return file_practice_practice_msg_proto_rawDescGZIP(), []int{36}
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{37}
 }

 func (x *PracticeNPCBattkleReq) GetFormation() *BattleFormation {
@ -1954,7 +2002,7 @@ type PracticeNPCBattkleResp struct {
 func (x *PracticeNPCBattkleResp) Reset() {
 	*x = PracticeNPCBattkleResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_practice_practice_msg_proto_msgTypes[37]
+		mi := &file_practice_practice_msg_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@ -1967,7 +2015,7 @@ func (x *PracticeNPCBattkleResp) String() string {
 func (*PracticeNPCBattkleResp) ProtoMessage() {}

 func (x *PracticeNPCBattkleResp) ProtoReflect() protoreflect.Message {
-	mi := &file_practice_practice_msg_proto_msgTypes[37]
+	mi := &file_practice_practice_msg_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@ -1980,7 +2028,7 @@ func (x *PracticeNPCBattkleResp) ProtoReflect() protoreflect.Message {

 // Deprecated: Use PracticeNPCBattkleResp.ProtoReflect.Descriptor instead.
 func (*PracticeNPCBattkleResp) Descriptor() ([]byte, []int) {
-	return file_practice_practice_msg_proto_rawDescGZIP(), []int{37}
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{38}
 }

 func (x *PracticeNPCBattkleResp) GetCode() ErrorCode {
@ -2009,7 +2057,7 @@ type PracticeNPCBattkleFinishReq struct {
 func (x *PracticeNPCBattkleFinishReq) Reset() {
 	*x = PracticeNPCBattkleFinishReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_practice_practice_msg_proto_msgTypes[38]
+		mi := &file_practice_practice_msg_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@ -2022,7 +2070,7 @@ func (x *PracticeNPCBattkleFinishReq) String() string {
 func (*PracticeNPCBattkleFinishReq) ProtoMessage() {}

 func (x *PracticeNPCBattkleFinishReq) ProtoReflect() protoreflect.Message {
-	mi := &file_practice_practice_msg_proto_msgTypes[38]
+	mi := &file_practice_practice_msg_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@ -2035,7 +2083,7 @@ func (x *PracticeNPCBattkleFinishReq) ProtoReflect() protoreflect.Message {

 // Deprecated: Use PracticeNPCBattkleFinishReq.ProtoReflect.Descriptor instead.
 func (*PracticeNPCBattkleFinishReq) Descriptor() ([]byte, []int) {
-	return file_practice_practice_msg_proto_rawDescGZIP(), []int{38}
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{39}
 }

 func (x *PracticeNPCBattkleFinishReq) GetReport() *BattleReport {
@ -2059,7 +2107,7 @@ type PracticeNPCBattkleFinishResp struct {
 func (x *PracticeNPCBattkleFinishResp) Reset() {
 	*x = PracticeNPCBattkleFinishResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_practice_practice_msg_proto_msgTypes[39]
+		mi := &file_practice_practice_msg_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@ -2072,7 +2120,7 @@ func (x *PracticeNPCBattkleFinishResp) String() string {
 func (*PracticeNPCBattkleFinishResp) ProtoMessage() {}

 func (x *PracticeNPCBattkleFinishResp) ProtoReflect() protoreflect.Message {
-	mi := &file_practice_practice_msg_proto_msgTypes[39]
+	mi := &file_practice_practice_msg_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@ -2085,7 +2133,7 @@ func (x *PracticeNPCBattkleFinishResp) ProtoReflect() protoreflect.Message {

 // Deprecated: Use PracticeNPCBattkleFinishResp.ProtoReflect.Descriptor instead.
 func (*PracticeNPCBattkleFinishResp) Descriptor() ([]byte, []int) {
-	return file_practice_practice_msg_proto_rawDescGZIP(), []int{39}
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{40}
 }

 func (x *PracticeNPCBattkleFinishResp) GetIssucc() bool {
@ -2119,7 +2167,7 @@ type PracticeNPCDialogReq struct {
 func (x *PracticeNPCDialogReq) Reset() {
 	*x = PracticeNPCDialogReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_practice_practice_msg_proto_msgTypes[40]
+		mi := &file_practice_practice_msg_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@ -2132,7 +2180,7 @@ func (x *PracticeNPCDialogReq) String() string {
 func (*PracticeNPCDialogReq) ProtoMessage() {}

 func (x *PracticeNPCDialogReq) ProtoReflect() protoreflect.Message {
-	mi := &file_practice_practice_msg_proto_msgTypes[40]
+	mi := &file_practice_practice_msg_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@ -2145,7 +2193,7 @@ func (x *PracticeNPCDialogReq) ProtoReflect() protoreflect.Message {

 // Deprecated: Use PracticeNPCDialogReq.ProtoReflect.Descriptor instead.
 func (*PracticeNPCDialogReq) Descriptor() ([]byte, []int) {
-	return file_practice_practice_msg_proto_rawDescGZIP(), []int{40}
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{41}
 }

 //NPC对话 请求
@ -2160,7 +2208,7 @@ type PracticeNPCDialogResp struct {
 func (x *PracticeNPCDialogResp) Reset() {
 	*x = PracticeNPCDialogResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_practice_practice_msg_proto_msgTypes[41]
+		mi := &file_practice_practice_msg_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@ -2173,7 +2221,7 @@ func (x *PracticeNPCDialogResp) String() string {
 func (*PracticeNPCDialogResp) ProtoMessage() {}

 func (x *PracticeNPCDialogResp) ProtoReflect() protoreflect.Message {
-	mi := &file_practice_practice_msg_proto_msgTypes[41]
+	mi := &file_practice_practice_msg_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@ -2186,7 +2234,7 @@ func (x *PracticeNPCDialogResp) ProtoReflect() protoreflect.Message {

 // Deprecated: Use PracticeNPCDialogResp.ProtoReflect.Descriptor instead.
 func (*PracticeNPCDialogResp) Descriptor() ([]byte, []int) {
-	return file_practice_practice_msg_proto_rawDescGZIP(), []int{41}
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{42}
 }

 func (x *PracticeNPCDialogResp) GetIssucc() bool {
@ -2379,41 +2427,45 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
 	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
 	0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x47, 0x0a, 0x15,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b,
-	0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
-	0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e,
-	0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12,
-	0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
-	0x22, 0x44, 0x0a, 0x1b, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42,
-	0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12,
-	0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xd9, 0x01, 0x0a, 0x1c, 0x50, 0x72, 0x61, 0x63, 0x74,
-	0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e,
-	0x69, 0x73, 0x68, 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,
-	0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
-	0x12, 0x44, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42,
-	0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70,
-	0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68,
-	0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78,
-	0x70, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50,
-	0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x34, 0x0a, 0x18,
+	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x46, 0x69,
+	0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73,
+	0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69,
+	0x64, 0x65, 0x22, 0x47, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50,
+	0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50,
+	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52,
+	0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x1b, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
+	0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69,
+	0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xd9, 0x01, 0x0a,
+	0x1c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74,
+	0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 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, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
+	0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x44, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78,
+	0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
+	0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69,
+	0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c,
+	0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 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, 0x05, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63,
+	0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x71,
+	0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44,
+	0x69, 0x61, 0x6c, 0x6f, 0x67, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }

 var (
@ -2428,7 +2480,7 @@ func file_practice_practice_msg_proto_rawDescGZIP() []byte {
 	return file_practice_practice_msg_proto_rawDescData
 }

-var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 47)
+var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 48)
 var file_practice_practice_msg_proto_goTypes = []interface{}{
 	(*PracticeInfoReq)(nil),              // 0: PracticeInfoReq
 	(*PracticeInfoResp)(nil),             // 1: PracticeInfoResp
@ -2466,53 +2518,54 @@ var file_practice_practice_msg_proto_goTypes = []interface{}{
 	(*PracticeRefuseReq)(nil),            // 33: PracticeRefuseReq
 	(*PracticeRefuseResp)(nil),           // 34: PracticeRefuseResp
 	(*PracticeQiecuonotifyPush)(nil),     // 35: PracticeQiecuonotifyPush
-	(*PracticeNPCBattkleReq)(nil),        // 36: PracticeNPCBattkleReq
-	(*PracticeNPCBattkleResp)(nil),       // 37: PracticeNPCBattkleResp
-	(*PracticeNPCBattkleFinishReq)(nil),  // 38: PracticeNPCBattkleFinishReq
-	(*PracticeNPCBattkleFinishResp)(nil), // 39: PracticeNPCBattkleFinishResp
-	(*PracticeNPCDialogReq)(nil),         // 40: PracticeNPCDialogReq
-	(*PracticeNPCDialogResp)(nil),        // 41: PracticeNPCDialogResp
-	nil,                                  // 42: PracticeFriendRommResp.InfosEntry
-	nil,                                  // 43: PracticeExpulsionResp.KnapsackEntry
-	nil,                                  // 44: PracticeBeExpulsionPush.KnapsackEntry
-	nil,                                  // 45: PracticeReceiveResp.KnapsackEntry
-	nil,                                  // 46: PracticeNPCBattkleFinishResp.HeroexpEntry
-	(*DBPracticeRoom)(nil),               // 47: DBPracticeRoom
-	(*DBPracticePillar)(nil),             // 48: DBPracticePillar
-	(*UserAtno)(nil),                     // 49: UserAtno
-	(*DBPvpBattle)(nil),                  // 50: DBPvpBattle
-	(*BattleFormation)(nil),              // 51: BattleFormation
-	(ErrorCode)(0),                       // 52: ErrorCode
-	(*BattleInfo)(nil),                   // 53: BattleInfo
-	(*BattleReport)(nil),                 // 54: BattleReport
-	(*DBPracticeRes)(nil),                // 55: DBPracticeRes
+	(*PracticeQiecuoFinishPush)(nil),     // 36: PracticeQiecuoFinishPush
+	(*PracticeNPCBattkleReq)(nil),        // 37: PracticeNPCBattkleReq
+	(*PracticeNPCBattkleResp)(nil),       // 38: PracticeNPCBattkleResp
+	(*PracticeNPCBattkleFinishReq)(nil),  // 39: PracticeNPCBattkleFinishReq
+	(*PracticeNPCBattkleFinishResp)(nil), // 40: PracticeNPCBattkleFinishResp
+	(*PracticeNPCDialogReq)(nil),         // 41: PracticeNPCDialogReq
+	(*PracticeNPCDialogResp)(nil),        // 42: PracticeNPCDialogResp
+	nil,                                  // 43: PracticeFriendRommResp.InfosEntry
+	nil,                                  // 44: PracticeExpulsionResp.KnapsackEntry
+	nil,                                  // 45: PracticeBeExpulsionPush.KnapsackEntry
+	nil,                                  // 46: PracticeReceiveResp.KnapsackEntry
+	nil,                                  // 47: PracticeNPCBattkleFinishResp.HeroexpEntry
+	(*DBPracticeRoom)(nil),               // 48: DBPracticeRoom
+	(*DBPracticePillar)(nil),             // 49: DBPracticePillar
+	(*UserAtno)(nil),                     // 50: UserAtno
+	(*DBPvpBattle)(nil),                  // 51: DBPvpBattle
+	(*BattleFormation)(nil),              // 52: BattleFormation
+	(ErrorCode)(0),                       // 53: ErrorCode
+	(*BattleInfo)(nil),                   // 54: BattleInfo
+	(*BattleReport)(nil),                 // 55: BattleReport
+	(*DBPracticeRes)(nil),                // 56: DBPracticeRes
 }
 var file_practice_practice_msg_proto_depIdxs = []int32{
-	47, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
-	47, // 1: PracticeRommChangePush.info:type_name -> DBPracticeRoom
-	42, // 2: PracticeFriendRommResp.infos:type_name -> PracticeFriendRommResp.InfosEntry
-	47, // 3: PracticeUnLockResp.info:type_name -> DBPracticeRoom
-	48, // 4: PracticePracticeResp.pillar:type_name -> DBPracticePillar
-	48, // 5: PracticeLootResp.pillar:type_name -> DBPracticePillar
-	48, // 6: PracticeExpulsionResp.pillar:type_name -> DBPracticePillar
-	43, // 7: PracticeExpulsionResp.knapsack:type_name -> PracticeExpulsionResp.KnapsackEntry
-	48, // 8: PracticeBeExpulsionPush.pillar:type_name -> DBPracticePillar
-	44, // 9: PracticeBeExpulsionPush.knapsack:type_name -> PracticeBeExpulsionPush.KnapsackEntry
-	48, // 10: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
-	45, // 11: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
-	49, // 12: PracticeReceiveResp.award:type_name -> UserAtno
-	49, // 13: PracticeGetGymBuffResp.award:type_name -> UserAtno
-	50, // 14: PracticeQiecuoResp.battle:type_name -> DBPvpBattle
-	51, // 15: PracticeNPCBattkleReq.formation:type_name -> BattleFormation
-	52, // 16: PracticeNPCBattkleResp.code:type_name -> ErrorCode
-	53, // 17: PracticeNPCBattkleResp.info:type_name -> BattleInfo
-	54, // 18: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport
-	49, // 19: PracticeNPCBattkleFinishResp.award:type_name -> UserAtno
-	46, // 20: PracticeNPCBattkleFinishResp.heroexp:type_name -> PracticeNPCBattkleFinishResp.HeroexpEntry
-	47, // 21: PracticeFriendRommResp.InfosEntry.value:type_name -> DBPracticeRoom
-	55, // 22: PracticeExpulsionResp.KnapsackEntry.value:type_name -> DBPracticeRes
-	55, // 23: PracticeBeExpulsionPush.KnapsackEntry.value:type_name -> DBPracticeRes
-	55, // 24: PracticeReceiveResp.KnapsackEntry.value:type_name -> DBPracticeRes
+	48, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
+	48, // 1: PracticeRommChangePush.info:type_name -> DBPracticeRoom
+	43, // 2: PracticeFriendRommResp.infos:type_name -> PracticeFriendRommResp.InfosEntry
+	48, // 3: PracticeUnLockResp.info:type_name -> DBPracticeRoom
+	49, // 4: PracticePracticeResp.pillar:type_name -> DBPracticePillar
+	49, // 5: PracticeLootResp.pillar:type_name -> DBPracticePillar
+	49, // 6: PracticeExpulsionResp.pillar:type_name -> DBPracticePillar
+	44, // 7: PracticeExpulsionResp.knapsack:type_name -> PracticeExpulsionResp.KnapsackEntry
+	49, // 8: PracticeBeExpulsionPush.pillar:type_name -> DBPracticePillar
+	45, // 9: PracticeBeExpulsionPush.knapsack:type_name -> PracticeBeExpulsionPush.KnapsackEntry
+	49, // 10: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
+	46, // 11: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
+	50, // 12: PracticeReceiveResp.award:type_name -> UserAtno
+	50, // 13: PracticeGetGymBuffResp.award:type_name -> UserAtno
+	51, // 14: PracticeQiecuoResp.battle:type_name -> DBPvpBattle
+	52, // 15: PracticeNPCBattkleReq.formation:type_name -> BattleFormation
+	53, // 16: PracticeNPCBattkleResp.code:type_name -> ErrorCode
+	54, // 17: PracticeNPCBattkleResp.info:type_name -> BattleInfo
+	55, // 18: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport
+	50, // 19: PracticeNPCBattkleFinishResp.award:type_name -> UserAtno
+	47, // 20: PracticeNPCBattkleFinishResp.heroexp:type_name -> PracticeNPCBattkleFinishResp.HeroexpEntry
+	48, // 21: PracticeFriendRommResp.InfosEntry.value:type_name -> DBPracticeRoom
+	56, // 22: PracticeExpulsionResp.KnapsackEntry.value:type_name -> DBPracticeRes
+	56, // 23: PracticeBeExpulsionPush.KnapsackEntry.value:type_name -> DBPracticeRes
+	56, // 24: PracticeReceiveResp.KnapsackEntry.value:type_name -> DBPracticeRes
 	25, // [25:25] is the sub-list for method output_type
 	25, // [25:25] is the sub-list for method input_type
 	25, // [25:25] is the sub-list for extension type_name
@ -2964,7 +3017,7 @@ func file_practice_practice_msg_proto_init() {
 			}
 		}
 		file_practice_practice_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PracticeNPCBattkleReq); i {
+			switch v := v.(*PracticeQiecuoFinishPush); i {
 			case 0:
 				return &v.state
 			case 1:
@ -2976,7 +3029,7 @@ func file_practice_practice_msg_proto_init() {
 			}
 		}
 		file_practice_practice_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PracticeNPCBattkleResp); i {
+			switch v := v.(*PracticeNPCBattkleReq); i {
 			case 0:
 				return &v.state
 			case 1:
@ -2988,7 +3041,7 @@ func file_practice_practice_msg_proto_init() {
 			}
 		}
 		file_practice_practice_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PracticeNPCBattkleFinishReq); i {
+			switch v := v.(*PracticeNPCBattkleResp); i {
 			case 0:
 				return &v.state
 			case 1:
@ -3000,7 +3053,7 @@ func file_practice_practice_msg_proto_init() {
 			}
 		}
 		file_practice_practice_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PracticeNPCBattkleFinishResp); i {
+			switch v := v.(*PracticeNPCBattkleFinishReq); i {
 			case 0:
 				return &v.state
 			case 1:
@ -3012,7 +3065,7 @@ func file_practice_practice_msg_proto_init() {
 			}
 		}
 		file_practice_practice_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PracticeNPCDialogReq); i {
+			switch v := v.(*PracticeNPCBattkleFinishResp); i {
 			case 0:
 				return &v.state
 			case 1:
@ -3024,6 +3077,18 @@ func file_practice_practice_msg_proto_init() {
 			}
 		}
 		file_practice_practice_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeNPCDialogReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PracticeNPCDialogResp); i {
 			case 0:
 				return &v.state
@ -3042,7 +3107,7 @@ func file_practice_practice_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_practice_practice_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   47,
+			NumMessages:   48,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
--- a/pb/realarena_msg.pb.go
+++ b/pb/realarena_msg.pb.go
--- a/sys/configure/structs/Game.ArenarealtimeOpentime.go
+++ b/sys/configure/structs/Game.ArenarealtimeOpentime.go
@ -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 GameArenarealtimeOpentime struct {
+    _dataMap map[int32]*GameArenarealtimeOpentimeData
+    _dataList []*GameArenarealtimeOpentimeData
+}
+
+func NewGameArenarealtimeOpentime(_buf []map[string]interface{}) (*GameArenarealtimeOpentime, error) {
+	_dataList := make([]*GameArenarealtimeOpentimeData, 0, len(_buf))
+	dataMap := make(map[int32]*GameArenarealtimeOpentimeData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameArenarealtimeOpentimeData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameArenarealtimeOpentime{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameArenarealtimeOpentime) GetDataMap() map[int32]*GameArenarealtimeOpentimeData {
+    return table._dataMap
+}
+
+func (table *GameArenarealtimeOpentime) GetDataList() []*GameArenarealtimeOpentimeData {
+    return table._dataList
+}
+
+func (table *GameArenarealtimeOpentime) Get(key int32) *GameArenarealtimeOpentimeData {
+    return table._dataMap[key]
+}
+
+
--- a/sys/configure/structs/Game.ArenarealtimeOpentimeData.go
+++ b/sys/configure/structs/Game.ArenarealtimeOpentimeData.go
@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+// <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 GameArenarealtimeOpentimeData struct {
+    Id int32
+    OpenTime int32
+    DurationTime int32
+    IntervalTime int32
+    CycleIndex int32
+}
+
+const TypeId_GameArenarealtimeOpentimeData = 905819127
+
+func (*GameArenarealtimeOpentimeData) GetTypeId() int32 {
+    return 905819127
+}
+
+func (_v *GameArenarealtimeOpentimeData)Deserialize(_buf map[string]interface{}) (err error) {
+    { 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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["OpenTime"].(float64); !_ok_ { err = errors.New("OpenTime error"); return }; _v.OpenTime = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DurationTime"].(float64); !_ok_ { err = errors.New("DurationTime error"); return }; _v.DurationTime = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["IntervalTime"].(float64); !_ok_ { err = errors.New("IntervalTime error"); return }; _v.IntervalTime = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CycleIndex"].(float64); !_ok_ { err = errors.New("CycleIndex error"); return }; _v.CycleIndex = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameArenarealtimeOpentimeData(_buf map[string]interface{}) (*GameArenarealtimeOpentimeData, error) {
+    v := &GameArenarealtimeOpentimeData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@ -366,6 +366,7 @@ type Tables struct {
    ArenarealtimeConfig *GameArenarealtimeConfig
    ArenarealtimeWinStreak *GameArenarealtimeWinStreak
    ArenarealtimeRankreward *GameArenarealtimeRankreward
+    ArenarealtimeOpentime *GameArenarealtimeOpentime
 }

 func NewTables(loader JsonLoader) (*Tables, error) {
@ -2503,5 +2504,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
    if tables.ArenarealtimeRankreward, err = NewGameArenarealtimeRankreward(buf) ; err != nil {
        return nil, err
    }
+    if buf, err = loader("game_arenarealtimeopentime") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenarealtimeOpentime, err = NewGameArenarealtimeOpentime(buf) ; err != nil {
+        return nil, err
+    }
    return tables, nil
 }
Author	SHA1	Message	Date
liwei1dao	05fe8fe6f0	Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev	2024-03-08 17:48:27 +08:00
liwei1dao	6ea10fa796	上传代码	2024-03-08 17:48:22 +08:00