diff --git a/modules/academy/module.go b/modules/academy/module.go index 166452cf2..5c13ed488 100644 --- a/modules/academy/module.go +++ b/modules/academy/module.go @@ -35,7 +35,9 @@ func (this *Academy) GetType() core.M_Modules { //模块初始化接口 注册用户创建角色事件 func (this *Academy) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/activity/module.go b/modules/activity/module.go index 42c528b8f..d0d8106fd 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -43,7 +43,9 @@ func (this *Activity) GetType() core.M_Modules { } func (this *Activity) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) // ticker := time.NewTicker(time.Second * 10) diff --git a/modules/addrecharge/module.go b/modules/addrecharge/module.go index bc398d827..90d264bab 100644 --- a/modules/addrecharge/module.go +++ b/modules/addrecharge/module.go @@ -27,7 +27,9 @@ func (this *AddRecharge) GetType() core.M_Modules { } func (this *AddRecharge) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/arena/module.go b/modules/arena/module.go index 9f8c95eac..53a8966d2 100644 --- a/modules/arena/module.go +++ b/modules/arena/module.go @@ -46,7 +46,9 @@ func (this *Arena) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Arena) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/atlas/module.go b/modules/atlas/module.go index 55cbd4a71..cf4244ee7 100644 --- a/modules/atlas/module.go +++ b/modules/atlas/module.go @@ -35,7 +35,9 @@ func (this *PandaAtlas) GetType() core.M_Modules { } func (this *PandaAtlas) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/battle/module.go b/modules/battle/module.go index 916d1992b..bf37c84c8 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -47,7 +47,9 @@ func (this *Battle) NewOptions() (options core.IModuleOptions) { // 模块初始化接口 注册用户创建角色事件 func (this *Battle) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) this.options = options.(*Options) return diff --git a/modules/battlerecord/module.go b/modules/battlerecord/module.go index 5b64acedf..4007c3fc8 100644 --- a/modules/battlerecord/module.go +++ b/modules/battlerecord/module.go @@ -32,7 +32,9 @@ func (this *BattleRecord) GetType() core.M_Modules { } func (this *BattleRecord) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/buried/module.go b/modules/buried/module.go index 055c3402e..0e83358b4 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -42,7 +42,9 @@ func (this *Buried) GetType() core.M_Modules { } func (this *Buried) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(comm.IService) return } diff --git a/modules/capturesheep/module.go b/modules/capturesheep/module.go index ced707030..a7baedc05 100644 --- a/modules/capturesheep/module.go +++ b/modules/capturesheep/module.go @@ -31,7 +31,9 @@ func (this *CaptureSheep) GetType() core.M_Modules { } func (this *CaptureSheep) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 4804776f3..601a688cd 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -37,7 +37,9 @@ func (this *Caravan) GetType() core.M_Modules { } func (this *Caravan) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/chat/module.go b/modules/chat/module.go index ee6a913a6..9de173ec5 100644 --- a/modules/chat/module.go +++ b/modules/chat/module.go @@ -52,7 +52,9 @@ func (this *Chat) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Chat) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) this.options = options.(*Options) return diff --git a/modules/combat/module.go b/modules/combat/module.go index 17477d9b4..50735f367 100644 --- a/modules/combat/module.go +++ b/modules/combat/module.go @@ -35,7 +35,9 @@ func (this *Combat) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Combat) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/dailytask/module.go b/modules/dailytask/module.go index 30307e949..8abe429f2 100644 --- a/modules/dailytask/module.go +++ b/modules/dailytask/module.go @@ -30,7 +30,9 @@ func (this *Dailytask) GetType() core.M_Modules { } func (this *Dailytask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/dispatch/module.go b/modules/dispatch/module.go index c3bbbe703..8334e9761 100644 --- a/modules/dispatch/module.go +++ b/modules/dispatch/module.go @@ -22,7 +22,9 @@ func NewModule() core.IModule { } func (this *Dispatch) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/dragon/module.go b/modules/dragon/module.go index f1fbb0a14..517b5af14 100644 --- a/modules/dragon/module.go +++ b/modules/dragon/module.go @@ -36,7 +36,9 @@ func (this *Dragon) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Dragon) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/enchant/module.go b/modules/enchant/module.go index 874216937..66a72247a 100644 --- a/modules/enchant/module.go +++ b/modules/enchant/module.go @@ -33,7 +33,9 @@ func (this *Enchant) GetType() core.M_Modules { } func (this *Enchant) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 93f4fbc8e..5e807ad81 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -44,7 +44,9 @@ func (this *Equipment) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Equipment) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/forum/module.go b/modules/forum/module.go index f4aa142b7..deb153681 100644 --- a/modules/forum/module.go +++ b/modules/forum/module.go @@ -30,7 +30,9 @@ func (this *Forum) GetType() core.M_Modules { //模块初始化接口 注册用户创建角色事件 func (this *Forum) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/friend/module.go b/modules/friend/module.go index 1d06317ef..a6ec175aa 100644 --- a/modules/friend/module.go +++ b/modules/friend/module.go @@ -45,7 +45,9 @@ func (this *Friend) GetType() core.M_Modules { } func (this *Friend) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/gateway/module.go b/modules/gateway/module.go index 1c7950c6d..295edc8d5 100644 --- a/modules/gateway/module.go +++ b/modules/gateway/module.go @@ -52,7 +52,9 @@ func (this *Gateway) Service() base.IRPCXService { // Init 模块初始化函数 func (this *Gateway) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.options = options.(*Options) this.service = service.(base.IRPCXService) return diff --git a/modules/gm/module.go b/modules/gm/module.go index 86afc2772..12dbcdb50 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -43,7 +43,9 @@ func (this *GM) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *GM) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/gourmet/module.go b/modules/gourmet/module.go index 85f1965ed..1278b0587 100644 --- a/modules/gourmet/module.go +++ b/modules/gourmet/module.go @@ -30,7 +30,9 @@ func (this *Gourmet) GetType() core.M_Modules { } func (this *Gourmet) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/growtask/module.go b/modules/growtask/module.go index f353590b9..aa72045f0 100644 --- a/modules/growtask/module.go +++ b/modules/growtask/module.go @@ -23,7 +23,9 @@ func NewModule() core.IModule { return &Growtask{} } func (this *Growtask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/guidance/module.go b/modules/guidance/module.go index f504cc215..ee2ccc4a7 100644 --- a/modules/guidance/module.go +++ b/modules/guidance/module.go @@ -32,7 +32,9 @@ func (this *Guidance) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Guidance) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/guildgve/module.go b/modules/guildgve/module.go index d25764dc8..4583fb7ba 100644 --- a/modules/guildgve/module.go +++ b/modules/guildgve/module.go @@ -36,7 +36,9 @@ func (this *GuildGve) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *GuildGve) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(comm.IService) return } diff --git a/modules/hero/module.go b/modules/hero/module.go index 14b7bc9e8..7d9372c1f 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -45,7 +45,9 @@ func (this *Hero) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Hero) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/herotask/module.go b/modules/herotask/module.go index 45a4513d7..1c1134836 100644 --- a/modules/herotask/module.go +++ b/modules/herotask/module.go @@ -25,7 +25,9 @@ func (this *HeroTask) GetType() core.M_Modules { } func (this *HeroTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/horoscope/module.go b/modules/horoscope/module.go index a4a9a5583..4895e4e02 100644 --- a/modules/horoscope/module.go +++ b/modules/horoscope/module.go @@ -38,7 +38,9 @@ func (this *Horoscope) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Horoscope) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/hunting/module.go b/modules/hunting/module.go index e6664e149..db46491f6 100644 --- a/modules/hunting/module.go +++ b/modules/hunting/module.go @@ -34,7 +34,9 @@ func (this *Hunting) GetType() core.M_Modules { } func (this *Hunting) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/items/module.go b/modules/items/module.go index 2a3e5debf..2164c4b93 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -41,7 +41,9 @@ func (this *Items) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Items) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/kftask/module.go b/modules/kftask/module.go index 58624842d..7e2b9c71c 100644 --- a/modules/kftask/module.go +++ b/modules/kftask/module.go @@ -25,7 +25,9 @@ func (this *KFTask) GetType() core.M_Modules { } func (this *KFTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/library/module.go b/modules/library/module.go index 4529d86c1..611d36943 100644 --- a/modules/library/module.go +++ b/modules/library/module.go @@ -33,7 +33,9 @@ func (this *Library) GetType() core.M_Modules { } func (this *Library) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/linestory/module.go b/modules/linestory/module.go index 996d63024..a5f7cff79 100644 --- a/modules/linestory/module.go +++ b/modules/linestory/module.go @@ -29,7 +29,9 @@ func NewModule() core.IModule { } func (this *ModuleLinestory) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/mail/module.go b/modules/mail/module.go index 5f243b672..9a411ed4c 100644 --- a/modules/mail/module.go +++ b/modules/mail/module.go @@ -47,7 +47,9 @@ func (this *Mail) OnInstallComp() { } func (this *Mail) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/mainline/module.go b/modules/mainline/module.go index cc76120e0..2ea0a5b9e 100644 --- a/modules/mainline/module.go +++ b/modules/mainline/module.go @@ -29,7 +29,9 @@ func (this *Mainline) GetType() core.M_Modules { } func (this *Mainline) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/mgolog/module.go b/modules/mgolog/module.go index c9707dda6..28e4e757b 100644 --- a/modules/mgolog/module.go +++ b/modules/mgolog/module.go @@ -21,7 +21,9 @@ type MgoLog struct { } func (this *MgoLog) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/modulebase.go b/modules/modulebase.go index 0707620ad..5bd4ed0cd 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -58,7 +58,9 @@ func (this *ModuleBase) Init(service core.IService, module core.IModule, options this.module = module this.options = options.(IOptions) this.options.GetLog().SetName("module." + string(module.GetType())) - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/moonfantasy/module.go b/modules/moonfantasy/module.go index f3817391d..c147d6fce 100644 --- a/modules/moonfantasy/module.go +++ b/modules/moonfantasy/module.go @@ -48,7 +48,9 @@ func (this *Moonfantasy) GetType() core.M_Modules { //模块初始化接口 注册用户创建角色事件 func (this *Moonfantasy) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/notify/module.go b/modules/notify/module.go index 6a61a2a45..cec42337f 100644 --- a/modules/notify/module.go +++ b/modules/notify/module.go @@ -32,7 +32,9 @@ func (this *Notify) GetType() core.M_Modules { //模块初始化接口 注册用户创建角色事件 func (this *Notify) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/oldtimes/module.go b/modules/oldtimes/module.go index a3a905bde..360ebf5d7 100644 --- a/modules/oldtimes/module.go +++ b/modules/oldtimes/module.go @@ -21,7 +21,9 @@ func NewModule() core.IModule { } func (this *Oldtimes) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index 1b9998be4..c31a37e07 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -39,7 +39,9 @@ func (this *Pagoda) GetType() core.M_Modules { } func (this *Pagoda) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/parkour/module.go b/modules/parkour/module.go index 9d7e6c3e2..9f9a99e93 100644 --- a/modules/parkour/module.go +++ b/modules/parkour/module.go @@ -51,7 +51,9 @@ func (this *Parkour) GetType() core.M_Modules { // 模块初始化 func (this *Parkour) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) this.battles = map[string]*RaceItem{} return diff --git a/modules/passon/module.go b/modules/passon/module.go index c5fc3027d..88a65384b 100644 --- a/modules/passon/module.go +++ b/modules/passon/module.go @@ -44,7 +44,9 @@ func (this *Passon) OnInstallComp() { } func (this *Passon) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/pay/module.go b/modules/pay/module.go index 413657fbb..9629f9f88 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -47,7 +47,9 @@ func (this *Pay) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Pay) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/practice/module.go b/modules/practice/module.go index a4f5b553f..9ff4e1430 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -52,7 +52,9 @@ func (this *Practice) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Practice) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 61cef21f8..7c815dc71 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -35,7 +35,9 @@ func (this *Privilege) GetType() core.M_Modules { //模块初始化接口 注册用户创建角色事件 func (this *Privilege) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/pushgiftbag/module.go b/modules/pushgiftbag/module.go index fd820c302..ff9fc93bc 100644 --- a/modules/pushgiftbag/module.go +++ b/modules/pushgiftbag/module.go @@ -29,7 +29,9 @@ func (this *PushGiftbag) GetType() core.M_Modules { } func (this *PushGiftbag) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/pvp/module.go b/modules/pvp/module.go index fce121590..91986347f 100644 --- a/modules/pvp/module.go +++ b/modules/pvp/module.go @@ -47,7 +47,9 @@ func (this *Pvp) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Pvp) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { this.battles = make(map[string]*BattleItem) - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/questionnaire/module.go b/modules/questionnaire/module.go index 529db522e..dc09b924d 100644 --- a/modules/questionnaire/module.go +++ b/modules/questionnaire/module.go @@ -26,7 +26,9 @@ func (this *Questionnaire) GetType() core.M_Modules { } func (this *Questionnaire) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/reddot/module.go b/modules/reddot/module.go index 3dd27dcf8..0680e9865 100644 --- a/modules/reddot/module.go +++ b/modules/reddot/module.go @@ -48,7 +48,9 @@ func (this *Reddot) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Reddot) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/reputation/module.go b/modules/reputation/module.go index cc92157d1..fdc9df61a 100644 --- a/modules/reputation/module.go +++ b/modules/reputation/module.go @@ -25,7 +25,9 @@ func NewModule() core.IModule { } func (this *Reputation) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/robot/module.go b/modules/robot/module.go index 80d278cc4..7e839edc3 100644 --- a/modules/robot/module.go +++ b/modules/robot/module.go @@ -38,7 +38,9 @@ func (this *RobotModule) NewOptions() (options core.IModuleOptions) { // 模块初始化接口 注册用户创建角色事件 func (this *RobotModule) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.options = options.(*Options) this.service = service.(base.IRPCXService) return diff --git a/modules/shop/module.go b/modules/shop/module.go index 62eac14f2..289687c12 100644 --- a/modules/shop/module.go +++ b/modules/shop/module.go @@ -35,7 +35,9 @@ func (this *Shop) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Shop) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/shopcenter/module.go b/modules/shopcenter/module.go index b2f36d7bd..b445f1aa4 100644 --- a/modules/shopcenter/module.go +++ b/modules/shopcenter/module.go @@ -29,7 +29,9 @@ func (this *ShopCenter) GetType() core.M_Modules { } func (this *ShopCenter) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/smithy/module.go b/modules/smithy/module.go index 008fdadbe..6de1bf170 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -41,7 +41,9 @@ func (this *Smithy) GetType() core.M_Modules { } func (this *Smithy) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/sociaty/module.go b/modules/sociaty/module.go index eb703ce63..08b5c27c1 100644 --- a/modules/sociaty/module.go +++ b/modules/sociaty/module.go @@ -42,7 +42,9 @@ func NewModule() core.IModule { } func (this *Sociaty) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/stonehenge/module.go b/modules/stonehenge/module.go index 9456e28af..32e63e72d 100644 --- a/modules/stonehenge/module.go +++ b/modules/stonehenge/module.go @@ -33,7 +33,9 @@ func (this *Stonehenge) GetType() core.M_Modules { //模块初始化接口 注册用户创建角色事件 func (this *Stonehenge) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/storyline/module.go b/modules/storyline/module.go index 1c3d6d247..271162961 100644 --- a/modules/storyline/module.go +++ b/modules/storyline/module.go @@ -24,7 +24,9 @@ func (this *StoryLine) GetType() core.M_Modules { } func (this *StoryLine) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/sys/module.go b/modules/sys/module.go index 87d1884ef..5d62f9e26 100644 --- a/modules/sys/module.go +++ b/modules/sys/module.go @@ -39,7 +39,9 @@ func (this *ModuleSys) OnInstallComp() { // 模块初始化 func (this *ModuleSys) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) //event.Register(comm.EventFriendChange, this.FriendCountChange) return diff --git a/modules/timer/module.go b/modules/timer/module.go index cfe2106bb..fa83a4a90 100644 --- a/modules/timer/module.go +++ b/modules/timer/module.go @@ -47,7 +47,9 @@ func (this *Timer) NewOptions() (options core.IModuleOptions) { // 模块初始化接口 注册用户创建角色事件 func (this *Timer) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) this.options = options.(*Options) return diff --git a/modules/tools/module.go b/modules/tools/module.go index 855f6c8ca..fc5e3e8cf 100644 --- a/modules/tools/module.go +++ b/modules/tools/module.go @@ -26,7 +26,9 @@ func (this *Tools) GetType() core.M_Modules { // 模块初始化接口 注册用户创建角色事件 func (this *Tools) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } return } diff --git a/modules/turntable/module.go b/modules/turntable/module.go index 213ad4104..6d6422b03 100644 --- a/modules/turntable/module.go +++ b/modules/turntable/module.go @@ -29,7 +29,9 @@ func (this *Turntable) GetType() core.M_Modules { } func (this *Turntable) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/uigame/module.go b/modules/uigame/module.go index cc61b4d5f..3a2e0347e 100644 --- a/modules/uigame/module.go +++ b/modules/uigame/module.go @@ -31,7 +31,9 @@ func (this *UiGame) GetType() core.M_Modules { } func (this *UiGame) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/user/module.go b/modules/user/module.go index 830d86787..fb85bd547 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -72,7 +72,9 @@ func (this *User) GetType() core.M_Modules { } func (this *User) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) this.timerMap = make(map[string]*time.Ticker) return diff --git a/modules/venture/module.go b/modules/venture/module.go index 88537400f..06a65d292 100644 --- a/modules/venture/module.go +++ b/modules/venture/module.go @@ -24,7 +24,9 @@ func (this *Venture) GetType() core.M_Modules { } func (this *Venture) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/viking/module.go b/modules/viking/module.go index d25052cea..e2e467730 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -49,7 +49,9 @@ func (this *Viking) GetType() core.M_Modules { } func (this *Viking) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) return } diff --git a/modules/warorder/module.go b/modules/warorder/module.go index 20d245ceb..7e732cd40 100644 --- a/modules/warorder/module.go +++ b/modules/warorder/module.go @@ -28,7 +28,9 @@ func (this *Warorder) GetType() core.M_Modules { } func (this *Warorder) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/web/module.go b/modules/web/module.go index 8571d220a..aebdc4629 100644 --- a/modules/web/module.go +++ b/modules/web/module.go @@ -42,7 +42,9 @@ func (this *Web) NewOptions() (options core.IModuleOptions) { } func (this *Web) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service.(base.IRPCXService) this.options = options.(*Options) return diff --git a/modules/weektask/module.go b/modules/weektask/module.go index 856371a92..dfef3af91 100644 --- a/modules/weektask/module.go +++ b/modules/weektask/module.go @@ -30,7 +30,9 @@ func (this *WeekTask) GetType() core.M_Modules { } func (this *WeekTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return } diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 976e2cab6..ad4d2e4a6 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -33,7 +33,9 @@ func (this *WTask) GetType() core.M_Modules { } func (this *WTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } this.service = service return }