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:
wh_zcy 2023-06-15 20:26:10 +08:00
commit 402f931b51
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/equipment/api_equip.go
View File

@ -182,7 +182,6 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError, Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(), Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
} }
return return
} }

4
modules/reddot/api_get.go
View File

@ -68,6 +68,10 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda
for k, v := range this.module.hunting.Reddot(session, _rid) { for k, v := range this.module.hunting.Reddot(session, _rid) {
reddot[int32(k)] = v reddot[int32(k)] = v
} }
case comm.Reddot19103, comm.Reddot19105, comm.Reddot19109, comm.Reddot19110:
for k, v := range this.module.library.Reddot(session, _rid) {
reddot[int32(k)] = v
}
} }
} }
session.SendMsg(string(this.module.GetType()), "get", &pb.ReddotGetAllResp{Reddot: reddot}) session.SendMsg(string(this.module.GetType()), "get", &pb.ReddotGetAllResp{Reddot: reddot})

6
modules/reddot/module.go
View File

@ -31,6 +31,7 @@ type Reddot struct {
mail comm.Imail mail comm.Imail
viking comm.IViking viking comm.IViking
hunting comm.IHunting hunting comm.IHunting
library comm.ILibrary
api_comp *apiComp api_comp *apiComp
mline comm.IMline mline comm.IMline
} }
@ -96,6 +97,11 @@ func (this *Reddot) Start() (err error) {
} }
this.hunting = module.(comm.IHunting) this.hunting = module.(comm.IHunting)
if module, err = this.service.GetModule(comm.ModuleLibrary); err != nil {
return
}
this.library = module.(comm.ILibrary)
return return
} }