From dfcf822038eabcfe1272c1ba82b16c1d40834977 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 22 Feb 2023 14:44:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=82=89=E6=B8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/api_forgeequip.go | 2 ++ modules/smithy/model_stove.go | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index b0c1e2c07..a90569711 100644 --- a/modules/smithy/api_forgeequip.go +++ b/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 { diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index 936e19663..e278827a5 100644 --- a/modules/smithy/model_stove.go +++ b/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 From 7b0c21491df868f1fcd8cef306afa0d53418c1f7 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 22 Feb 2023 14:49:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/errorcode.pb.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index b911596e5..ffac4b35e 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -327,7 +327,9 @@ const ( ErrorCode_SmithyLackLava ErrorCode = 4107 // 缺少熔岩 ErrorCode_SmithyAtlasMaxLv ErrorCode = 4108 // 图鉴奖励满级 ErrorCode_SmithyAtlasLackLv ErrorCode = 4109 // 图鉴奖励等级不足 - ErrorCode_SmithyNoFoundAtlas ErrorCode = 4110 // 没有找到图鉴数据 + ErrorCode_SmithyTaskNoFinished ErrorCode = 4110 //图鉴任务未完成 + ErrorCode_SmithyTaskReceived ErrorCode = 4111 //图鉴任务奖励已领 + ErrorCode_SmithyNoFoundAtlas ErrorCode = 4112 // 没有找到图鉴数据 ) // Enum value maps for ErrorCode. @@ -605,7 +607,9 @@ var ( 4107: "SmithyLackLava", 4108: "SmithyAtlasMaxLv", 4109: "SmithyAtlasLackLv", - 4110: "SmithyNoFoundAtlas", + 4110: "SmithyTaskNoFinished", + 4111: "SmithyTaskReceived", + 4112: "SmithyNoFoundAtlas", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -880,7 +884,9 @@ var ( "SmithyLackLava": 4107, "SmithyAtlasMaxLv": 4108, "SmithyAtlasLackLv": 4109, - "SmithyNoFoundAtlas": 4110, + "SmithyTaskNoFinished": 4110, + "SmithyTaskReceived": 4111, + "SmithyNoFoundAtlas": 4112, } ) @@ -915,7 +921,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xc7, 0x31, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xfb, 0x31, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -1310,9 +1316,12 @@ var file_errorcode_proto_rawDesc = []byte{ 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10, - 0x8d, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46, 0x6f, - 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x8e, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x8d, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, + 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, + 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (