Commit d3f4f20c23c7e13ee97999cdd1ff09222e3e4b83
1 parent
66907dd9
Exists in
master
提交
Showing
1 changed file
with
6 additions
and
6 deletions
Show diff stats
src/HttpServer/logic/function.go
| @@ -94,8 +94,8 @@ func GetAchieveConfig(taskid int) *jsonconf.AchieveDesc { | @@ -94,8 +94,8 @@ func GetAchieveConfig(taskid int) *jsonconf.AchieveDesc { | ||
| 94 | 94 | ||
| 95 | func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | 95 | func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { |
| 96 | 96 | ||
| 97 | - newlist := new(TaskList) | ||
| 98 | - curtype := -1 //记录当前类型 | 97 | + //newlist := new(TaskList) |
| 98 | + //curtype := -1 //记录当前类型 | ||
| 99 | 99 | ||
| 100 | for k, val := range list.Taskdata { | 100 | for k, val := range list.Taskdata { |
| 101 | //未完成的才做判断 | 101 | //未完成的才做判断 |
| @@ -157,7 +157,7 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | @@ -157,7 +157,7 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | ||
| 157 | 157 | ||
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | - for k, val := range list.Taskdata { | 160 | + /*for k, val := range list.Taskdata { |
| 161 | 161 | ||
| 162 | cfg := GetTaskConfig(val.Taskid) | 162 | cfg := GetTaskConfig(val.Taskid) |
| 163 | if cfg == nil { | 163 | if cfg == nil { |
| @@ -203,15 +203,15 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | @@ -203,15 +203,15 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | ||
| 203 | } | 203 | } |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | - } | 206 | + }*/ |
| 207 | 207 | ||
| 208 | //需要保存到redis | 208 | //需要保存到redis |
| 209 | SaveTaskInfo(uniqueid, 1, list) | 209 | SaveTaskInfo(uniqueid, 1, list) |
| 210 | 210 | ||
| 211 | //排序 | 211 | //排序 |
| 212 | - sort.Sort(newlist) | 212 | + sort.Sort(list) |
| 213 | 213 | ||
| 214 | - return newlist | 214 | + return list |
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | func (uinfo *UserData) CalcAchieveProgress(ttype int) int { | 217 | func (uinfo *UserData) CalcAchieveProgress(ttype int) int { |