liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
meixiongfeng 2022-11-22 14:40:36 +08:00
parent d1569a77d5
commit 5614739601
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comm/const.go
View File

@ -497,11 +497,7 @@ const (
Rtype137 TaskType = 137 //累计铁匠铺锻造X小时（历史）(从创号开始记录，满1小时进度+1) Rtype137 TaskType = 137 //累计铁匠铺锻造X小时（历史）(从创号开始记录，满1小时进度+1)
Rtype138 TaskType = 138 //在线N分钟(从接到任务开始，记录玩家在线时间并记入进度) Rtype138 TaskType = 138 //在线N分钟(从接到任务开始，记录玩家在线时间并记入进度)
Rtype139 TaskType = 139 //通过融合获得指定英雄(从接到任务开始记录，通过融合获得指定英雄则任务完成) Rtype139 TaskType = 139 //通过融合获得指定英雄(从接到任务开始记录，通过融合获得指定英雄则任务完成)
<<<<<<< HEAD
Rtype140 TaskType = 140 //关卡编辑器完成条件 Rtype140 TaskType = 140 //关卡编辑器完成条件
=======
>>>>>>> 8def819e118af719604f8c08eda354d931faa7c7
) )
const ( const (