From 078dde24ddea1f767a6b7691bf0f5a685484d1ec Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Fri, 11 Aug 2023 17:50:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/sys/model_sys.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index 5e1ee6670..729e5afec 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -45,6 +45,8 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri if _, ok := levels[conf.Param]; !ok { return "" } + } else { + return "" } case 3: //世界任务ID d := this.moduleSys.wtask.InquireCompletes(uid) From 34fc762f60f98ac3439b49b9aa55ee7971138099 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Fri, 11 Aug 2023 17:53:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9C=88=E6=A2=A6?= =?UTF-8?q?=E6=88=98=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/warorder/api_completetask.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/warorder/api_completetask.go b/modules/warorder/api_completetask.go index 6b87f3dc4..fced7888a 100644 --- a/modules/warorder/api_completetask.go +++ b/modules/warorder/api_completetask.go @@ -122,7 +122,7 @@ func (this *apiComp) CompleteTask(session comm.IUserSession, req *pb.WarorderCom } for _, v := range condis { - if v.State != pb.BuriedItemFinishState_buried_unfinish { + if v.State == pb.BuriedItemFinishState_buried_unfinish { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), From ec846fa3e454f67c28861c002033c1c54a6d6f9a Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Fri, 11 Aug 2023 17:58:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/warorder/api_completetask.go | 2 +- pb/warorder_msg.pb.go | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/warorder/api_completetask.go b/modules/warorder/api_completetask.go index fced7888a..2ed4c1240 100644 --- a/modules/warorder/api_completetask.go +++ b/modules/warorder/api_completetask.go @@ -157,6 +157,6 @@ func (this *apiComp) CompleteTask(session comm.IUserSession, req *pb.WarorderCom } return } - session.SendMsg(string(this.module.GetType()), "completetask", &pb.WarorderCompleteTaskResp{Rtype: req.Rtype, Tid: req.Tid, Exp: dwarorder.Exp}) + session.SendMsg(string(this.module.GetType()), "completetask", &pb.WarorderCompleteTaskResp{Rtype: req.Rtype, Tid: req.Tid, Exp: dwarorder.Exp, Lv: dwarorder.Lv}) return } diff --git a/pb/warorder_msg.pb.go b/pb/warorder_msg.pb.go index 54e192082..4547bd25c 100644 --- a/pb/warorder_msg.pb.go +++ b/pb/warorder_msg.pb.go @@ -443,6 +443,7 @@ type WarorderCompleteTaskResp struct { Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"` Tid int32 `protobuf:"varint,2,opt,name=tid,proto3" json:"tid"` Exp int32 `protobuf:"varint,3,opt,name=exp,proto3" json:"exp"` + Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` } func (x *WarorderCompleteTaskResp) Reset() { @@ -498,6 +499,13 @@ func (x *WarorderCompleteTaskResp) GetExp() int32 { return 0 } +func (x *WarorderCompleteTaskResp) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + var File_warorder_warorder_msg_proto protoreflect.FileDescriptor var file_warorder_warorder_msg_proto_rawDesc = []byte{ @@ -546,13 +554,14 @@ var file_warorder_warorder_msg_proto_rawDesc = []byte{ 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x18, 0x57, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x64, 0x0a, 0x18, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, - 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, + 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }