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-05-26 19:14:23 +08:00
commit 4b23e35bea
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comm/const.go
View File

@ -653,7 +653,7 @@ const (
Rtype168 TaskType = 168 //完成功夫大师挑战塔第X层 Rtype168 TaskType = 168 //完成功夫大师挑战塔第X层
Rtype169 TaskType = 169 //触发指定套装的套装效果 Rtype169 TaskType = 169 //触发指定套装的套装效果
Rtype170 TaskType = 170 //获得指定材料X个 //Rtype170 TaskType = 170 //获得指定材料X个
Rtype171 TaskType = 171 Rtype171 TaskType = 171
Rtype172 TaskType = 172 //连续战斗X次（接取任务后，在任意战斗内使用连续战斗一次，进度便加一） Rtype172 TaskType = 172 //连续战斗X次（接取任务后，在任意战斗内使用连续战斗一次，进度便加一）
Rtype173 TaskType = 173 //解锁星象点X次（接取任务后，每解锁任意英的星象点一次，进度便加一） Rtype173 TaskType = 173 //解锁星象点X次（接取任务后，每解锁任意英的星象点一次，进度便加一）

2
modules/items/modelitems.go
View File

@ -9,7 +9,6 @@ import (
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db" "go_dreamfactory/sys/db"
"go_dreamfactory/utils"
"math" "math"
"time" "time"
@ -295,7 +294,6 @@ func (this *ModelItemsComp) AddItemsToUserPack(uId string, items map[string]int3
} }
change = append(change, add...) change = append(change, add...)
// //
go this.module.ModuleRtask.TriggerTask(uId, comm.GettaskParam(comm.Rtype170, utils.ToInt32(k), v))
} }
if len(del) > 0 { if len(del) > 0 {

5
modules/items/module.go
View File

@ -159,7 +159,10 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
this.itemsChangePush(session, change) //推送道具背包变化 this.itemsChangePush(session, change) //推送道具背包变化
} }
for k, v := range items { for k, v := range items {
tasks = append(tasks, comm.GettaskParam(comm.Rtype187, v, utils.ToInt32(k))) if v > 0 {
tasks = append(tasks, comm.GettaskParam(comm.Rtype187, v, utils.ToInt32(k)))
//tasks = append(tasks, comm.GettaskParam(comm.Rtype170, utils.ToInt32(k), v)) // 20230526 移除170 任务
}
} }
if len(tasks) > 0 { if len(tasks) > 0 {
go this.ModuleRtask.TriggerTask(session.GetUserId(), tasks...) go this.ModuleRtask.TriggerTask(session.GetUserId(), tasks...)

2
modules/rtask/module.go
View File

@ -188,7 +188,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
comm.Rtype46, comm.Rtype76, comm.Rtype79, comm.Rtype46, comm.Rtype76, comm.Rtype79,
comm.Rtype52, comm.Rtype55, comm.Rtype56, comm.Rtype82, comm.Rtype52, comm.Rtype55, comm.Rtype56, comm.Rtype82,
comm.Rtype65, comm.Rtype66, comm.Rtype67, comm.Rtype68, comm.Rtype70, comm.Rtype140, comm.Rtype65, comm.Rtype66, comm.Rtype67, comm.Rtype68, comm.Rtype70, comm.Rtype140,
comm.Rtype169, comm.Rtype170, comm.Rtype174, comm.Rtype179, comm.Rtype180: comm.Rtype169, comm.Rtype174, comm.Rtype179, comm.Rtype180:
handle := &rtaskCondHandle{ handle := &rtaskCondHandle{
condId: v.Id, condId: v.Id,
verify: this.modelRtaskRecord.verifyMultiEqual, verify: this.modelRtaskRecord.verifyMultiEqual,