diff --git a/comm/const.go b/comm/const.go
index 2a3a5d470..3be37488c 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -334,6 +334,7 @@ const ( //Rpc
 	Rpc_ModuleCaravanSettlement core.Rpc_Key = "Rpc_ModuleCaravanSettlement" //商队比赛结算信息
 
 	Rpc_ModuleBuriedTrigger core.Rpc_Key = "Rpc_ModuleBuriedTrigger" //埋点跨服触发通知
+	Rpc_OpendCond           core.Rpc_Key = "Rpc_OpendCond"
 )
 
 // 事件类型定义处
@@ -350,6 +351,7 @@ const (
 	EventOpenCond core.Event_Key = "event_open_cond" //功能开放事件
 
 	EventBuriedComplete core.Event_Key = "event_buried_complete" //埋点系统条件完成事件批处理接口 接口样例 func(uid string,conids []int32)
+	EventFriendChange   core.Event_Key = "event_friend_change"   //加好友
 )
 
 const (
diff --git a/comm/imodule.go b/comm/imodule.go
index ad584ab33..be7fbc276 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -35,6 +35,9 @@ type (
 		CheckLvUpCond(session IUserSession, lv int32)
 		CheckTaskCond(session IUserSession, id int32)
 		CheckMlineCond(session IUserSession, id int32)
+
+		// 校验好友数量判断功能是否开启
+		CheckFriendCond(session IUserSession, num int32)
 		// 查询opencond 配置
 		CheckOpenCondCfgById(uid string, id string) (bOpen bool, errdata *pb.ErrorData)
 	}
diff --git a/modules/dispatch/api_receive.go b/modules/dispatch/api_receive.go
index 4999b7295..67d0dcd6f 100644
--- a/modules/dispatch/api_receive.go
+++ b/modules/dispatch/api_receive.go
@@ -70,6 +70,16 @@ func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq)
 		if oldTask.Exaward {
 			a.module.DispenseRes(session, gd.Rewardex, true)
 		}
+
+		//记录任务使用次数
+		if d.Completecount == nil {
+			d.Completecount = make(map[int32]int32)
+		}
+		d.Completecount[req.TaskId] += 1
+		update := map[string]interface{}{
+			"completecount": d.Completecount,
+		}
+		a.module.modelDispatch.Change(session.GetUserId(), update)
 	}
 
 	rsp := &pb.DispatchReceiveResp{
diff --git a/modules/dispatch/configure.go b/modules/dispatch/configure.go
index 80c4ea2d8..4c02b8199 100644
--- a/modules/dispatch/configure.go
+++ b/modules/dispatch/configure.go
@@ -67,22 +67,6 @@ func (this *configureComp) getDispatchTaskConf(taskId int32) (data *cfg.GameDisp
 	return
 }
 
-// 任务列表
-func (this *configureComp) getDispatchListConf() (list []*cfg.GameDispatch_TaskData) {
-	if v, err := this.GetConfigure(gameDispatchTask); err != nil {
-		return
-	} else {
-		d, ok := v.(*cfg.GameDispatch_Task)
-		if !ok {
-			err = fmt.Errorf("%T is not *cfg.GameDispatch_Task", v)
-			return
-		}
-
-		list = d.GetDataList()
-	}
-	return
-}
-
 func (this *configureComp) getDispatchTaskConfByType(typeId int32) (list []*cfg.GameDispatch_TaskData, err error) {
 	var v interface{}
 
diff --git a/modules/dispatch/model_dispatch.go b/modules/dispatch/model_dispatch.go
index 608e54148..08b664a14 100644
--- a/modules/dispatch/model_dispatch.go
+++ b/modules/dispatch/model_dispatch.go
@@ -31,35 +31,6 @@ func (this *modelDispatch) Init(service core.IService, module core.IModule, comp
 	return
 }
 
-// 初始玩家公告
-// Deprecated
-func (this *modelDispatch) initDispatch(uid string, dispatch *pb.DBDispatch) *pb.Noticeboard {
-	tasks, err := this.taskRandom(uid, dispatch)
-	if err != nil {
-		return nil
-	}
-	if len(tasks) == 0 {
-		return nil
-	}
-
-	freeCount := this.module.ModuleTools.GetGlobalConf().DispatchFreecheck
-	dis := &pb.DBDispatch{
-		Uid: uid,
-		Nb: &pb.Noticeboard{
-			Lv:         1, //公告初始升级
-			FreeCount:  freeCount,
-			Tasks:      tasks,
-			UpdateTime: configure.Now().Unix(),
-		},
-	}
-
-	if err := this.Add(uid, dis); err != nil {
-		return nil
-	}
-
-	return dis.Nb
-}
-
 // 获取派遣数据
 func (this *modelDispatch) getDBDispatch(uid string) (dis *pb.DBDispatch) {
 	dis = &pb.DBDispatch{}
@@ -79,8 +50,8 @@ func (this *modelDispatch) getDBDispatch(uid string) (dis *pb.DBDispatch) {
 }
 
 // 获取随机任务ID
-func (this *modelDispatch) getTasksWeight(lv int32) int32 {
-	conf, err := this.module.configure.getDispatchLvConf(lv)
+func (this *modelDispatch) getTasksWeight(dispatch *pb.DBDispatch) int32 {
+	conf, err := this.module.configure.getDispatchLvConf(dispatch.Nb.Lv)
 	if err != nil || conf == nil {
 		this.module.Error("配置不存在", log.Field{Key: "error", Value: err})
 		return 0
@@ -93,7 +64,17 @@ func (this *modelDispatch) getTasksWeight(lv int32) int32 {
 
 	var tIds []int32
 	for _, v := range confList {
-		tIds = append(tIds, v.Id)
+		if v.Completecount == 0 {
+			tIds = append(tIds, v.Id)
+		} else if v.Completecount > 0 {
+			if cc, ok := dispatch.Completecount[v.Id]; ok {
+				if cc < v.Completecount {
+					tIds = append(tIds, v.Id)
+				}
+			} else {
+				tIds = append(tIds, v.Id)
+			}
+		}
 	}
 	idex := utils.RandomNumbers(0, len(tIds), 1)
 	if len(idex) == 0 {
@@ -143,7 +124,7 @@ func (this *modelDispatch) randomTask(dispatch *pb.DBDispatch, n int) (tasks []*
 		}
 	}
 	for total < n {
-		rid := this.getTasksWeight(dispatch.Nb.Lv)
+		rid := this.getTasksWeight(dispatch)
 		if rid == 0 {
 			return nil
 		}
diff --git a/modules/friend/api_cross_agree.go b/modules/friend/api_cross_agree.go
index a8c99520a..a29fdbb42 100644
--- a/modules/friend/api_cross_agree.go
+++ b/modules/friend/api_cross_agree.go
@@ -2,6 +2,7 @@ package friend
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/event"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
@@ -150,6 +151,8 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
 			}
 			return
 		}
+
+		event.TriggerEvent(comm.EventFriendChange, uid, len(self.FriendIds))
 	}
 
 	// 拥有xx个好友
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 3312c8014..8855215e9 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -217,6 +217,8 @@ func (this *ModelHero) resetJuexingProperty(hero *pb.DBHero) {
 				hero.JuexProperty[comm.Atk] += int32(value)
 			case comm.Speed:
 				hero.JuexProperty[comm.Speed] += int32(value)
+			case comm.Cri:
+				hero.JuexProperty[comm.Cri] += int32(value)
 			case comm.ResonanceHpPro:
 				hero.JuexProperty[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
 			case comm.ResonanceAtkPro:
diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go
index 11b0849d5..3aca3eee7 100644
--- a/modules/hunting/api_challengeover.go
+++ b/modules/hunting/api_challengeover.go
@@ -33,7 +33,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
 		oldDifficulty int32             // 记录
 		consumPs      int32
 		userExp       int32
+		changExp      map[string]int32
 	)
+	changExp = map[string]int32{}
 	mapData = make(map[string]interface{}, 0)
 	reward = make([]*cfg.Gameatn, 0)
 	if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
@@ -139,7 +141,16 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
 	if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
 		return
 	}
+	// 加经验
+	if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
+		for _, v := range req.Report.Info.Redflist[0].Team {
+			if cfgHunting.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验
+				this.module.ModuleHero.AddHeroExp(session, v.Oid, cfgHunting.Heroexp)
+				changExp[v.HeroID] = cfgHunting.Heroexp
+			}
 
+		}
+	}
 	errdata = this.module.ModifyHuntingData(session.GetUserId(), mapData)
 	userExp, _ = this.module.ModuleUser.ConsumePsAddExp(session, consumPs)
 	session.SendMsg(string(this.module.GetType()), HuntingChallengeOverResp, &pb.HuntingChallengeOverResp{
@@ -147,6 +158,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
 		Asset:   atno,
 		Sell:    del,
 		UserExp: userExp,
+		Heroexp: changExp,
 	})
 	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype80, 1, req.BossType, req.Difficulty))
 	// 随机任务统计
diff --git a/modules/mline/model_mainline.go b/modules/mline/model_mainline.go
index 76d16f916..a20bb637d 100644
--- a/modules/mline/model_mainline.go
+++ b/modules/mline/model_mainline.go
@@ -67,6 +67,7 @@ func (this *ModelMline) cleanChapter(uId string) (err error) {
 
 // 清除数据
 func (this *ModelMline) cleanChapterDataById(uId string, ids ...string) (err error) {
+	this.module.Debugf("cleanChapterDataById:%s,%v", uId, ids)
 	if err = this.DelListlds(uId, ids); err != nil {
 		this.module.Errorf("err:%v", err)
 		return
diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go
index a639d3c04..93ff63767 100644
--- a/modules/sys/api_getlist.go
+++ b/modules/sys/api_getlist.go
@@ -11,49 +11,56 @@ func (this *apiComp) FuncGetListCheck(session comm.IUserSession, req *pb.SysFunc
 
 func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetListReq) (errdata *pb.ErrorData) {
 
+	var (
+		bChange bool
+	)
 	rsp := &pb.SysFuncGetListResp{}
 	rsp.Cond = make(map[string]int32, 0)
+	opencfg, err := this.module.configure.getOpencondCfg()
+	if err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Message: err.Error(),
+		}
+		return
+	}
 	list, _ := this.module.modelSys.GetOpenCondList(session.GetUserId())
 	if len(req.Keys) == 0 {
-		confList := this.module.configure.getOpencondList()
-		for _, v := range confList {
-
-			id := this.module.modelSys.validCond(session.GetUserId(), v)
-			if id != "" {
-				if v.ActivateType == 1 {
-					if _, ok := list.Cond[id]; ok {
-						rsp.Cond[id] = 1
-					} else {
-						rsp.Cond[id] = 0
-					}
-				} else {
+		for _, v := range opencfg.GetDataList() {
+			if list.Cond[v.Id] == 0 {
+				id := this.module.modelSys.validCond(session.GetUserId(), v)
+				if id != "" {
 					rsp.Cond[id] = 1
+					list.Cond[id] = 1 //设置激活
+					bChange = true
 				}
+			} else {
+				rsp.Cond[v.Id] = 1
 			}
 		}
 	} else {
 		for _, key := range req.Keys {
-			opencfg, err := this.module.configure.getOpencondCfg()
-			if err != nil {
-				continue
-			}
-			if conf, ok := opencfg.GetDataMap()[key]; ok {
-				id := this.module.modelSys.validCond(session.GetUserId(), conf)
-				if id != "" {
-					if conf.ActivateType == 1 {
-						if _, ok := list.Cond[id]; ok {
-							rsp.Cond[id] = 1
-						} else {
-							rsp.Cond[id] = 0
-						}
-					} else {
+			if list.Cond[key] == 0 {
+				if conf, ok := opencfg.GetDataMap()[key]; ok {
+					id := this.module.modelSys.validCond(session.GetUserId(), conf)
+					if id != "" {
 						rsp.Cond[id] = 1
+						list.Cond[key] = 1 //设置激活
+						bChange = true
 					}
 				}
+			} else {
+				rsp.Cond[key] = 1
 			}
+
 		}
 	}
 
+	if bChange {
+		this.module.modelSys.ChangeOpenCondData(session.GetUserId(), map[string]interface{}{
+			"cond": list.Cond,
+		})
+	}
 	session.SendMsg(string(this.module.GetType()), "funcgetlist", rsp)
 	return
 }
diff --git a/modules/sys/config.go b/modules/sys/config.go
index 6897ffba9..086052cbe 100644
--- a/modules/sys/config.go
+++ b/modules/sys/config.go
@@ -18,10 +18,11 @@ type configureComp struct {
 	modules.MCompConfigure
 	module *ModuleSys
 
-	hlock    sync.RWMutex
-	maplv    map[int32][]string // 监听等级大于1 的配置
-	maptask  map[int32][]string
-	mapmline map[int32][]string
+	hlock     sync.RWMutex
+	maplv     map[int32][]string // 监听等级大于1 的配置
+	maptask   map[int32][]string
+	mapmline  map[int32][]string
+	mapfriend map[int32][]string // 好友数量
 }
 
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@@ -41,6 +42,7 @@ func (this *configureComp) LoadCondConfig() {
 			this.maplv = make(map[int32][]string, 0)
 			this.maptask = make(map[int32][]string, 0)
 			this.mapmline = make(map[int32][]string, 0)
+			this.mapfriend = make(map[int32][]string, 0)
 			defer this.hlock.Unlock()
 			for _, v := range data.GetDataList() {
 				for _, v1 := range v.Main {
@@ -54,6 +56,9 @@ func (this *configureComp) LoadCondConfig() {
 						if v1.Key == 2 && v1.Param > 1 {
 							this.mapmline[v1.Param] = append(this.mapmline[v1.Param], v.Id)
 						}
+						if v1.Key == 4 && v1.Param > 1 {
+							this.mapfriend[v1.Param] = append(this.mapfriend[v1.Param], v.Id)
+						}
 					}
 				}
 			}
@@ -72,6 +77,10 @@ func (this *configureComp) getOpencondMline(id int32) []string {
 func (this *configureComp) getOpencondTask(id int32) []string {
 	return this.maptask[id]
 }
+
+func (this *configureComp) getFriendTask(id int32) []string {
+	return this.mapfriend[id]
+}
 func (this *configureComp) getOpencondCfg() (data *cfg.GameOpencond, err error) {
 	var (
 		v  interface{}
@@ -105,7 +114,7 @@ func (this *configureComp) GetOpenCondCfgById(id string) (data *cfg.GameOpencond
 	return
 }
 
-func (this *configureComp) getOpencondList() (list []*cfg.GameOpencondData) {
+func (this *configureComp) getOpencondConf() (list []*cfg.GameOpencondData) {
 	if cfg, err := this.getOpencondCfg(); err == nil {
 		list = cfg.GetDataList()
 	}
diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go
index 209e9b77c..eccd2582a 100644
--- a/modules/sys/model_sys.go
+++ b/modules/sys/model_sys.go
@@ -99,6 +99,18 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri
 			} else {
 				return ""
 			}
+
+		case 4:
+			module, err := this.service.GetModule(comm.ModuleFriend)
+			if err != nil {
+				this.moduleSys.Debugln(err)
+				return ""
+			}
+			if v, ok := module.(comm.IFriend); ok {
+				if v.GetFriendCount(uid) < conf.Param {
+					return ""
+				}
+			}
 		}
 	}
 	return condData.Id
diff --git a/modules/sys/module.go b/modules/sys/module.go
index 9df301afc..b5702401e 100644
--- a/modules/sys/module.go
+++ b/modules/sys/module.go
@@ -1,11 +1,15 @@
 package sys
 
 import (
+	"context"
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/base"
 	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/event"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"time"
 )
 
 var _ comm.ISys = (*ModuleSys)(nil)
@@ -14,8 +18,8 @@ type ModuleSys struct {
 	modules.ModuleBase
 	api       *apiComp
 	configure *configureComp
-
-	modelSys *ModelSys
+	service   base.IRPCXService
+	modelSys  *ModelSys
 }
 
 func NewModule() core.IModule {
@@ -29,8 +33,17 @@ func (this *ModuleSys) OnInstallComp() {
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
 }
 
+//模块初始化
+func (this *ModuleSys) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
+	err = this.ModuleBase.Init(service, module, options)
+	this.service = service.(base.IRPCXService)
+	event.Register(comm.EventFriendChange, this.FriendCountChange)
+	return
+}
+
 func (this *ModuleSys) Start() (err error) {
 	err = this.ModuleBase.Start()
+	this.service.RegisterFunctionName(string(comm.Rpc_OpendCond), this.OpenCond)
 	return
 }
 
@@ -51,16 +64,35 @@ func (this *ModuleSys) CheckLvUpCond(session comm.IUserSession, lv int32) {
 		this.AutoActivate(session, cond)
 	}
 }
+
 func (this *ModuleSys) CheckMlineCond(session comm.IUserSession, id int32) {
 	if cond := this.configure.getOpencondMline(id); len(cond) > 0 {
 		this.AutoActivate(session, cond)
 	}
 }
+
 func (this *ModuleSys) CheckTaskCond(session comm.IUserSession, id int32) {
 	if cond := this.configure.getOpencondTask(id); len(cond) > 0 {
 		this.AutoActivate(session, cond)
 	}
 }
+func (this *ModuleSys) CheckFriendCond(session comm.IUserSession, num int32) {
+	if cond := this.configure.getFriendTask(num); len(cond) > 0 {
+		// 通知本服
+		ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
+		_, err := this.service.RpcGo(
+			ctx,
+			comm.Service_Worker,
+			string(comm.Rpc_OpendCond),
+			&pb.RPCFriendNumReq{Uid: session.GetUserId(), Cond: cond},
+			nil)
+		if err != nil {
+			this.Errorln(err)
+			return
+		}
+		this.AutoActivate(session, cond)
+	}
+}
 
 // 自动激活
 func (this *ModuleSys) AutoActivate(session comm.IUserSession, cids []string) bool {
@@ -70,18 +102,18 @@ func (this *ModuleSys) AutoActivate(session comm.IUserSession, cids []string) bo
 	list, _ := this.modelSys.GetOpenCondList(session.GetUserId())
 	for _, cid := range cids {
 		opencfg := this.configure.getOpencondCfgByCid(cid)
-		if opencfg != nil {
-			if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足
-				break
-			}
+		if opencfg == nil {
+			continue
 		}
-		for k, v := range list.Cond {
-			if k == cid && v != 0 {
+		if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足
+			continue
+		} else {
+			if _, ok := list.Cond[cid]; !ok {
 				list.Cond[cid] = 1
 				szOpen = append(szOpen, cid)
-				break
 			}
 		}
+
 	}
 	if len(szOpen) > 0 {
 		this.modelSys.ChangeOpenCondData(session.GetUserId(), map[string]interface{}{
@@ -113,3 +145,30 @@ func (this *ModuleSys) CheckOpenCondCfgById(uid string, id string) (bOpen bool,
 	}
 	return
 }
+func (this *ModuleSys) OpenCond(ctx context.Context, req *pb.RPCFriendNumReq, resp interface{}) (err error) {
+	if session, ok := this.GetUserSession(req.Uid); ok {
+		this.AutoActivate(session, req.Cond)
+		if err = session.Push(); err != nil {
+			this.Errorln(err)
+		}
+		this.PutUserSession(session)
+	} else {
+		this.PutUserSession(session)
+	}
+
+	return
+}
+
+func (this *ModuleSys) FriendCountChange(uid string, count int32) {
+	if cond := this.configure.getFriendTask(count); len(cond) > 0 {
+		if session, ok := this.GetUserSession(uid); ok {
+			this.AutoActivate(session, cond)
+			if err := session.Push(); err != nil {
+				this.Errorln(err)
+			}
+			this.PutUserSession(session)
+		} else {
+			this.PutUserSession(session)
+		}
+	}
+}
diff --git a/modules/user/module.go b/modules/user/module.go
index 4c22a7451..463c89b25 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -1000,6 +1000,7 @@ func (this *User) recoverUserPs(uid string) {
 					this.Error("玩家体力变化 UserPsChangedPush推送失败",
 						log.Field{Key: "uid", Value: u.Uid},
 						log.Field{Key: comm.ResPs, Value: changed},
+						log.Field{Key: "err", Value: err.Error()},
 					)
 				}
 			}
diff --git a/pb/dispatch_db.pb.go b/pb/dispatch_db.pb.go
index 74422400b..0d8533e6a 100644
--- a/pb/dispatch_db.pb.go
+++ b/pb/dispatch_db.pb.go
@@ -26,8 +26,9 @@ type DBDispatch struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid string       `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //
-	Nb  *Noticeboard `protobuf:"bytes,2,opt,name=nb,proto3" json:"nb" bson:"nb"`    //公告栏
+	Uid           string          `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                    //
+	Nb            *Noticeboard    `protobuf:"bytes,2,opt,name=nb,proto3" json:"nb" bson:"nb"`                                                                                                       //公告栏
+	Completecount map[int32]int32 `protobuf:"bytes,3,rep,name=completecount,proto3" json:"completecount" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //任务完成次数
 }
 
 func (x *DBDispatch) Reset() {
@@ -76,6 +77,13 @@ func (x *DBDispatch) GetNb() *Noticeboard {
 	return nil
 }
 
+func (x *DBDispatch) GetCompletecount() map[int32]int32 {
+	if x != nil {
+		return x.Completecount
+	}
+	return nil
+}
+
 // 公告栏
 type Noticeboard struct {
 	state         protoimpl.MessageState
@@ -280,41 +288,50 @@ var File_dispatch_dispatch_db_proto protoreflect.FileDescriptor
 
 var file_dispatch_dispatch_db_proto_rawDesc = []byte{
 	0x0a, 0x1a, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x2f, 0x64, 0x69, 0x73, 0x70, 0x61,
-	0x74, 0x63, 0x68, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3c, 0x0a, 0x0a,
-	0x44, 0x42, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x02,
-	0x6e, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x4e, 0x6f, 0x74, 0x69, 0x63,
-	0x65, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x02, 0x6e, 0x62, 0x22, 0xa4, 0x02, 0x0a, 0x0b, 0x4e,
-	0x6f, 0x74, 0x69, 0x63, 0x65, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f,
-	0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
-	0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x05, 0x74, 0x61,
-	0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x69, 0x73, 0x70,
-	0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12,
-	0x1c, 0x0a, 0x09, 0x66, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x09, 0x66, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a,
-	0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x12, 0x1c, 0x0a, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a,
-	0x0c, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x08, 0x20,
-	0x03, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
-	0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d,
-	0x65, 0x22, 0xaa, 0x01, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61,
-	0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a,
-	0x0a, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65,
-	0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72,
-	0x6f, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06,
-	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x63, 0x68, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a,
+	0x0a, 0x44, 0x42, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
+	0x02, 0x6e, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x4e, 0x6f, 0x74, 0x69,
+	0x63, 0x65, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x02, 0x6e, 0x62, 0x12, 0x44, 0x0a, 0x0d, 0x63,
+	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x2e,
+	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x1a, 0x40, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 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, 0xa4, 0x02, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x62, 0x6f,
+	0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x02, 0x6c, 0x76, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73,
+	0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x65, 0x65,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x66, 0x72, 0x65,
+	0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
+	0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x72, 0x65,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x77, 0x65,
+	0x65, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x77,
+	0x65, 0x65, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x61, 0x73,
+	0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65,
+	0x65, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xaa, 0x01, 0x0a, 0x0c, 0x44,
+	0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74,
+	0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73,
+	0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54,
+	0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54,
+	0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a,
+	0x07, 0x65, 0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
+	0x65, 0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -329,20 +346,22 @@ func file_dispatch_dispatch_db_proto_rawDescGZIP() []byte {
 	return file_dispatch_dispatch_db_proto_rawDescData
 }
 
-var file_dispatch_dispatch_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_dispatch_dispatch_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_dispatch_dispatch_db_proto_goTypes = []interface{}{
 	(*DBDispatch)(nil),   // 0: DBDispatch
 	(*Noticeboard)(nil),  // 1: Noticeboard
 	(*DispatchTask)(nil), // 2: DispatchTask
+	nil,                  // 3: DBDispatch.CompletecountEntry
 }
 var file_dispatch_dispatch_db_proto_depIdxs = []int32{
 	1, // 0: DBDispatch.nb:type_name -> Noticeboard
-	2, // 1: Noticeboard.tasks:type_name -> DispatchTask
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	3, // 1: DBDispatch.completecount:type_name -> DBDispatch.CompletecountEntry
+	2, // 2: Noticeboard.tasks:type_name -> DispatchTask
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_dispatch_dispatch_db_proto_init() }
@@ -394,7 +413,7 @@ func file_dispatch_dispatch_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_dispatch_dispatch_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go
index 739190080..deca303d8 100644
--- a/pb/friend_msg.pb.go
+++ b/pb/friend_msg.pb.go
@@ -2459,6 +2459,61 @@ func (x *FriendQiecuonotifyPush) GetNotifyType() int32 {
 	return 0
 }
 
+type RPCFriendNumReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Uid  string   `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Cond []string `protobuf:"bytes,2,rep,name=cond,proto3" json:"cond"`
+}
+
+func (x *RPCFriendNumReq) Reset() {
+	*x = RPCFriendNumReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_friend_friend_msg_proto_msgTypes[49]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RPCFriendNumReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RPCFriendNumReq) ProtoMessage() {}
+
+func (x *RPCFriendNumReq) ProtoReflect() protoreflect.Message {
+	mi := &file_friend_friend_msg_proto_msgTypes[49]
+	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 RPCFriendNumReq.ProtoReflect.Descriptor instead.
+func (*RPCFriendNumReq) Descriptor() ([]byte, []int) {
+	return file_friend_friend_msg_proto_rawDescGZIP(), []int{49}
+}
+
+func (x *RPCFriendNumReq) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *RPCFriendNumReq) GetCond() []string {
+	if x != nil {
+		return x.Cond
+	}
+	return nil
+}
+
 var File_friend_friend_msg_proto protoreflect.FileDescriptor
 
 var file_friend_friend_msg_proto_rawDesc = []byte{
@@ -2640,8 +2695,11 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66,
 	0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6e, 0x6f, 0x74,
-	0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x37, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x46, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x4e, 0x75, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x6e, 0x64,
+	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2656,7 +2714,7 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
 	return file_friend_friend_msg_proto_rawDescData
 }
 
-var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 49)
+var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 50)
 var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendBase)(nil),                 // 0: FriendBase
 	(*FriendListReq)(nil),              // 1: FriendListReq
@@ -2707,7 +2765,8 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendStopReq)(nil),              // 46: FriendStopReq
 	(*FriendStopResp)(nil),             // 47: FriendStopResp
 	(*FriendQiecuonotifyPush)(nil),     // 48: FriendQiecuonotifyPush
-	(*AssistRecord)(nil),               // 49: AssistRecord
+	(*RPCFriendNumReq)(nil),            // 49: RPCFriendNumReq
+	(*AssistRecord)(nil),               // 50: AssistRecord
 }
 var file_friend_friend_msg_proto_depIdxs = []int32{
 	0,  // 0: FriendListResp.list:type_name -> FriendBase
@@ -2717,7 +2776,7 @@ var file_friend_friend_msg_proto_depIdxs = []int32{
 	0,  // 4: FriendBlackListResp.friends:type_name -> FriendBase
 	0,  // 5: FriendZanlistResp.list:type_name -> FriendBase
 	0,  // 6: FriendAssistlistResp.list:type_name -> FriendBase
-	49, // 7: FriendAssistlistResp.record:type_name -> AssistRecord
+	50, // 7: FriendAssistlistResp.record:type_name -> AssistRecord
 	0,  // 8: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase
 	0,  // 9: FriendAssistHeroListResp.friends:type_name -> FriendBase
 	10, // [10:10] is the sub-list for method output_type
@@ -3322,6 +3381,18 @@ func file_friend_friend_msg_proto_init() {
 				return nil
 			}
 		}
+		file_friend_friend_msg_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RPCFriendNumReq); 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{
@@ -3329,7 +3400,7 @@ func file_friend_friend_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_friend_friend_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   49,
+			NumMessages:   50,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/hunting_msg.pb.go b/pb/hunting_msg.pb.go
index daa15b001..bfcd56cdf 100644
--- a/pb/hunting_msg.pb.go
+++ b/pb/hunting_msg.pb.go
@@ -325,10 +325,11 @@ type HuntingChallengeOverResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Data    *DBHunting  `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
-	Asset   []*UserAtno `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` //  推送atno
-	Sell    []string    `protobuf:"bytes,3,rep,name=sell,proto3" json:"sell"`   // 自动出售的装备
-	UserExp int32       `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"`
+	Data    *DBHunting       `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+	Asset   []*UserAtno      `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` //  推送atno
+	Sell    []string         `protobuf:"bytes,3,rep,name=sell,proto3" json:"sell"`   // 自动出售的装备
+	UserExp int32            `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"`
+	Heroexp map[string]int32 `protobuf:"bytes,5,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验
 }
 
 func (x *HuntingChallengeOverResp) Reset() {
@@ -391,6 +392,13 @@ func (x *HuntingChallengeOverResp) GetUserExp() int32 {
 	return 0
 }
 
+func (x *HuntingChallengeOverResp) GetHeroexp() map[string]int32 {
+	if x != nil {
+		return x.Heroexp
+	}
+	return nil
+}
+
 // 购买
 type HuntingBuyReq struct {
 	state         protoimpl.MessageState
@@ -629,7 +637,7 @@ var file_hunting_hunting_msg_proto_rawDesc = []byte{
 	0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
 	0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52,
 	0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x22, 0x89, 0x01, 0x0a, 0x18, 0x48, 0x75,
+	0x01, 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x22, 0x87, 0x02, 0x0a, 0x18, 0x48, 0x75,
 	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76,
 	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
@@ -638,22 +646,30 @@ var file_hunting_hunting_msg_proto_rawDesc = []byte{
 	0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x18,
 	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x75,
 	0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73,
-	0x65, 0x72, 0x45, 0x78, 0x70, 0x22, 0x25, 0x0a, 0x0d, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
-	0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e,
-	0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
-	0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x48,
-	0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x48, 0x75, 0x6e, 0x74,
-	0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
-	0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05,
-	0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x40, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70,
+	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
+	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x25, 0x0a, 0x0d, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75,
+	0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e, 0x48, 0x75,
+	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48,
+	0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x48, 0x0a, 0x12,
+	0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52,
+	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e,
+	0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a,
+	0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44,
+	0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61,
+	0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -668,7 +684,7 @@ func file_hunting_hunting_msg_proto_rawDescGZIP() []byte {
 	return file_hunting_hunting_msg_proto_rawDescData
 }
 
-var file_hunting_hunting_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_hunting_hunting_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
 var file_hunting_hunting_msg_proto_goTypes = []interface{}{
 	(*HuntingGetListReq)(nil),        // 0: HuntingGetListReq
 	(*HuntingGetListResp)(nil),       // 1: HuntingGetListResp
@@ -680,27 +696,29 @@ var file_hunting_hunting_msg_proto_goTypes = []interface{}{
 	(*HuntingBuyResp)(nil),           // 7: HuntingBuyResp
 	(*HuntingRankListReq)(nil),       // 8: HuntingRankListReq
 	(*HuntingRankListResp)(nil),      // 9: HuntingRankListResp
-	(*DBHunting)(nil),                // 10: DBHunting
-	(*BattleFormation)(nil),          // 11: BattleFormation
-	(*BattleInfo)(nil),               // 12: BattleInfo
-	(*BattleReport)(nil),             // 13: BattleReport
-	(*UserAtno)(nil),                 // 14: UserAtno
-	(*DBHuntingRank)(nil),            // 15: DBHuntingRank
+	nil,                              // 10: HuntingChallengeOverResp.HeroexpEntry
+	(*DBHunting)(nil),                // 11: DBHunting
+	(*BattleFormation)(nil),          // 12: BattleFormation
+	(*BattleInfo)(nil),               // 13: BattleInfo
+	(*BattleReport)(nil),             // 14: BattleReport
+	(*UserAtno)(nil),                 // 15: UserAtno
+	(*DBHuntingRank)(nil),            // 16: DBHuntingRank
 }
 var file_hunting_hunting_msg_proto_depIdxs = []int32{
-	10, // 0: HuntingGetListResp.data:type_name -> DBHunting
-	11, // 1: HuntingChallengeReq.battle:type_name -> BattleFormation
-	12, // 2: HuntingChallengeResp.info:type_name -> BattleInfo
-	13, // 3: HuntingChallengeOverReq.report:type_name -> BattleReport
-	10, // 4: HuntingChallengeOverResp.data:type_name -> DBHunting
-	14, // 5: HuntingChallengeOverResp.asset:type_name -> UserAtno
-	10, // 6: HuntingBuyResp.data:type_name -> DBHunting
-	15, // 7: HuntingRankListResp.ranks:type_name -> DBHuntingRank
-	8,  // [8:8] is the sub-list for method output_type
-	8,  // [8:8] is the sub-list for method input_type
-	8,  // [8:8] is the sub-list for extension type_name
-	8,  // [8:8] is the sub-list for extension extendee
-	0,  // [0:8] is the sub-list for field type_name
+	11, // 0: HuntingGetListResp.data:type_name -> DBHunting
+	12, // 1: HuntingChallengeReq.battle:type_name -> BattleFormation
+	13, // 2: HuntingChallengeResp.info:type_name -> BattleInfo
+	14, // 3: HuntingChallengeOverReq.report:type_name -> BattleReport
+	11, // 4: HuntingChallengeOverResp.data:type_name -> DBHunting
+	15, // 5: HuntingChallengeOverResp.asset:type_name -> UserAtno
+	10, // 6: HuntingChallengeOverResp.heroexp:type_name -> HuntingChallengeOverResp.HeroexpEntry
+	11, // 7: HuntingBuyResp.data:type_name -> DBHunting
+	16, // 8: HuntingRankListResp.ranks:type_name -> DBHuntingRank
+	9,  // [9:9] is the sub-list for method output_type
+	9,  // [9:9] is the sub-list for method input_type
+	9,  // [9:9] is the sub-list for extension type_name
+	9,  // [9:9] is the sub-list for extension extendee
+	0,  // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_hunting_hunting_msg_proto_init() }
@@ -839,7 +857,7 @@ func file_hunting_hunting_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_hunting_hunting_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   10,
+			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/sys/configure/structs/Game.HuntingBossData.go b/sys/configure/structs/Game.HuntingBossData.go
index 7d12efdf8..4de3aa101 100644
--- a/sys/configure/structs/Game.HuntingBossData.go
+++ b/sys/configure/structs/Game.HuntingBossData.go
@@ -20,7 +20,10 @@ type GameHuntingBossData struct {
     Dropshow []*Gameatn
     Drop int32
     Heroexp int32
+<<<<<<< HEAD
     Bossmodel int32
+=======
+>>>>>>> eed5cf07a0430dc9d057aaba39bdd7d59abfecdd
     Boss []int32
     PsConsume []*Gameatn
     PsMg []*Gameatn
@@ -69,7 +72,10 @@ func (_v *GameHuntingBossData)Deserialize(_buf map[string]interface{}) (err erro
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) }
+<<<<<<< HEAD
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) }
+=======
+>>>>>>> eed5cf07a0430dc9d057aaba39bdd7d59abfecdd
      {
                 var _arr_ []interface{}
                 var _ok_ bool