From fe3cc724ab32f8b80968c58b8c580b3730caca78 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 31 Mar 2023 13:42:55 +0800
Subject: [PATCH] merge

---
 pb/errorcode.pb.go | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index fa5ff58b4..671762783 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -313,13 +313,15 @@ const (
 	ErrorCode_PayRenewTimeErr    ErrorCode = 3702 // 续费时间没达到要求
 	ErrorCode_PayOrderCompleted  ErrorCode = 3703 // 订单已完成
 	// worldtask
-	ErrorCode_WorldtaskFinish         ErrorCode = 3801 //任务完成失败
-	ErrorCode_WorldtaskLvNotEnough    ErrorCode = 3802 //等级不满足
-	ErrorCode_WorldtaskNoAccept       ErrorCode = 3803 //不能接取
-	ErrorCode_WorldtaskNoComplete     ErrorCode = 3804 //任务条件未完成
-	ErrorCode_WorldtaskFinihed        ErrorCode = 3805 //任务已完成
-	ErrorCode_WorldtaskLastUnFinished ErrorCode = 3806 //上个任务未完成
-	ErrorCode_WorldtaskGroupIdNosame  ErrorCode = 3807 //组ID不一致
+	ErrorCode_WorldtaskFinish            ErrorCode = 3801 //任务完成失败
+	ErrorCode_WorldtaskLvNotEnough       ErrorCode = 3802 //等级不满足
+	ErrorCode_WorldtaskNoAccept          ErrorCode = 3803 //不能接取
+	ErrorCode_WorldtaskNoComplete        ErrorCode = 3804 //任务条件未完成
+	ErrorCode_WorldtaskFinihed           ErrorCode = 3805 //任务已完成
+	ErrorCode_WorldtaskLastUnFinished    ErrorCode = 3806 //上个任务未完成
+	ErrorCode_WorldtaskGroupIdNosame     ErrorCode = 3807 //组ID不一致
+	ErrorCode_WorldtaskChapterUnFinished ErrorCode = 3808 //章节任务未完成
+	ErrorCode_WorldtaskChapterReceived   ErrorCode = 3809 //章节奖励已领取
 	// academy
 	ErrorCode_AcademyTaskNoCompleteTask ErrorCode = 3901 //未完成任务
 	// AutoBattle
@@ -629,6 +631,8 @@ var (
 		3805: "WorldtaskFinihed",
 		3806: "WorldtaskLastUnFinished",
 		3807: "WorldtaskGroupIdNosame",
+		3808: "WorldtaskChapterUnFinished",
+		3809: "WorldtaskChapterReceived",
 		3901: "AcademyTaskNoCompleteTask",
 		4001: "AutoBattleNoData",
 		4002: "AutoBattleStatesErr",
@@ -930,6 +934,8 @@ var (
 		"WorldtaskFinihed":            3805,
 		"WorldtaskLastUnFinished":     3806,
 		"WorldtaskGroupIdNosame":      3807,
+		"WorldtaskChapterUnFinished":  3808,
+		"WorldtaskChapterReceived":    3809,
 		"AcademyTaskNoCompleteTask":   3901,
 		"AutoBattleNoData":            4001,
 		"AutoBattleStatesErr":         4002,
@@ -995,7 +1001,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xa7, 0x36, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xe7, 0x36, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1380,7 +1386,11 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46,
 	0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f,
 	0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f,
-	0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65,
+	0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64,
+	0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x55, 0x6e, 0x46, 0x69, 0x6e,
+	0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65,
+	0x69, 0x76, 0x65, 0x64, 0x10, 0xe1, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65,
 	0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
 	0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42,
 	0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18,