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

modules/smithy/api_forgeequip.go

@@ -153,6 +153,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 
 	// 装备资源分发
 	if customLv > 0 { //
+		rsp.Equip = make([]string, 0)
 		sz := make([]int32, 4) // 最高 4个品质
 		// 获得极品权重
 		sz[3] = this.module.modelStove.StoveToolsQualityProbability(stove)
@@ -161,6 +162,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 			return
 		}
 	} else {
+		rsp.Equip = make([]string, 0)
 		res := this.module.configure.GetDropReward(reelcfg.BasicDrop)
 		this.module.DispenseRes(session, res, true)
 		for _, v := range res {

modules/smithy/model_stove.go

@@ -45,9 +45,11 @@ func (this *modelStove) getSmithyStoveList(uid string) (result *pb.DBStove, err
 			result.Skill = make(map[int32]int32, 0)
 			result.Forge = make(map[int32]int32, 0)
 			result.Lv = 1
-			result.Temperature = 20000 // 配置
+			result.Temperature = 2000 // 配置
 			result.RecoveTime = 0
-
+			if conf := this.module.configure.GetSmithyStoveConf(1); conf != nil { // 获取1级炉子温度配置
+				result.Temperature = conf.MaxTemperature
+			}
 			if err = this.Add(uid, result); err != nil {
 				this.module.Errorf("err:%v", err)
 				err = nil