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

modules/gm/api_cmd.go

@@ -44,9 +44,13 @@ func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.E
 	if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
-	this.module.CreateCmd(session, req.Cmod)
+	var (
+		isOk bool
+	)
+	if code = this.module.CreateCmd(session, req.Cmod); code == pb.ErrorCode_Success {
+		isOk = true
+	}
 
-	//this.module.ModuleHero.GetSpecifiedHero(session.GetUserId(), heroid, star, lv)
-	session.SendMsg(string(this.module.GetType()), "cmd", &pb.GMCmdResp{IsSucc: true})
+	session.SendMsg(string(this.module.GetType()), "cmd", &pb.GMCmdResp{IsSucc: isOk})
 	return
 }

modules/hero/api_fusion.go

@@ -65,6 +65,7 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (c
 		}
 	}
 	for k, v := range req.Heros {
+		//mapHero[_costMaphero[k].HeroID]
 		code = this.module.DelCard(session.GetUserId(), _costMaphero[k], v)
 		if code != pb.ErrorCode_Success {
 			return

modules/hero/api_resonanceSelect.go

@@ -13,13 +13,13 @@ func (this *apiComp) ResonanceUseEnergyCheck(session comm.IUserSession, req *pb.
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
-	for _, v := range req.Energy {
-		if v.UseEnergy < 0 || (v.UseType != comm.ResonanceAtkPro && v.UseType != comm.ResonanceHpPro && v.UseType != comm.ResonanceDefPro) {
-			code = pb.ErrorCode_ReqParameterError
-			return
-		}
+	// for _, v := range req.Energy {
+	// 	if v.UseEnergy < 0 || (v.UseType != comm.ResonanceAtkPro && v.UseType != comm.ResonanceHpPro && v.UseType != comm.ResonanceDefPro) {
+	// 		code = pb.ErrorCode_ReqParameterError
+	// 		return
+	// 	}
 
-	}
+	// }
 	return
 }