diff --git a/bin/json/game_global.json b/bin/json/game_global.json index f4636e56e..64ad9cd2d 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -550,7 +550,7 @@ ], "raise_temperature": { "a": "item", - "t": "1110001", + "t": "10013", "n": 1 }, "raise_temperatureNum": 50, diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 4b92f4f31..82d08cd58 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -193,7 +193,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq // 更新图鉴信息 for _, v := range rsp.Equip { if equipConf := this.module.configure.GetEquipmentConfigureById(v.CId); equipConf != nil { // 获取装备等级 - this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), v.CId, equipConf.Star, int32(len(v.AdverbEntry)), stove.Forge[req.ReelId]) + this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), v.CId, equipConf.Star, int32(len(v.AdverbEntry)+1), stove.Forge[req.ReelId]) } } diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 395f16bbc..29f354afe 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -44,7 +44,7 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod N: raise.N * req.Count, }) - if stove.Temperature+req.Count*raise_temperatureNum >= conf.MaxTemperature-raise_temperatureNum { + if stove.Temperature+req.Count*raise_temperatureNum <= (conf.MaxTemperature - raise_temperatureNum) { code = pb.ErrorCode_SmithyMaxTemperature return } @@ -57,6 +57,6 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod this.module.modelStove.updateSmithyStove(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove}) } - code = pb.ErrorCode_ConfigNoFound + return }