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:
meixiongfeng 2023-10-11 18:31:47 +08:00
commit d9a92ce0c8
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/arena/api_plot.go
View File

@ -3,9 +3,7 @@ package arena
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"time"
) )
// 参数校验 // 参数校验
@ -47,17 +45,17 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd
return return
} }
if info.Npc[req.Pid] != nil { // if info.Npc[req.Pid] != nil {
ndata := info.Npc[req.Pid] // ndata := info.Npc[req.Pid]
if !configure.Now().After(time.Unix(ndata.Cd, 0)) { //已经过了cd时间 // if !configure.Now().After(time.Unix(ndata.Cd, 0)) { //已经过了cd时间
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_ArenaTicketNpcInCd, // Code: pb.ErrorCode_ArenaTicketNpcInCd,
Title: pb.ErrorCode_ArenaTicketNpcInCd.ToString(), // Title: pb.ErrorCode_ArenaTicketNpcInCd.ToString(),
} // }
return // return
} // }
index = ndata.Index // index = ndata.Index
} // }
if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{ if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Rulesid: npc.BattleReadyID, Rulesid: npc.BattleReadyID,
Ptype: pb.PlayType_arena, Ptype: pb.PlayType_arena,

1
modules/mainline/model_mainline.go
View File

@ -50,6 +50,7 @@ func (this *ModelMline) getMainlineData(uid string) (results *pb.DBMainline, err
Groupaward: make(map[int32]*pb.DBMainlineAward), Groupaward: make(map[int32]*pb.DBMainlineAward),
Ps: make(map[int32]int32), Ps: make(map[int32]int32),
Chapterboos: make(map[int32]int32), Chapterboos: make(map[int32]int32),
Stategroup: make(map[int32]int32),
} }
err = this.Add(uid, results) err = this.Add(uid, results)
} }