From 4c2b128a36e85a077ecef340fc271a863f55d17c Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 30 Mar 2023 15:25:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/atlas/module.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/atlas/module.go b/modules/atlas/module.go index f36b87f06..b7e646bba 100644 --- a/modules/atlas/module.go +++ b/modules/atlas/module.go @@ -47,7 +47,8 @@ func (this *PandaAtlas) OnInstallComp() { func (this *PandaAtlas) CheckActivatePandaAtlasCollect(uid string, id string) { conf := this.configure.GetPandoAtlasConf(id) - if conf != nil { + if conf == nil { + this.Errorf("GetPandoAtlasConf err:%d", id) return } if this.IsCross() { From cc6f8c05d54e1066e4cd745260da3172db5bacd9 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 30 Mar 2023 15:25:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/module.go | 6 +----- modules/modulebase.go | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 0bbed1fd2..f2545feee 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/event" - "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" @@ -69,10 +68,7 @@ func (this *Equipment) OnInstallComp() { //Event------------------------------------------------------------------------------------------------------------ func (this *Equipment) EventUserOffline(uid, sessionid string) { - if err := this.modelEquipment.BatchDelLists(uid); err != nil { - this.Error("EventUserOffline", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) - } - + this.modelEquipment.BatchDelLists(uid) } //IEquipment------------------------------------------------------------------------------------------------------------------------------- diff --git a/modules/modulebase.go b/modules/modulebase.go index 45f1e3441..1d7b62cf7 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -311,14 +311,14 @@ func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn) for k, v := range attrs { if this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) < int64(v) { code = pb.ErrorCode_ResNoEnough - this.Warnf("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) + this.Warn("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) return } } for k, v := range items { //校验消费资源是否充足 if int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k)) < v { code = pb.ErrorCode_ResNoEnough - this.Warnf("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) + this.Warn("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) return } } @@ -350,14 +350,14 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn for k, v := range attrs { if this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) < -int64(v) { // -v 负负得正 code = pb.ErrorCode_ResNoEnough - this.Warnf("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) + this.Warn("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) return } } for k, v := range items { if int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k)) < -v { code = pb.ErrorCode_ResNoEnough - this.Warnf("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) + this.Warn("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) return } } From 06cd0981aaeed447e142746e076512b4807a7049 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 30 Mar 2023 15:28:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/modelPandata.go | 2 +- modules/practice/module.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/practice/modelPandata.go b/modules/practice/modelPandata.go index 62267d837..51ad0392d 100644 --- a/modules/practice/modelPandata.go +++ b/modules/practice/modelPandata.go @@ -59,7 +59,7 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic this.module.Errorln(err) return } - this.module.atlas.CheckActivatePandaAtlasCollect(uid, "1002") + this.module.atlas.CheckActivatePandaAtlasCollect(uid, "1001") } err = nil return diff --git a/modules/practice/module.go b/modules/practice/module.go index 8b765c1df..b66541ed8 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -142,7 +142,7 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32 this.Errorln(err) return } - this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "1002") + this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "1001") } else { id = make([]string, 0) for k, _ := range items { From 6c0cd1758ae181727e6ba1d8c6207797506a45c5 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 30 Mar 2023 15:32:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E9=89=B4id?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/api_upgrade.go | 8 ++++---- modules/practice/modelPandata.go | 2 +- modules/practice/module.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/practice/api_upgrade.go b/modules/practice/api_upgrade.go index ab9ce6862..e626fb6b1 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -62,16 +62,16 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeR } switch pillar.Lv { case 2: - this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "1002") + this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100002") break case 3: - this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "1003") + this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100003") break case 4: - this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "1004") + this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100004") break case 5: - this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "1005") + this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100005") break } this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ diff --git a/modules/practice/modelPandata.go b/modules/practice/modelPandata.go index 51ad0392d..71166eff6 100644 --- a/modules/practice/modelPandata.go +++ b/modules/practice/modelPandata.go @@ -59,7 +59,7 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic this.module.Errorln(err) return } - this.module.atlas.CheckActivatePandaAtlasCollect(uid, "1001") + this.module.atlas.CheckActivatePandaAtlasCollect(uid, "100001") } err = nil return diff --git a/modules/practice/module.go b/modules/practice/module.go index b66541ed8..1d0dc5fb7 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -142,7 +142,7 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32 this.Errorln(err) return } - this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "1001") + this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100001") } else { id = make([]string, 0) for k, _ := range items {