Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/practice/api_info.go

@@ -49,6 +49,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (c
 				code = pb.ErrorCode_DBError
 				return
 			}
+			update["currnpc"] = room.Currnpc
 			update["npcstate"] = room.Npcstate
 			update["refresh"] = room.Refresh
 			update["battlenum"] = room.Battlenum

services/worker/main.go

@@ -93,7 +93,6 @@ func main() {
 		forum.NewModule(),
 		pagoda.NewModule(),
 		gourmet.NewModule(),
-		// martialhall.NewModule(),
 		rtask.NewModule(),
 		viking.NewModule(),
 		smithy.NewModule(),