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

bin/wordfilter.txt

@@ -49507,3 +49507,522 @@ AR15
 泰国
 打猎
 精工
+北极鲶鱼
+插管
+暴力份子
+回笼漂
+45度青年
+公Chan党
+共Chan党
+公chan党
+共chan党
+共chan谠
+公chan谠
+共CHAN谠
+公CHAN谠
+Av
+aV
+av
+习明泽
+迷情药
+迷情水
+迷情丸
+TRUMP
+Trump
+trump
+BIDEN
+Biden
+biden
+新冠感染
+流血
+女基督派
+杀孩子
+平哥彭嫂
+金正哲
+反公
+诅咒
+击杀
+圣女贞德
+双规
+傻叉
+虐小孩
+拿冰
+求肉
+出肉
+肉商
+男道友
+女道友
+反中斗士
+反华斗士
+暴菊
+方方日记
+芳芳日记
+交欢
+双飞
+暴力分子
+苍老师
+好色
+艹
+站街女
+三p
+偷窥
+迷幻剂
+玩你
+血腥
+屠城
+暴力
+砍头
+马勒戈壁
+山口组
+失身
+母狗
+李讷
+浪货
+少先队
+左权
+装13
+李强
+蔡奇
+丁薛祥
+李希
+二十大
+党的二十大
+中共二十大
+中国共产党第二十次全国代表大会
+买了个表
+中联部
+佩洛西
+溜冰
+浮夸风
+低端人口
+低端人士
+Av.约炮
+搞基
+麻辣隔壁
+李书磊
+台海战争
+杀光
+马拉个币
+文革
+毛东东
+杨开慧
+马德
+玛德
+安倍
+核战争
+女马德
+齐b
+齐B
+毛新宇
+苍井空
+往事牛津大學出版社章詒和
+一人傘下的人香港
+八旗文化梁文傑矛盾與內幕
+近藤大介谋略の100年史
+大解體美達大和
+西热达吉嘉乐顿珠
+两个时代互不否定相互否定
+滴血的数字沉重的祭奠
+ISIL
+爱滋
+SEX
+Sex
+sex
+蔡文胜
+李兴平
+曹政
+洛海坚
+國民黨
+拉闸限电
+秃驴
+去中国化
+齐逼短裙
+傻叉
+道友拿冰
+银行卡
+第三党
+同性恋
+灭门
+孽杀
+中组部
+吸粉
+跪压黑人
+港区国安
+冰道友
+习大帝
+刘晓波
+BCI
+bci
+瑞士良好棉花发展协会
+The Better Cotton Initiative
+Better Cotton Initiative
+抵制新疆棉花
+新疆棉花
+抵制新疆的棉花
+新疆的棉花
+制裁新疆
+裁疆
+H&M
+h&m
+HM
+hm
+强制劳动与侵犯人权
+强制劳动
+侵犯人权
+海峡中线
+台海中线
+齐B短裙
+飞行燃料
+莎菲片
+特么的
+道有拿冰
+两岸华语
+杀小孩
+报复社会
+拜登
+Isil
+ISIl
+isil
+爆菊
+菅义伟
+特鲁多
+约翰逊
+鲍里斯
+KMT
+kmt
+kkk
+KKK
+ISIS
+三k党
+太阳花运动
+佔領中環
+佔中
+太陽花運動
+西藏國
+国安法
+港区国安法
+shit
+612人道支援基金
+人道支援基金
+六一二人道支援基金
+绝食
+静坐
+他娘
+穆罕穆德
+黄坤明
+ISIS
+Isis
+isis
+IsIs
+ISis
+ISIs
+iSIS
+isIS
+isiS
+isIS
+社会制度的公平
+资源分配的正义
+法治精神的贯彻
+政府治理的透明
+人民参政的充分
+撤回修例
+调查警队
+林郑下台
+普选
+赦免暴力示威者
+五大诉求
+武汉肺炎
+新冠
+新冠肺炎
+新冠病毒
+新型冠状病毒
+新型冠状病毒肺炎
+SARS
+SARI
+新冠疫情
+武汉疫情
+武汉病毒
+野味病毒
+穿山甲病毒
+武汉病毒所
+武汉汉病毒研究所
+中国病毒
+COVID-19
+corona virus disease19
+SARS-COV-2
+NCP
+病毒加油
+野味肺炎
+国际突发公共卫生事件
+口罩
+kn95
+疫苗
+防护服
+护目镜
+人传人
+卫健委
+国家卫生健康委员会
+国家卫健委
+湖北卫健委
+武汉卫健委
+红会
+红十字
+红十字会
+红十字基金会
+湖北省委书记
+湖北政府
+大换血
+武汉市长
+大鄂
+鄂A0260W
+鄂A零二六零W
+核酸检测
+核酸试剂盒
+王贺胜
+应勇
+王晓东
+蒋超良
+涂远超
+蔡杰
+李文亮
+王延轶
+舒红兵
+孙春兰
+李兰娟
+钟南山
+吹哨人
+双黄连
+瑞德西韦
+F4
+协和医院
+金银潭医院
+方舱医院
+火神山医院
+雷神山医院
+中央指导组
+华南海鲜市场
+确诊病例
+疑似病例
+重症患者
+病死率
+飞沫传播
+输入性病例
+二代病例
+隐性感染
+封城
+武汉封城
+武汉感染
+钟南山感染
+中国被感染
+肺炎加油
+被肺炎战胜 
+武汉肺炎加油
+被武汉肺炎战胜
+ 新冠肺炎加油
+ 被新冠肺炎战胜
+ 吃蝙蝠
+ 蝙蝠肺炎加油
+ 被蝙蝠肺炎战胜
+ 得肺炎
+ 得武汉肺炎
+ 早日被感染
+ 早日感染肺炎
+ 早日感染武汉肺炎
+ 被疫情战胜
+ 患肺炎
+ 患武汉肺炎
+中国病毒
+武汉病毒
+特鲁多
+鲍里斯约翰逊
+政治类
+犯罪词汇
+谋杀
+杀人
+吸毒
+贩毒
+赌博
+拐卖
+走私
+卖淫
+造反
+监狱
+强奸
+轮奸
+抢劫
+先奸后杀民国
+习主席
+习大大
+全国人民代表大会
+全国人大
+侵华
+下注
+押大
+押小
+抽头
+坐庄
+赌马
+赌球
+筹码
+老虎机
+轮盘赌
+安非他命
+大麻
+可卡因
+海洛因
+冰毒
+摇头丸
+杜冷丁
+鸦片
+罂粟
+迷幻药
+白粉
+嗑药
+吸毒
+冰粉
+中央
+中南海
+安拉
+特朗普
+朴槿惠
+法轮功
+爱的家庭
+汪洋
+栗战书
+杨洁篪
+郭声琨
+王勇
+孫中山
+臺灣民國
+台湾民国
+金正恩
+十九大
+後庭
+薹獨
+Isis
+文在寅
+蓝鲸游戏
+诱杀
+世雄会
+辣鸡
+你妹
+占领中环
+爱情动作片
+YY
+马克龙
+安拉
+中南海
+冰粉
+台湾
+十八大
+十八大代表
+十九大代表
+十八摸
+18摸
+漏阴癖
+真理教
+转法轮
+真善忍
+瘸腿帮
+张晓军
+野鸡
+野妓
+野鷄
+薄谷开来
+薄瓜瓜
+夜话紫禁城
+耶稣
+游荡爪牙
+游蕩爪牙
+中國
+中华大地
+中崋大地
+偷窥洗澡
+一陀粪
+毒
+特蕾莎梅
+拉票贿选
+伊莎贝尔
+伊莎貝爾
+偷窥视频
+游戯
+耐草
+操
+艹肏
+游荡的士兵
+游蕩的士兵
+K粉
+k粉
+D&G
+DG
+杜嘉班纳
+Dolce&Gabbana
+dg
+D& G
+d&g
+杜班
+辱华
+612人道支援基金
+金三胖
+蔡英文
+香港建国
+香港国
+港独
+香港独立
+占领中环
+占中
+香港城邦论
+太阳花学运
+反国教运动
+清真
+浴盐
+你奶奶
+强暴幼女
+ISIS,小眼佬
+黄皮猴子
+幼奸
+萨德
+毛泽東
+文在寅
+习总书记
+古柯碱
+恐怖分子
+徒弟会
+阁列岛
+劉雲山
+張高麗李長春
+蔣經國
+张高丽
+金廷勋
+锦涛
+经济社会理事会
+习主席
+原子导弹
+原子弹
+氢弹
+贩毒
+核武器
+吸毒
+贩毒
+革命
+赌博
+彭丽媛
+薄熙来
+王立军
+胡紧涛
+找小姐
+兽兽门
+东京热
+a片
+尼玛
+裸聊
+默罕默德
+全能神教
+全能神
+尼玛逼
+肏屄
+先奸后杀
+Is
+IS
+Isis
+IS

comm/error.go

@@ -26,10 +26,10 @@ func NewCustomError(code pb.ErrorCode) error {
 
 // 创建配置表错误对象
 func NewNotFoundConfErr(moduleName string, filename string, id interface{}) error {
-	return fmt.Errorf("服务端配置未找到!模块:%s ,配置文件:%s,目标数据:%v", moduleName, filename, id)
+	return fmt.Errorf("NotFoundConf Err module:%s ,file:%s,id:%v", moduleName, filename, id)
 }
 
 // 执行外部模块异常
 func NewExternalModuleErr(moduleName string, methodname string, parameter ...interface{}) error {
-	return fmt.Errorf("执行外部模块错误 模块:%s ,配置文件:%s,目标数据:%v", moduleName, methodname, parameter)
+	return fmt.Errorf("ExternalModule Err module:%s ,file:%s,parameter:%v", moduleName, methodname, parameter)
 }

modules/items/modelitems.go

@@ -433,7 +433,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
 	if leftnum > 0 { //还没有放完 寻找空的格子填充
 		index := int32(len(items))
 		for leftnum > 0 { //需要补充格子
-			if conf.UpperLimit == 0 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) {
+			if conf.UpperLimit == -1 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) {
 				grid := &pb.DB_UserItemData{
 					GridId:    primitive.NewObjectID().Hex(),
 					UId:       uid,

modules/worldtask/module.go

@@ -409,33 +409,33 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32)
 
 // 返回任务ID
 func (this *Worldtask) AcceptCaravanTask(session comm.IUserSession, groupId int32) (task *pb.Worldtask, errdata *pb.ErrorData) {
-	uid := session.GetUserId()
+	// uid := session.GetUserId()
-	var (
+	// var (
 	// curTaskConf *cfg.GameWorldTaskData
 	// isfinsh     bool
-	)
+	// )
-	mytask, err := this.modelWorldtask.getWorldtask(uid)
+	// mytask, err := this.modelWorldtask.getWorldtask(uid)
-	if err != nil {
+	// if err != nil {
-		errdata = &pb.ErrorData{
+	// 	errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
+	// 		Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.String(),
+	// 		Title:   pb.ErrorCode_DBError.String(),
-			Message: "no found task data",
+	// 		Message: "no found task data",
-		}
+	// 	}
-		return
+	// 	return
-	}
+	// }
 
 	if gwt, err := this.configure.getWorldtaskCfg(); err == nil {
 		for _, v := range gwt.GetDataList() {
 			if v.Group == groupId && v.Des == 5 {
-				if _, ok := utils.Findx(mytask.TaskList, v.Key); !ok {
+				// if _, ok := utils.Findx(mytask.TaskList, v.Key); !ok {
-					task = &pb.Worldtask{
+				task = &pb.Worldtask{
-						TaskId:    v.Key,
+					TaskId:    v.Key,
-						TaskType:  v.Des,
+					TaskType:  v.Des,
-						NpcStatus: 1,
+					NpcStatus: 1,
-					}
-					// curTaskConf = v
-					break
 				}
+				// curTaskConf = v
+				break
+				// }
 			}
 		}
 	}

modules/wtask/api_finish.go

@@ -0,0 +1,117 @@
+package wtask
+
+import (
+	"fmt"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+)
+
+// 参数校验
+func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) {
+
+	return
+}
+
+// /获取系统公告
+func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) {
+	var (
+		conf    *cfg.GameWorldTaskData
+		wtask   *pb.DBWTask
+		condis  []*pb.ConIProgress
+		award   []*pb.UserAssets
+		err     error
+		isfinsh bool
+		ok      bool
+	)
+	if errdata = this.FinishCheck(session, req); errdata != nil {
+		return
+	}
+
+	if conf, err = this.module.configure.gettaskconfconfigure(req.Tid); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+
+	if wtask, err = this.module.modelwtask.getUserWTasks(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	ok = false
+	for _, v := range wtask.Accepts {
+		if v == req.Tid {
+			ok = true
+		}
+	}
+	if !ok {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ReqParameterError,
+			Title:   pb.ErrorCode_ReqParameterError.ToString(),
+			Message: fmt.Sprintf("task:%d no in accepttask:%v", req.Tid, wtask.Accepts),
+		}
+		return
+	}
+
+	if len(conf.Completetask) > 0 {
+		if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Completetask...); err != nil {
+			this.module.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ExternalModule,
+				Title:   pb.ErrorCode_ExternalModule.ToString(),
+				Message: fmt.Sprintf("Progress:%s", err.Error()),
+			}
+			return
+		}
+	}
+	isfinsh = true
+	for _, v := range condis {
+		if v.State == pb.BuriedItemFinishState_buried_unfinish {
+			isfinsh = false
+		}
+	}
+	if !isfinsh {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_WorldtaskNoComplete,
+			Title:   pb.ErrorCode_WorldtaskNoComplete.ToString(),
+			Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%+v", condis),
+		}
+		return
+	}
+
+	if len(conf.TaskendRemoveitem) > 0 { //交付物品
+		if errdata = this.module.ConsumeRes(session, conf.TaskendRemoveitem, true); errdata != nil {
+			return
+		}
+	}
+
+	if errdata = this.module.DispenseRes(session, conf.Reword, true); errdata != nil {
+		return
+	}
+	award = make([]*pb.UserAssets, 0)
+	for _, v := range conf.Reword {
+		award = append(award, &pb.UserAssets{
+			A: v.A,
+			T: v.T,
+			N: v.N,
+		})
+	}
+	for i, v := range wtask.Accepts {
+		if v == req.Tid {
+			wtask.Accepts = append(wtask.Accepts[0:i], wtask.Accepts[i+1:]...)
+			break
+		}
+	}
+	wtask.Completes = append(wtask.Completes, req.Tid)
+	session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award})
+	this.module.fishtask(session, wtask)
+	return
+}

modules/wtask/api_info.go

@@ -28,7 +28,9 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WTaskInfoReq) (errd
 		}
 		return
 	}
-
+	if errdata = this.module.pushtaskprogress(session, wtask); errdata != nil {
-	session.SendMsg(string(this.module.GetType()), "info", &pb.WTaskInfoResp{Activations: wtask.Activations, Completes: wtask.Completes})
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "info", &pb.WTaskInfoResp{Activations: wtask.Activations, Accepttask: wtask.Accepts, Completes: wtask.Completes})
 	return
 }

modules/wtask/configure.go

@@ -2,6 +2,7 @@ package wtask
 
 import (
 	"fmt"
+	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/sys/configure"
@@ -83,3 +84,21 @@ func (this *configureComp) getcondlTask() map[int32][]*cfg.GameWorldTaskData {
 	defer this.lock.RUnlock()
 	return this.condlTask
 }
+
+func (this *configureComp) gettaskconfconfigure(tid int32) (conf *cfg.GameWorldTaskData, err error) {
+
+	var (
+		v  interface{}
+		ok bool
+	)
+	if v, err = this.GetConfigure(gameWorldTask); err != nil {
+		return
+	} else {
+		if conf, ok = v.(*cfg.GameWorldTask).GetDataMap()[tid]; !ok {
+			err = comm.NewNotFoundConfErr(modulename, gameWorldTask, tid)
+			this.module.Errorf("err:%v", err)
+			return
+		}
+	}
+	return
+}

modules/wtask/module.go

@@ -1,6 +1,7 @@
 package wtask
 
 import (
+	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/sys/log"
@@ -13,6 +14,8 @@ const modulename = "世界任务"
 
 type WTask struct {
 	modules.ModuleBase
+	service    core.IService
+	modelSys   comm.ISys
 	api        *apiComp
 	configure  *configureComp
 	modelwtask *ModelWTask
@@ -28,6 +31,17 @@ func (this *WTask) GetType() core.M_Modules {
 
 func (this *WTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
 	err = this.ModuleBase.Init(service, module, options)
+	this.service = service
+	return
+}
+
+func (this *WTask) Start() (err error) {
+	err = this.ModuleBase.Start()
+	var module core.IModule
+	if module, err = this.service.GetModule(comm.ModuleSys); err != nil {
+		return
+	}
+	this.modelSys = module.(comm.ISys)
 	return
 }
 
@@ -52,11 +66,10 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 		checkcondlsMap map[int32]struct{}               = make(map[int32]struct{})
 		checkcondls    []int32                          = make([]int32, 0)
 		detailstasks   []*pb.DBWTaskItem                = make([]*pb.DBWTaskItem, 0)
-		finishtasks    []int32                          = make([]int32, 0)
-		award          []*pb.UserAssets                 = make([]*pb.UserAssets, 0)
 		ok             bool
 		needcheck      bool //是否需要校验
-		err            error
+
+		err error
 	)
 	if utask, err = this.modelwtask.getUserWTasks(uid); err != nil {
 		this.Error("读取玩家世界任务数据 失败", log.Field{Key: "err", Value: err.Error()})
@@ -68,7 +81,7 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 		condisMap[v.Conid] = v
 	}
 
-	for _, v := range utask.Accepttask {
+	for _, v := range utask.Accepts {
 		accepttaskMap[v] = struct{}{}
 	}
 
@@ -113,26 +126,10 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 			Tid:    k,
 			Conlds: make([]*pb.ConIProgress, len(v.Completetask)),
 		}
-		ok = true
 		for i, v := range v.Completetask {
 			task.Conlds[i] = condisMap[v]
-			if task.Conlds[i].State != pb.BuriedItemFinishState_buried_unfinish {
-				ok = false
-			}
 		}
 		detailstasks = append(detailstasks, task)
-		if ok && v.DeliverNpc == 0 { //自动完成
-			finishtasks = append(finishtasks, k)
-			this.DispenseRes(session, v.Reword, true) //发送奖励
-			for _, v := range v.Reword {
-				award = append(award, &pb.UserAssets{
-					A: v.A,
-					T: v.T,
-					N: v.N,
-				})
-			}
-
-		}
 	}
 
 	session, _ = this.GetUserSession(uid)
@@ -141,14 +138,105 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 		this.PutUserSession(session)
 	}()
 	//发送进度变化消息
-	session.SendMsg(string(this.GetType()), "accepttaskchange", &pb.WTaskAccepttaskChangePush{Accepttask: detailstasks})
+	session.SendMsg(string(this.GetType()), "accepttaskchange", &pb.WTaskAcceptChangePush{Accepts: detailstasks})
+}
 
-	if len(finishtasks) > 0 {
+// 校验任务进度
-		//发送任务完成推送
+func (this *WTask) pushtaskprogress(session comm.IUserSession, wtask *pb.DBWTask) (errdata *pb.ErrorData) {
-		session.SendMsg(string(this.GetType()), "autofinsh", &pb.WTaskAutoFinshPush{Completes: finishtasks, Award: award})
+	var (
-		utask.Completes = append(utask.Completes, finishtasks...)
+		tasks          []*pb.DBWTaskItem  = make([]*pb.DBWTaskItem, 0)
-		this.inquireActivations(session, utask, 1, []string{})
+		checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
+		checkcondls    []int32            = make([]int32, 0)
+		conf           *cfg.GameWorldTaskData
+		condis         []*pb.ConIProgress         = make([]*pb.ConIProgress, 0)
+		condisMap      map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
+		err            error
+		ok             bool
+	)
+	if len(wtask.Accepts) == 0 {
+		return
 	}
+
+	for _, v := range wtask.Accepts {
+		if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		for _, v := range conf.Completetask {
+			if _, ok = checkcondlsMap[v]; !ok {
+				checkcondlsMap[v] = struct{}{}
+				checkcondls = append(checkcondls, v)
+			}
+		}
+	}
+	if len(checkcondls) > 0 {
+		if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil {
+			this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ExternalModule,
+				Title:   pb.ErrorCode_ExternalModule.ToString(),
+				Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%s", err.Error()),
+			}
+			return
+		}
+		for _, v := range condis {
+			condisMap[v.Conid] = v
+		}
+	}
+
+	for _, v := range wtask.Accepts {
+		if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		task := &pb.DBWTaskItem{
+			Tid:    v,
+			Conlds: make([]*pb.ConIProgress, len(conf.Completetask)),
+		}
+		ok = true
+		for i, v := range conf.Completetask {
+			task.Conlds[i] = condisMap[v]
+		}
+		tasks = append(tasks, task)
+	}
+
+	session.SendMsg(string(this.GetType()), "info", &pb.WTaskAcceptChangePush{Accepts: tasks})
+
+	return
+}
+
+// 完成任务
+func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask) {
+	var (
+		opencmdMap map[string]int32
+		opencmd    []string
+		user       *pb.DBUser
+		errdata    *pb.ErrorData
+	)
+
+	if opencmdMap, errdata = this.modelSys.QueryOpenCondData(session.GetUserId()); errdata != nil {
+		this.Error("查询用户功能是否开启表 失败!", log.Field{Key: "key", Value: errdata})
+		return
+	}
+	opencmd = make([]string, 0)
+	for k, v := range opencmdMap {
+		if v == 2 {
+			opencmd = append(opencmd, k)
+		}
+	}
+	if user = this.ModuleUser.GetUser(session.GetUserId()); user != nil {
+		this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()})
+		return
+	}
+	this.inquireActivations(session, wtask, user.Lv, opencmd)
 }
 
 // 查询可接取任务列表
@@ -186,12 +274,17 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
 		if v.Des == 5 { //商队任务不主动触发
 			continue
 		}
-		wtask.Activations = append(wtask.Activations, v.Key)
+		if v.AutoAccept == 0 {
-		change = true
+			wtask.Activations = append(wtask.Activations, v.Key)
+			change = true
+		} else if v.AutoAccept == 1 { //自动接取任务
+			wtask.Accepts = append(wtask.Accepts, v.Key)
+		}
+
 	}
 
 	if change {
-		session.SendMsg(string(this.GetType()), "autofinsh", &pb.WTaskActivationsPush{Activations: wtask.Activations})
+		session.SendMsg(string(this.GetType()), "activations", &pb.WTaskActivationsChangePush{Activations: wtask.Activations})
 	}
 	return
 }

pb/wtask_db.pb.go

@@ -29,7 +29,7 @@ type DBWTask struct {
 	Id          string  `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                //唯一ID
 	Uid         string  `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`              //玩家ID
 	Activations []int32 `protobuf:"varint,3,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
-	Accepttask  []int32 `protobuf:"varint,4,rep,packed,name=accepttask,proto3" json:"accepttask"`   //已接取任务列表
+	Accepts     []int32 `protobuf:"varint,4,rep,packed,name=accepts,proto3" json:"accepts"`         //已接取任务列表
 	Completes   []int32 `protobuf:"varint,5,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
 }
 
@@ -86,9 +86,9 @@ func (x *DBWTask) GetActivations() []int32 {
 	return nil
 }
 
-func (x *DBWTask) GetAccepttask() []int32 {
+func (x *DBWTask) GetAccepts() []int32 {
 	if x != nil {
-		return x.Accepttask
+		return x.Accepts
 	}
 	return nil
 }
@@ -161,22 +161,21 @@ var File_wtask_wtask_db_proto protoreflect.FileDescriptor
 var file_wtask_wtask_db_proto_rawDesc = []byte{
 	0x0a, 0x14, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62,
-	0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8b,
+	0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85,
 	0x01, 0x0a, 0x07, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b,
 	0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e,
+	0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18,
-	0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03,
+	0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1c,
+	0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70,
-	0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d,
-	0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x0b,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73,
-	0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74,
+	0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a,
+	0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64,
-	0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72,
-	0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f,
+	0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x42, 0x06,
-	0x6e, 0x6c, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/wtask_msg.pb.go

@@ -65,9 +65,9 @@ type WTaskInfoResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Activations []int32        `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
+	Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
-	Accepttask  []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepttask,proto3" json:"accepttask"`           //已接取任务列表
+	Accepttask  []int32 `protobuf:"varint,2,rep,packed,name=accepttask,proto3" json:"accepttask"`   //已接取任务列表
-	Completes   []int32        `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
+	Completes   []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
 }
 
 func (x *WTaskInfoResp) Reset() {
@@ -109,7 +109,7 @@ func (x *WTaskInfoResp) GetActivations() []int32 {
 	return nil
 }
 
-func (x *WTaskInfoResp) GetAccepttask() []*DBWTaskItem {
+func (x *WTaskInfoResp) GetAccepttask() []int32 {
 	if x != nil {
 		return x.Accepttask
 	}
@@ -523,7 +523,7 @@ func (x *WTaskFinishResp) GetAward() []*UserAssets {
 }
 
 //可接入任务推送
-type WTaskActivationsPush struct {
+type WTaskActivationsChangePush struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -531,8 +531,8 @@ type WTaskActivationsPush struct {
 	Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
 }
 
-func (x *WTaskActivationsPush) Reset() {
+func (x *WTaskActivationsChangePush) Reset() {
-	*x = WTaskActivationsPush{}
+	*x = WTaskActivationsChangePush{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_wtask_wtask_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -540,13 +540,13 @@ func (x *WTaskActivationsPush) Reset() {
 	}
 }
 
-func (x *WTaskActivationsPush) String() string {
+func (x *WTaskActivationsChangePush) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WTaskActivationsPush) ProtoMessage() {}
+func (*WTaskActivationsChangePush) ProtoMessage() {}
 
-func (x *WTaskActivationsPush) ProtoReflect() protoreflect.Message {
+func (x *WTaskActivationsChangePush) ProtoReflect() protoreflect.Message {
 	mi := &file_wtask_wtask_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -558,12 +558,12 @@ func (x *WTaskActivationsPush) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WTaskActivationsPush.ProtoReflect.Descriptor instead.
+// Deprecated: Use WTaskActivationsChangePush.ProtoReflect.Descriptor instead.
-func (*WTaskActivationsPush) Descriptor() ([]byte, []int) {
+func (*WTaskActivationsChangePush) Descriptor() ([]byte, []int) {
 	return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *WTaskActivationsPush) GetActivations() []int32 {
+func (x *WTaskActivationsChangePush) GetActivations() []int32 {
 	if x != nil {
 		return x.Activations
 	}
@@ -571,16 +571,18 @@ func (x *WTaskActivationsPush) GetActivations() []int32 {
 }
 
 //已接取任务 进度变化推送
-type WTaskAccepttaskChangePush struct {
+type WTaskAcceptChangePush struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Accepttask []*DBWTaskItem `protobuf:"bytes,1,rep,name=accepttask,proto3" json:"accepttask"` //已接取任务列表
+	Activations []int32        `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
+	Accepts     []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepts,proto3" json:"accepts"`                 //已接取任务列表
+	Completes   []int32        `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
 }
 
-func (x *WTaskAccepttaskChangePush) Reset() {
+func (x *WTaskAcceptChangePush) Reset() {
-	*x = WTaskAccepttaskChangePush{}
+	*x = WTaskAcceptChangePush{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_wtask_wtask_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -588,13 +590,13 @@ func (x *WTaskAccepttaskChangePush) Reset() {
 	}
 }
 
-func (x *WTaskAccepttaskChangePush) String() string {
+func (x *WTaskAcceptChangePush) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WTaskAccepttaskChangePush) ProtoMessage() {}
+func (*WTaskAcceptChangePush) ProtoMessage() {}
 
-func (x *WTaskAccepttaskChangePush) ProtoReflect() protoreflect.Message {
+func (x *WTaskAcceptChangePush) ProtoReflect() protoreflect.Message {
 	mi := &file_wtask_wtask_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -606,74 +608,32 @@ func (x *WTaskAccepttaskChangePush) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WTaskAccepttaskChangePush.ProtoReflect.Descriptor instead.
+// Deprecated: Use WTaskAcceptChangePush.ProtoReflect.Descriptor instead.
-func (*WTaskAccepttaskChangePush) Descriptor() ([]byte, []int) {
+func (*WTaskAcceptChangePush) Descriptor() ([]byte, []int) {
 	return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *WTaskAccepttaskChangePush) GetAccepttask() []*DBWTaskItem {
+func (x *WTaskAcceptChangePush) GetActivations() []int32 {
 	if x != nil {
-		return x.Accepttask
+		return x.Activations
 	}
 	return nil
 }
 
-//任务自动完成 推送
+func (x *WTaskAcceptChangePush) GetAccepts() []*DBWTaskItem {
-type WTaskAutoFinshPush struct {
+	if x != nil {
-	state         protoimpl.MessageState
+		return x.Accepts
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Completes []int32       `protobuf:"varint,1,rep,packed,name=completes,proto3" json:"completes"` //可接取任务列表
-	Award     []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"`                 //奖励
-}
-
-func (x *WTaskAutoFinshPush) Reset() {
-	*x = WTaskAutoFinshPush{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wtask_wtask_msg_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
 	}
+	return nil
 }
 
-func (x *WTaskAutoFinshPush) String() string {
+func (x *WTaskAcceptChangePush) GetCompletes() []int32 {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WTaskAutoFinshPush) ProtoMessage() {}
-
-func (x *WTaskAutoFinshPush) ProtoReflect() protoreflect.Message {
-	mi := &file_wtask_wtask_msg_proto_msgTypes[12]
-	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 WTaskAutoFinshPush.ProtoReflect.Descriptor instead.
-func (*WTaskAutoFinshPush) Descriptor() ([]byte, []int) {
-	return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *WTaskAutoFinshPush) GetCompletes() []int32 {
 	if x != nil {
 		return x.Completes
 	}
 	return nil
 }
 
-func (x *WTaskAutoFinshPush) GetAward() []*UserAssets {
-	if x != nil {
-		return x.Award
-	}
-	return nil
-}
-
 var File_wtask_wtask_msg_proto protoreflect.FileDescriptor
 
 var file_wtask_wtask_msg_proto_rawDesc = []byte{
@@ -683,59 +643,57 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
 	0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x65, 0x71, 0x22, 0x7d, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x65, 0x71, 0x22, 0x6f, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
 	0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2c, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74,
-	0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54,
+	0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70,
-	0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74,
+	0x74, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
-	0x61, 0x73, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
+	0x74, 0x65, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65,
-	0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
+	0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x33, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b,
-	0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x33, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63,
+	0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61,
-	0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b,
+	0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x63, 0x0a, 0x13,
-	0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54,
+	0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74,
-	0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
+	0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e,
-	0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49,
+	0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
+	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
-	0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
+	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
-	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22,
+	0x65, 0x22, 0x37, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x37, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
+	0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66,
-	0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+	0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, 0x57, 0x54,
-	0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73,
+	0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
-	0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71,
+	0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
+	0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
-	0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
+	0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x17, 0x0a,
-	0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x17, 0x0a, 0x15, 0x57,
+	0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69,
-	0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
+	0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46,
-	0x52, 0x65, 0x73, 0x70, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
+	0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18,
-	0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x0f, 0x57, 0x54,
-	0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73,
+	0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
-	0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74,
+	0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a,
+	0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
-	0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61,
-	0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
+	0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76,
-	0x22, 0x38, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
-	0x69, 0x6f, 0x6e, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69,
+	0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61,
+	0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
-	0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x49, 0x0a, 0x19, 0x57, 0x54,
+	0x6e, 0x73, 0x22, 0x7f, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70,
-	0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61,
+	0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61,
-	0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2c, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70,
+	0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
-	0x74, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42,
+	0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a,
-	0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70,
+	0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
-	0x74, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x55, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x75,
+	0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63,
-	0x74, 0x6f, 0x46, 0x69, 0x6e, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63,
+	0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-	0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61,
+	0x74, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
+	0x74, 0x6f, 0x33,
-	0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -750,41 +708,38 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte {
 	return file_wtask_wtask_msg_proto_rawDescData
 }
 
-var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
+var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_wtask_wtask_msg_proto_goTypes = []interface{}{
-	(*WTaskInfoReq)(nil),              // 0: WTaskInfoReq
+	(*WTaskInfoReq)(nil),               // 0: WTaskInfoReq
-	(*WTaskInfoResp)(nil),             // 1: WTaskInfoResp
+	(*WTaskInfoResp)(nil),              // 1: WTaskInfoResp
-	(*WTaskAcceptReq)(nil),            // 2: WTaskAcceptReq
+	(*WTaskAcceptReq)(nil),             // 2: WTaskAcceptReq
-	(*WTaskAcceptResp)(nil),           // 3: WTaskAcceptResp
+	(*WTaskAcceptResp)(nil),            // 3: WTaskAcceptResp
-	(*WTaskBattleStartReq)(nil),       // 4: WTaskBattleStartReq
+	(*WTaskBattleStartReq)(nil),        // 4: WTaskBattleStartReq
-	(*WTaskBattleStartResp)(nil),      // 5: WTaskBattleStartResp
+	(*WTaskBattleStartResp)(nil),       // 5: WTaskBattleStartResp
-	(*WTaskBattleFinishReq)(nil),      // 6: WTaskBattleFinishReq
+	(*WTaskBattleFinishReq)(nil),       // 6: WTaskBattleFinishReq
-	(*WTaskBattleFinishResp)(nil),     // 7: WTaskBattleFinishResp
+	(*WTaskBattleFinishResp)(nil),      // 7: WTaskBattleFinishResp
-	(*WTaskFinishReq)(nil),            // 8: WTaskFinishReq
+	(*WTaskFinishReq)(nil),             // 8: WTaskFinishReq
-	(*WTaskFinishResp)(nil),           // 9: WTaskFinishResp
+	(*WTaskFinishResp)(nil),            // 9: WTaskFinishResp
-	(*WTaskActivationsPush)(nil),      // 10: WTaskActivationsPush
+	(*WTaskActivationsChangePush)(nil), // 10: WTaskActivationsChangePush
-	(*WTaskAccepttaskChangePush)(nil), // 11: WTaskAccepttaskChangePush
+	(*WTaskAcceptChangePush)(nil),      // 11: WTaskAcceptChangePush
-	(*WTaskAutoFinshPush)(nil),        // 12: WTaskAutoFinshPush
+	(*DBWTaskItem)(nil),                // 12: DBWTaskItem
-	(*DBWTaskItem)(nil),               // 13: DBWTaskItem
+	(*BattleFormation)(nil),            // 13: BattleFormation
-	(*BattleFormation)(nil),           // 14: BattleFormation
+	(*BattleInfo)(nil),                 // 14: BattleInfo
-	(*BattleInfo)(nil),                // 15: BattleInfo
+	(*BattleReport)(nil),               // 15: BattleReport
-	(*BattleReport)(nil),              // 16: BattleReport
+	(*UserAssets)(nil),                 // 16: UserAssets
-	(*UserAssets)(nil),                // 17: UserAssets
 }
 var file_wtask_wtask_msg_proto_depIdxs = []int32{
-	13, // 0: WTaskInfoResp.accepttask:type_name -> DBWTaskItem
+	12, // 0: WTaskAcceptResp.task:type_name -> DBWTaskItem
-	13, // 1: WTaskAcceptResp.task:type_name -> DBWTaskItem
+	13, // 1: WTaskBattleStartReq.battle:type_name -> BattleFormation
-	14, // 2: WTaskBattleStartReq.battle:type_name -> BattleFormation
+	14, // 2: WTaskBattleStartResp.info:type_name -> BattleInfo
-	15, // 3: WTaskBattleStartResp.info:type_name -> BattleInfo
+	15, // 3: WTaskBattleFinishReq.report:type_name -> BattleReport
-	16, // 4: WTaskBattleFinishReq.report:type_name -> BattleReport
+	16, // 4: WTaskFinishResp.award:type_name -> UserAssets
-	17, // 5: WTaskFinishResp.award:type_name -> UserAssets
+	12, // 5: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
-	13, // 6: WTaskAccepttaskChangePush.accepttask:type_name -> DBWTaskItem
+	6,  // [6:6] is the sub-list for method output_type
-	17, // 7: WTaskAutoFinshPush.award:type_name -> UserAssets
+	6,  // [6:6] is the sub-list for method input_type
-	8,  // [8:8] is the sub-list for method output_type
+	6,  // [6:6] is the sub-list for extension type_name
-	8,  // [8:8] is the sub-list for method input_type
+	6,  // [6:6] is the sub-list for extension extendee
-	8,  // [8:8] is the sub-list for extension type_name
+	0,  // [0:6] is the sub-list for field type_name
-	8,  // [8:8] is the sub-list for extension extendee
-	0,  // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_wtask_wtask_msg_proto_init() }
@@ -917,7 +872,7 @@ func file_wtask_wtask_msg_proto_init() {
 			}
 		}
 		file_wtask_wtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WTaskActivationsPush); i {
+			switch v := v.(*WTaskActivationsChangePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -929,19 +884,7 @@ func file_wtask_wtask_msg_proto_init() {
 			}
 		}
 		file_wtask_wtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WTaskAccepttaskChangePush); i {
+			switch v := v.(*WTaskAcceptChangePush); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wtask_wtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WTaskAutoFinshPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -959,7 +902,7 @@ func file_wtask_wtask_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_wtask_wtask_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   13,
+			NumMessages:   12,
 			NumExtensions: 0,
 			NumServices:   0,
 		},