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

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

Browse Source
This commit is contained in:
liwei1dao 2023-09-25 15:36:03 +08:00
commit c5da477a08
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/caravan/api_getreward.go
View File

@ -47,11 +47,11 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.CaravanGetRewa
Title: pb.ErrorCode_TrollCantReward.ToString(), Title: pb.ErrorCode_TrollCantReward.ToString(),
} }
return return
} else {
res = append(res, v.Reward...)
} }
res = append(res, v.Reward...)
break break
} }
} }
if len(res) == 0 { if len(res) == 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{

20
modules/smithy/model_task.go
View File

@ -71,16 +71,16 @@ func (this *modelTask) updateTaskRecord(uid string, taskId int32) error {
return nil return nil
} }
// 红点检测 // 红点检测 2023/9/25需求 屏蔽铁匠铺任务红点
func (this *modelTask) checkReddot17107(uid string) bool { func (this *modelTask) checkReddot17107(uid string) bool {
dt, err := this.getTaskRecord(uid) // dt, err := this.getTaskRecord(uid)
if err != nil { // if err != nil {
return false // return false
} // }
for _, v := range dt.Tasks { // for _, v := range dt.Tasks {
if v.Received == 1 { // if v.Received == 1 {
return true // return true
} // }
} // }
return false return false
} }