成就任务
This commit is contained in:
parent
7c11fc955b
commit
c40b779c39
|
@ -13,12 +13,15 @@ var TaskMgr = &Task{}
|
|||
|
||||
type Task struct {
|
||||
ActivityType map[int32][]*server.DB_Task
|
||||
TaskType map[int32][]*server.DB_Task
|
||||
}
|
||||
|
||||
func (m *Task) Load(fileFullPath string) error {
|
||||
m.ActivityType = make(map[int32][]*server.DB_Task)
|
||||
m.TaskType = make(map[int32][]*server.DB_Task)
|
||||
for _, v := range PBDB_TaskMgr.Datas.GetArr() {
|
||||
m.ActivityType[v.GetActivityType()] = append(m.ActivityType[v.GetActivityType()], v)
|
||||
m.TaskType[v.GetTaskType()] = append(m.TaskType[v.GetTaskType()], v)
|
||||
}
|
||||
for _, v := range m.ActivityType {
|
||||
sort.Slice(v, func(i, j int) bool {
|
||||
|
@ -32,6 +35,10 @@ func (m *Task) Reload(fileFullPath string) error {
|
|||
return m.Load(fileFullPath)
|
||||
}
|
||||
|
||||
func (m *Task) Get(tp int32) []*server.DB_Task {
|
||||
func (m *Task) GetActivityType(tp int32) []*server.DB_Task {
|
||||
return m.ActivityType[tp]
|
||||
}
|
||||
|
||||
func (m *Task) GetTaskType(tp int32) []*server.DB_Task {
|
||||
return m.TaskType[tp]
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@ func CSTaskList(s *netlib.Session, packetId int, data interface{}, sid int64) er
|
|||
Tp: msg.GetTp(),
|
||||
}
|
||||
|
||||
for _, v := range srvdata.TaskMgr.Get(msg.GetTp()) {
|
||||
for _, v := range srvdata.TaskMgr.GetActivityType(msg.GetTp()) {
|
||||
item := &taskproto.TaskData{
|
||||
Id: v.Id,
|
||||
N: GetTaskTimes(p, v.Id),
|
||||
|
|
|
@ -2246,7 +2246,7 @@ func (this *Player) OnDayTimer(login, continuous bool, t int) {
|
|||
// 重置每日任务
|
||||
if this.WelfData != nil {
|
||||
if this.WelfData.Task != nil {
|
||||
for _, v := range srvdata.TaskMgr.Get(common.TaskActivityTypeEveryDay) {
|
||||
for _, v := range srvdata.TaskMgr.GetActivityType(common.TaskActivityTypeEveryDay) {
|
||||
this.WelfData.Task[v.GetId()] = &model.TaskData{}
|
||||
}
|
||||
this.WelfData.Task[common.TaskIDInvitePlayGame] = &model.TaskData{}
|
||||
|
@ -2313,7 +2313,7 @@ func (this *Player) OnWeekTimer() {
|
|||
// 重置周任务
|
||||
if this.WelfData != nil {
|
||||
if this.WelfData.Task != nil {
|
||||
for _, v := range srvdata.TaskMgr.Get(common.TaskActivityTypeWeek) {
|
||||
for _, v := range srvdata.TaskMgr.GetActivityType(common.TaskActivityTypeWeek) {
|
||||
this.WelfData.Task[v.GetId()] = &model.TaskData{}
|
||||
}
|
||||
}
|
||||
|
@ -4459,7 +4459,7 @@ func (this *Player) ResetTaskN(tp int32) {
|
|||
return
|
||||
}
|
||||
|
||||
for _, v := range srvdata.TaskMgr.Get(tp) {
|
||||
for _, v := range srvdata.TaskMgr.GetActivityType(tp) {
|
||||
data := this.WelfData.Task[v.GetId()]
|
||||
if data != nil {
|
||||
data.N = 0
|
||||
|
@ -4472,7 +4472,7 @@ func (this *Player) ResetTask(tp int32) {
|
|||
return
|
||||
}
|
||||
|
||||
for _, v := range srvdata.TaskMgr.Get(tp) {
|
||||
for _, v := range srvdata.TaskMgr.GetActivityType(tp) {
|
||||
this.WelfData.Task[v.GetId()] = &model.TaskData{}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -157,7 +157,7 @@ func (t *TaskHandle) AllTask(id int, data any) {
|
|||
logger.Logger.Tracef("AllTask taskID:%v %v", id, p.WelfData.Task[int32(id)])
|
||||
|
||||
change := map[int32][]*taskproto.TaskData{}
|
||||
for _, v := range srvdata.TaskMgr.Get(int32(id)) {
|
||||
for _, v := range srvdata.TaskMgr.GetTaskType(int32(id)) {
|
||||
if !info.Debug {
|
||||
// 游戏类型
|
||||
switch v.GetGameType() {
|
||||
|
|
Loading…
Reference in New Issue