diff --git a/config/GuideTask.xlsx b/config/GuideTask.xlsx new file mode 100644 index 00000000..ccd07e46 Binary files /dev/null and b/config/GuideTask.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 17c9821b..5cedeabd 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -77,6 +77,8 @@ enum ITEM_POP_LABEL { // item弹窗标签 CatnipPlay = 69; // 猫草大作战玩法奖励 FriendTReward = 70; // 好友时间线奖励 PetTheif = 71; // 宠物小偷奖励 + GuideTaskReward = 72; // 新手任务奖励 + GuideActiveReward = 73; // 新手任务活跃度奖励 } enum HANDLE_TYPE { ADD = 0; @@ -1076,8 +1078,38 @@ message CardPack{ repeated int32 Card = 2; } -//日常任务 +// 新手任务 +message ResGuideTask{ + repeated int32 ActiveReward = 1; //已领取活跃度奖励 + map Task = 2; //任务进度 + int32 Active = 3; //活跃度 + int32 UnlockTime = 4; // 功能解锁时间 +} +message GuideTask{ + int32 Status = 1; //状态 0:未完成, 1已完成 2已领取 + QuestProgress Progress = 2; //任务进度 + int32 Id = 3; //任务id +} +message ReqGetGuideTaskReward{ + int32 Id = 1;// 任务id +} + +message ResGetGuideTaskReward{ + RES_CODE Code = 1; + string Msg = 2; +} + +message ReqGetGuideActiveReward{ + int32 Id = 1;// 进度奖励id +} + +message ResGetGuideActiveReward{ + RES_CODE Code = 1; + string Msg = 2; +} + +//日常任务 message ResDailyTask{ map WeekReward = 1; //周奖励 map DailyTask = 2; //任务进度 @@ -1086,6 +1118,8 @@ message ResDailyTask{ int32 WeekEnd = 5; //周结束时间戳 } + + message DailyWeek{ repeated ItemInfo Items = 1; //奖励 bool Status = 2; //状态 0:未领取 1:已领取 diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index f4356b74..85b108df 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -723,6 +723,27 @@ "key": "Key", "sheet_name" :"Const", "fields" :["Value"] + }, + { + "in_file": "GuideTask.xlsx", + "out_file": "GuideTaskConst.json", + "key": "Key", + "sheet_name" :"Const", + "fields" :["Value"] + }, + { + "in_file": "GuideTask.xlsx", + "out_file": "GuideTaskTask.json", + "key": "Id", + "sheet_name" :"Task", + "fields" :["Task","Unlock","Items","Active"] + }, + { + "in_file": "GuideTask.xlsx", + "out_file": "GuideTaskActive.json", + "key": "Id", + "sheet_name" :"Active", + "fields" :["Active","Items"] } ] } \ No newline at end of file