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

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

Browse Source
This commit is contained in:
meixiongfeng 2023-07-20 10:14:08 +08:00
commit 4a793aab9e
2 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/dispatch/api_refresh.go
View File

@ -9,14 +9,17 @@ import (
)
// 刷新
func (a *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) {
func (this *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) {
return
}
func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) {
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
if d == nil {
func (this *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) {
var (
info *pb.DBDispatch
need []*cfg.Gameatn
)
info = this.module.modelDispatch.getDBDispatch(session.GetUserId())
if info == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DataNotFound,
Title: pb.ErrorCode_DataNotFound.ToString(),
@ -24,10 +27,10 @@ func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq)
return
}
if d.Nb != nil {
if d.Nb.FreeCount > 0 {
if info.Nb != nil {
if info.Nb.FreeCount > 0 {
//更新刷新次数
if err := a.module.modelDispatch.updateFreeCount(session.GetUserId(), d.Nb); err != nil {
if err := this.module.modelDispatch.updateFreeCount(session.GetUserId(), info.Nb); err != nil {
var customer = new(comm.CustomError)
var code pb.ErrorCode
if errors.As(err, &customer) {
@ -47,24 +50,28 @@ func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq)
return
}
} else {
refreshCount := a.module.ModuleTools.GetGlobalConf().DispatchRefreshtimes
if d.Nb.RefreshCount >= refreshCount {
refreshCount := this.module.ModuleTools.GetGlobalConf().DispatchRefreshtimes
if info.Nb.RefreshCount >= refreshCount {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DispatchRefreshMax,
Title: pb.ErrorCode_DispatchRefreshMax.ToString(),
}
return
}
//消耗金币
money := a.module.ModuleTools.GetGlobalConf().DispatchCheckmoney
if errdata = a.module.CheckRes(session, []*cfg.Gameatn{money}); errdata != nil {
return
}
need = make([]*cfg.Gameatn, 0)
money := this.module.ModuleTools.GetGlobalConf().DispatchCheckmoney
if errdata = a.module.ConsumeRes(session, []*cfg.Gameatn{money}, true); errdata != nil {
need = append(need, &cfg.Gameatn{
A: money.A,
T: money.T,
N: money.N * (info.Nb.RefreshCount + 1),
})
//消耗金币
if errdata = this.module.ConsumeRes(session, need, true); errdata != nil {
return
}
if err := a.module.modelDispatch.updateRefreshCount(session.GetUserId(), d.Nb); err != nil {
if err := this.module.modelDispatch.updateRefreshCount(session.GetUserId(), info.Nb); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@ -76,22 +83,22 @@ func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq)
}
//刷新公告（随机新的任务 包括未领取和正在进行的任务）
tasks, err := a.module.modelDispatch.taskRandom(session.GetUserId(), d)
tasks, err := this.module.modelDispatch.taskRandom(session.GetUserId(), info)
if err != nil {
return
}
//更新公告任务
if err := a.module.modelDispatch.updateTasks(session.GetUserId(), d.Nb, tasks); err != nil {
a.module.Debug("更新公告失败", log.Field{Key: "uid", Value: session.GetUserId()})
if err := this.module.modelDispatch.updateTasks(session.GetUserId(), info.Nb, tasks); err != nil {
this.module.Debug("更新公告失败", log.Field{Key: "uid", Value: session.GetUserId()})
return
}
rsp := &pb.DispatchRefreshResp{
FreeCount: d.Nb.FreeCount,
RefreshCount: d.Nb.RefreshCount,
FreeCount: info.Nb.FreeCount,
RefreshCount: info.Nb.RefreshCount,
}
session.SendMsg(string(a.module.GetType()), "refresh", rsp)
session.SendMsg(string(this.module.GetType()), "refresh", rsp)
return
}

21
utils/time.go
View File

@ -18,15 +18,20 @@ func IsToday(d int64) bool {
// 判断是否是出于同一周
func IsSameWeek(d int64) bool {
// 将时间戳转换成一个 time.Time 对象
t1 := time.Unix(d, 0)
t2 := configure.Now()
// 将时间戳转换为 time.Time 类型
time1 := time.Unix(d, 0)
time2 := configure.Now()
// 获取 t1 所在的周的第一天和 t2 所在的周的第一天
t1FirstDay := t1.AddDate(0, 0, -int(t1.Weekday())+1)
t2FirstDay := t2.AddDate(0, 0, -int(t2.Weekday())+1)
// 判断两个时间所在的周的第一天是否相同
return t1FirstDay.Equal(t2FirstDay)
// 获取时间戳所属的年份和周数
year1, week1 := time1.ISOWeek()
year2, week2 := time2.ISOWeek()
// 判断是否同一年同一周
if year1 == year2 && week1 == week2 {
return true
} else {
return false
}
}
// 判断是否大于1周