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

modules/equipment/api_equip.go

@@ -180,9 +180,8 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
 			if i != int(confs[i].Pos) {
 				this.module.Errorf("Equip conf:%+v Target:%d Incorrect range!", confs[i], i)
 				errdata = &pb.ErrorData{
-					Code:    pb.ErrorCode_SystemError,
-					Title:   pb.ErrorCode_SystemError.ToString(),
-					Message: err.Error(),
+					Code:  pb.ErrorCode_SystemError,
+					Title: pb.ErrorCode_SystemError.ToString(),
 				}
 				return
 			}

modules/reddot/api_get.go

@@ -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) {
 				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})

modules/reddot/module.go

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