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:
liwei1dao 2023-09-08 15:08:38 +08:00
commit 5f64da3f34
7 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/friend/api_cross_agree.go
View File

@ -173,7 +173,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
// event.TriggerEvent(comm.EventFriendChange, uid, int32(len(self.FriendIds))) // event.TriggerEvent(comm.EventFriendChange, uid, int32(len(self.FriendIds)))
} }
go this.module.sys.CheckOpenCond(session.Clone(), comm.OpencondTypeFriend, int32(len(self.FriendIds))) go this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeFriend, int32(len(self.FriendIds)))
// 拥有xx个好友 // 拥有xx个好友
// this.moduleFriend.ModuleRtask.SendToRtask(session, comm.Rtype10, int32(len(agreeIds))) // this.moduleFriend.ModuleRtask.SendToRtask(session, comm.Rtype10, int32(len(agreeIds)))
var sz []*pb.BuriedParam var sz []*pb.BuriedParam

2
modules/friend/api_cross_del.go
View File

@ -78,7 +78,7 @@ func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (errda
) )
return return
} }
go this.module.sys.CheckOpenCond(session.Clone(), comm.OpencondTypeFriend, int32(len(self.FriendIds))) go this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeFriend, int32(len(self.FriendIds)))
session.SendMsg(string(this.module.GetType()), FriendSubTypeDel, &pb.FriendDelResp{FriendId: req.FriendId, UserId: self.Uid}) session.SendMsg(string(this.module.GetType()), FriendSubTypeDel, &pb.FriendDelResp{FriendId: req.FriendId, UserId: self.Uid})
return return

7
modules/friend/module.go
View File

@ -38,7 +38,6 @@ type Friend struct {
configure *modules.MCompConfigure configure *modules.MCompConfigure
service base.IRPCXService service base.IRPCXService
globalConf *cfg.GameGlobalData globalConf *cfg.GameGlobalData
sys comm.ISys
} }
func (this *Friend) GetType() core.M_Modules { func (this *Friend) GetType() core.M_Modules {
@ -67,11 +66,7 @@ func (this *Friend) Start() (err error) {
if this.globalConf == nil { if this.globalConf == nil {
err = errors.New("global config not found") err = errors.New("global config not found")
} }
var module core.IModule
if module, err = this.service.GetModule(comm.ModuleSys); err != nil {
return
}
this.sys = module.(comm.ISys)
return return
} }

2
modules/pagoda/api_challengeover.go
View File

@ -175,7 +175,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal
this.module.SetPagodaRankList("pagodaList"+strconv.Itoa(int(newData.PagodaId)), pagoda.PagodaId, newData.Id) this.module.SetPagodaRankList("pagodaList"+strconv.Itoa(int(newData.PagodaId)), pagoda.PagodaId, newData.Id)
} }
go this.module.sys.CheckOpenCond(session.Clone(), comm.OpencondTypePagoda, conf.Key) go this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePagoda, conf.Key)
// 通关奖励 // 通关奖励
errdata = this.module.DispenseRes(session, conf.Reward, true) errdata = this.module.DispenseRes(session, conf.Reward, true)
if errdata != nil { if errdata != nil {

6
modules/pagoda/module.go
View File

@ -28,7 +28,6 @@ type Pagoda struct {
mail comm.Imail mail comm.Imail
friend comm.IFriend friend comm.IFriend
modelRacePagoda *ModelRace modelRacePagoda *ModelRace
sys comm.ISys
} }
func NewModule() core.IModule { func NewModule() core.IModule {
@ -85,11 +84,6 @@ func (this *Pagoda) Start() (err error) {
return return
} }
this.friend = module.(comm.IFriend) this.friend = module.(comm.IFriend)
if module, err = this.service.GetModule(comm.ModuleSys); err != nil {
return
}
this.sys = module.(comm.ISys)
//this.service.RegisterFunctionName(string(comm.Rpc_ModuleSeasonPagodaReward), this.Rpc_ModuleSeasonPagodaReward) //this.service.RegisterFunctionName(string(comm.Rpc_ModuleSeasonPagodaReward), this.Rpc_ModuleSeasonPagodaReward)
return return
} }

2
modules/user/model_user.go
View File

@ -275,7 +275,7 @@ func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64,
) )
} }
this.module.chat.SendSysChatToUser(session, comm.ChatSystem12, lv, 0, name) this.module.chat.SendSysChatToUser(session, comm.ChatSystem12, lv, 0, name)
go this.module.sys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv) go this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv)
session.Push() session.Push()
} }

6
modules/user/module.go
View File

@ -53,7 +53,6 @@ func NewModule() core.IModule {
type User struct { type User struct {
modules.ModuleBase modules.ModuleBase
chat comm.IChat chat comm.IChat
sys comm.ISys
api *apiComp api *apiComp
modelUser *ModelUser modelUser *ModelUser
modelSession *ModelSession modelSession *ModelSession
@ -98,10 +97,7 @@ func (this *User) Start() (err error) {
return return
} }
this.chat = module.(comm.IChat) this.chat = module.(comm.IChat)
if module, err = this.service.GetModule(comm.ModuleSys); err != nil {
return
}
this.sys = module.(comm.ISys)
return return
} }