refactor: 重构每日重置逻辑条件判断
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful

This commit is contained in:
xinian
2026-03-14 12:09:30 +08:00
committed by cnb
parent 4e1fdd6a22
commit 3a39abe9c6

View File

@@ -93,52 +93,54 @@ func (s *InfoService) GetLogin() *model.PlayerInfo {
}
}
if cool.Config.ServerInfo.IsVip == 0 {
if !utils.IsToday(tt.LastResetTime) { //判断是否是今天
if !utils.IsToday(tt.LastResetTime) && cool.Config.ServerInfo.IsVip == 0 { //判断是否是今天
//每天login时候检查重置时间然后把电池任务挖矿重置
//挖矿需要单独存,因为防止多开挖矿
tt.LastResetTime = gtime.Now()
//每天login时候检查重置时间然后把电池任务挖矿重置
//挖矿需要单独存,因为防止多开挖矿
tt.Data.TimeToday = 0 //重置电池
//tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数
//每天login时候检查重置时间然后把电池任务挖矿重置
//挖矿需要单独存,因为防止多开挖矿
tt.LastResetTime = gtime.Now()
//每天login时候检查重置时间然后把电池任务挖矿重置
//挖矿需要单独存,因为防止多开挖矿
tt.Data.TimeToday = 0 //重置电池
//tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数
for _, v := range service.NewTaskService().GetDaily() {
if v.IsAcceptable == 1 {
tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
} else {
tt.Data.SetTask(int(v.TaskId), model.Reserved)
}
for _, v := range service.NewTaskService().GetDaily() {
if v.IsAcceptable == 1 {
tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
} else {
tt.Data.SetTask(int(v.TaskId), model.Reserved)
}
}
// for i := 0; i < 50; i++ { //每日任务区段
// tt.Data.DailyResArr[i] = 0 //重置每日任务
// for i := 0; i < 50; i++ { //每日任务区段
// tt.Data.DailyResArr[i] = 0 //重置每日任务
// }
// //defer t.Service.Talk_Reset()
_, err := s.dbm_fix(s.Model).Data("last_reset_time", gtime.Now()).Update()
if err != nil {
panic(err)
}
}
if !IsWEEK(tt.WeekLastResetTime) && cool.Config.ServerInfo.IsVip == 0 {
for _, v := range service.NewTaskService().GetWeek() {
if v.IsAcceptable == 1 {
tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
} else {
tt.Data.SetTask(int(v.TaskId), model.Reserved)
// }
// //defer t.Service.Talk_Reset()
_, err := s.dbm_fix(s.Model).Data("last_reset_time", gtime.Now()).Update()
if err != nil {
panic(err)
}
}
_, err := s.dbm_fix(s.Model).Data("week_last_reset_time", gtime.Now()).Update()
if err != nil {
panic(err)
if !IsWEEK(tt.WeekLastResetTime) {
for _, v := range service.NewTaskService().GetWeek() {
if v.IsAcceptable == 1 {
tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
} else {
tt.Data.SetTask(int(v.TaskId), model.Reserved)
}
}
_, err := s.dbm_fix(s.Model).Data("week_last_reset_time", gtime.Now()).Update()
if err != nil {
panic(err)
}
}
}
ret := tt.Data
return &ret