Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
35b050eb2c
@ -199,7 +199,7 @@ func (this *configureComp) getWorldtaskBattleById(confId int32) (conf *cfg.GameW
|
|||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
if conf, ok = v.(*cfg.GameWorldBattle).GetDataMap()[confId]; !ok {
|
if conf, ok = v.(*cfg.GameWorldBattle).GetDataMap()[confId]; !ok {
|
||||||
err = comm.NewNotFoundConfErr(modulename, gameWorldTask, confId)
|
err = comm.NewNotFoundConfErr(modulename, gameWorldtaskBattle, confId)
|
||||||
this.module.Errorf("err:%v", err)
|
this.module.Errorf("err:%v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,6 @@ import (
|
|||||||
"go_dreamfactory/modules/user"
|
"go_dreamfactory/modules/user"
|
||||||
"go_dreamfactory/modules/viking"
|
"go_dreamfactory/modules/viking"
|
||||||
"go_dreamfactory/modules/warorder"
|
"go_dreamfactory/modules/warorder"
|
||||||
"go_dreamfactory/modules/worldtask"
|
|
||||||
"go_dreamfactory/modules/wtask"
|
"go_dreamfactory/modules/wtask"
|
||||||
"go_dreamfactory/services"
|
"go_dreamfactory/services"
|
||||||
"go_dreamfactory/sys/db"
|
"go_dreamfactory/sys/db"
|
||||||
@ -119,7 +118,7 @@ func main() {
|
|||||||
pay.NewModule(),
|
pay.NewModule(),
|
||||||
privilege.NewModule(),
|
privilege.NewModule(),
|
||||||
growtask.NewModule(),
|
growtask.NewModule(),
|
||||||
worldtask.NewModule(),
|
// worldtask.NewModule(),
|
||||||
academy.NewModule(),
|
academy.NewModule(),
|
||||||
reddot.NewModule(),
|
reddot.NewModule(),
|
||||||
combat.NewModule(),
|
combat.NewModule(),
|
||||||
|
Loading…
Reference in New Issue
Block a user