model/bankruptlog.go

@@ -12,7 +12,6 @@ var (
 type BankruptLog struct {
 	LogId      bson.ObjectId `bson:"_id"`
 	SnId       int32         //玩家id
-	Channel    string        // 渠道
 	Platform   string        //平台名称
 	GameId     int           //游戏id
 	GameFreeID int32         //房间id
@@ -27,11 +26,10 @@ func NewBankruptLog() *BankruptLog {
 	return log
 }
 
-func NewBankruptLogEx(snid int32, gamefreeid int32, createtime, usecoin int64, platform, channel string, gameId int) *BankruptLog {
+func NewBankruptLogEx(snid int32, gamefreeid int32, createtime, usecoin int64, platform string, gameId int) *BankruptLog {
 	cl := NewBankruptLog()
 	cl.SnId = snid
 	cl.Platform = platform
-	cl.Channel = channel
 	cl.GameId = gameId
 
 	cl.GameFreeID = gamefreeid

srvdata/task.go

@@ -13,15 +13,12 @@ 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 {
@@ -35,10 +32,6 @@ func (m *Task) Reload(fileFullPath string) error {
 	return m.Load(fileFullPath)
 }
 
-func (m *Task) GetActivityType(tp int32) []*server.DB_Task {
+func (m *Task) Get(tp int32) []*server.DB_Task {
 	return m.ActivityType[tp]
 }
-
-func (m *Task) GetTaskType(tp int32) []*server.DB_Task {
-	return m.TaskType[tp]
-}

worldsrv/action_server.go

@@ -121,7 +121,7 @@ func init() {
 								CostCoin := p.takeCoin - msg.GetReturnCoin()
 
 								logger.Logger.Infof("NewBankruptLogEx: snid:%v GetReturnCoin:%v coin:%v CostCoin:%v", p.SnId, msg.GetReturnCoin(), p.takeCoin, CostCoin)
-								log := model.NewBankruptLogEx(p.SnId, scene.dbGameFree.GetId(), p.CreateTime.Unix(), CostCoin, p.Platform, p.Channel, scene.gameId)
+								log := model.NewBankruptLogEx(p.SnId, scene.dbGameFree.GetId(), p.CreateTime.Unix(), CostCoin, p.Platform, scene.gameId)
 								if log != nil {
 									LogChannelSingleton.WriteLog(log)
 								}

worldsrv/action_task.go

@@ -103,7 +103,7 @@ func CSTaskList(s *netlib.Session, packetId int, data interface{}, sid int64) er
 		Tp: msg.GetTp(),
 	}
 
-	for _, v := range srvdata.TaskMgr.GetActivityType(msg.GetTp()) {
+	for _, v := range srvdata.TaskMgr.Get(msg.GetTp()) {
 		item := &taskproto.TaskData{
 			Id:       v.Id,
 			N:        GetTaskTimes(p, v.Id),

worldsrv/player.go

@@ -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.GetActivityType(common.TaskActivityTypeEveryDay) {
+			for _, v := range srvdata.TaskMgr.Get(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.GetActivityType(common.TaskActivityTypeWeek) {
+			for _, v := range srvdata.TaskMgr.Get(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.GetActivityType(tp) {
+	for _, v := range srvdata.TaskMgr.Get(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.GetActivityType(tp) {
+	for _, v := range srvdata.TaskMgr.Get(tp) {
 		this.WelfData.Task[v.GetId()] = &model.TaskData{}
 	}
 }

worldsrv/taskmgr.go

@@ -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.GetTaskType(int32(id)) {
+	for _, v := range srvdata.TaskMgr.Get(int32(id)) {
 		if !info.Debug {
 			// 游戏类型
 			switch v.GetGameType() {