From a2924dee3b92ee8ad0e784f400b1fe12be6bbddb Mon Sep 17 00:00:00 2001 From: liwei Date: Wed, 26 Jul 2023 19:26:39 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BF?= =?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/mainline/api_challenge.go | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go index 1dc938667..e742a41f3 100644 --- a/modules/mainline/api_challenge.go +++ b/modules/mainline/api_challenge.go @@ -20,16 +20,26 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MainlineC // /挑战主线关卡 func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChallengeReq) (errdata *pb.ErrorData) { var ( - info *pb.DBMainline // 当前章节信息 - ps int32 // 消耗的体力 - psAnt *cfg.Gameatn - stageConf *cfg.GameMainStageData // 当前章节数据 - err error + info *pb.DBMainline // 当前章节信息 + ps int32 // 消耗的体力 + psAnt *cfg.Gameatn + conf *cfg.GameMainStageData // 当前章节数据 + err error ) if errdata = this.ChallengeCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } + + if conf, err = this.module.configure.GetMainStageConf(req.Level); err != nil { // 配置文件校验 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_MainlineNotFindChapter, + Title: pb.ErrorCode_MainlineNotFindChapter.ToString(), + Message: err.Error(), + } + return + } + if info, err = this.module.modelMline.getMainlineData(session.GetUserId()); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -39,12 +49,12 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle } if v1, ok := info.Ps[req.Level]; !ok || v1 == 0 { - for _, v := range stageConf.PsConsume { + for _, v := range conf.PsConsume { if v.A == "attr" && v.T == "ps" { ps += v.N } } - for _, v := range stageConf.PsMg { + for _, v := range conf.PsMg { if v.A == "attr" && v.T == "ps" { ps += v.N } @@ -72,7 +82,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle Ptype: pb.PlayType_mainline, Title: "", Format: req.Battle, - Mformat: stageConf.FormatList, + Mformat: conf.FormatList, }) if errdata != nil { return @@ -81,7 +91,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle Info: &pb.BattleInfo{ Id: record.Id, Title: record.Title, - Rulesid: stageConf.BattleReadyID, + Rulesid: conf.BattleReadyID, Btype: record.Btype, Ptype: record.Ptype, RedCompId: record.RedCompId, From 522c3684e57ed385ca1cd778fdbfdf295c56efb2 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 20:31:22 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=96=E7=95=8C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_levelpass.go | 1 + modules/wtask/api_finish.go | 25 +++++++++++++++++++++++++ modules/wtask/module.go | 8 +------- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index c93ac65c0..6c710ae74 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -114,6 +114,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP }) } } + consumPs = info.Ps[req.Level] userExp, _ = this.module.ModuleUser.ConsumePsAddExp(session, consumPs) session.SendMsg(string(this.module.GetType()), "levelpass", &pb.MainlineLevelPassResp{ Level: req.Level, diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 9793c6ec6..3e40dc652 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -18,6 +18,7 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishR func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) { var ( conf *cfg.GameWorldTaskData + afterconf *cfg.GameWorldTaskData wtask *pb.DBWTask condis []*pb.ConIProgress award []*pb.UserAssets @@ -130,6 +131,30 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( } else { wtask.Completes = append(wtask.Completes, req.Tid) } + + if conf.Des == 1 && conf.IdAfter != 0 { //日常任务自动接取下一个任务 + if afterconf, err = this.module.configure.gettaskconfconfigure(conf.IdAfter); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + wtask.Accepts = append(wtask.Accepts, afterconf.Key) + if err = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), afterconf.Completetask...); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), + Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), conf.Completetask), + } + return + } + if _, errdata = this.module.pushtaskprogress(session, wtask, true); errdata != nil { + return + } + } + this.module.checkgroupState(session, wtask, conf.Group) session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award, Completes: wtask.Completes, Groups: wtask.Groups}) this.module.fishtask(session, wtask, true) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 9df35219a..4f3bf6ef1 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -743,13 +743,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断 continue } - if v.Des == 5 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中 - continue - } - if v.Des == 1 { - changeAccept = true - wtask.Accepts = append(wtask.Activations, v.Key) - condiIds = append(condiIds, v.Completetask...) + if v.Des == 5 || v.Des == 1 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中 continue } wtask.Activations = append(wtask.Activations, v.Key) From 22bf7e969c6d637f641361351869badc52027a04 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 20:39:04 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/wtask/api_finish.go | 25 +++++++++++++++++++++++++ modules/wtask/module.go | 8 +------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 9793c6ec6..90b9909cd 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -18,6 +18,7 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishR func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) { var ( conf *cfg.GameWorldTaskData + afterconf *cfg.GameWorldTaskData wtask *pb.DBWTask condis []*pb.ConIProgress award []*pb.UserAssets @@ -130,6 +131,30 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( } else { wtask.Completes = append(wtask.Completes, req.Tid) } + + if conf.Des == 1 && conf.IdAfter != 0 { //日常任务 自动接取下一个 + if afterconf, err = this.module.configure.gettaskconfconfigure(conf.IdAfter); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if err = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), afterconf.Completetask...); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), + Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), conf.Completetask), + } + return + } + wtask.Accepts = append(wtask.Accepts, afterconf.Key) + if _, errdata = this.module.pushtaskprogress(session, wtask, false); errdata != nil { + return + } + } + this.module.checkgroupState(session, wtask, conf.Group) session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award, Completes: wtask.Completes, Groups: wtask.Groups}) this.module.fishtask(session, wtask, true) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 9df35219a..4f3bf6ef1 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -743,13 +743,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断 continue } - if v.Des == 5 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中 - continue - } - if v.Des == 1 { - changeAccept = true - wtask.Accepts = append(wtask.Activations, v.Key) - condiIds = append(condiIds, v.Completetask...) + if v.Des == 5 || v.Des == 1 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中 continue } wtask.Activations = append(wtask.Activations, v.Key) From deee1f3f15dde3a49eeba974dc9af076e036b1b2 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 20:50:43 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BF?= =?UTF-8?q?=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_levelpass.go | 9 +++++++++ modules/wtask/api_accept.go | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index c93ac65c0..6f93202b1 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -122,6 +122,15 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP UserExp: userExp, }) // 数据推送 + if err = this.module.modelMline.updateMainlineData(session.GetUserId(), info); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype60, 1)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype61, 1, int32(req.Level))) go this.module.ModuleBuried.TriggerBuried(session.Clone(), tasks...) diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go index 707a4dd6e..5e11c76e9 100644 --- a/modules/wtask/api_accept.go +++ b/modules/wtask/api_accept.go @@ -94,6 +94,12 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) ( session.SendMsg(string(this.module.GetType()), "boxchange", &pb.WTaskBoxChangePush{Boxs: wtask.Boxs}) } + if len(conf.GetItem) > 0 { //接取 获得物品 + if errdata = this.module.DispenseRes(session, conf.GetItem, true); errdata != nil { + return + } + } + if progress, errdata = this.module.pushtaskprogress(session, wtask, false); errdata != nil { return } From f8196891e51360c9c6cbf3fc036e441187fbf0a8 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 20:54:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_searchitemall.json | 5 +++++ bin/json/game_worldtask.json | 10 +++++----- modules/mainline/api_challengeover.go | 1 + modules/mainline/api_levelpass.go | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/json/game_searchitemall.json b/bin/json/game_searchitemall.json index ebb65c514..eec664f6b 100644 --- a/bin/json/game_searchitemall.json +++ b/bin/json/game_searchitemall.json @@ -13,6 +13,7 @@ 2000, 2000, 2000, + 2000, 2000 ] }, @@ -30,6 +31,7 @@ 2000, 2000, 2000, + 2000, 2000 ] }, @@ -47,6 +49,7 @@ 2000, 2000, 2000, + 2000, 2000 ] }, @@ -64,6 +67,7 @@ 2000, 2000, 2000, + 2000, 2000 ] }, @@ -81,6 +85,7 @@ 2000, 2000, 2000, + 2000, 2000 ] } diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index ba371ddf6..c69b0001f 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -6424,7 +6424,7 @@ "text": "寻找所有宝箱1" }, "get_item": [], - "trigger": 0, + "trigger": 1, "npc": 60130, "completetask": [ 50000023 @@ -6466,7 +6466,7 @@ "text": "寻找所有宝箱2" }, "get_item": [], - "trigger": 0, + "trigger": 1, "npc": 60140, "completetask": [ 50000024 @@ -6508,7 +6508,7 @@ "text": "寻找所有宝箱3" }, "get_item": [], - "trigger": 0, + "trigger": 1, "npc": 60150, "completetask": [ 50000025 @@ -6550,7 +6550,7 @@ "text": "寻找所有宝箱4" }, "get_item": [], - "trigger": 0, + "trigger": 1, "npc": 60160, "completetask": [ 50000026 @@ -6592,7 +6592,7 @@ "text": "寻找所有宝箱5" }, "get_item": [], - "trigger": 0, + "trigger": 1, "npc": 60170, "completetask": [ 50000027 diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index d5dc76da8..b64e98554 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -177,6 +177,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh Star: star, HeroExp: conf.HeroExp, UserExp: userExp, + Reward: aeward, }) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype60, 1)) diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index 6f93202b1..32c9d2c76 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -120,6 +120,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP Star: star, HeroExp: conf.HeroExp, UserExp: userExp, + Reward: aeward, }) // 数据推送 if err = this.module.modelMline.updateMainlineData(session.GetUserId(), info); err != nil { From 6fd0d93af9c6338a2595a844aac1ccd17504746d Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 20:57:57 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_searchitemall.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bin/json/game_searchitemall.json b/bin/json/game_searchitemall.json index eec664f6b..ebb65c514 100644 --- a/bin/json/game_searchitemall.json +++ b/bin/json/game_searchitemall.json @@ -13,7 +13,6 @@ 2000, 2000, 2000, - 2000, 2000 ] }, @@ -31,7 +30,6 @@ 2000, 2000, 2000, - 2000, 2000 ] }, @@ -49,7 +47,6 @@ 2000, 2000, 2000, - 2000, 2000 ] }, @@ -67,7 +64,6 @@ 2000, 2000, 2000, - 2000, 2000 ] }, @@ -85,7 +81,6 @@ 2000, 2000, 2000, - 2000, 2000 ] } From df522d05f775569af85520fc52980c5f9cb521c0 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 21:02:07 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=9D=E7=AE=B1?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/wtask/api_accept.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go index 5e11c76e9..d569399d1 100644 --- a/modules/wtask/api_accept.go +++ b/modules/wtask/api_accept.go @@ -91,6 +91,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) ( wtask.Boxs[conf.Key] = &pb.DBWTaskBox{ Boxs: boxs, } + update["boxs"] = wtask.Boxs session.SendMsg(string(this.module.GetType()), "boxchange", &pb.WTaskBoxChangePush{Boxs: wtask.Boxs}) } From 87640ae775a5fe8332cb11f1a3421473f05f44d6 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 21:09:19 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_mainstage.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 84c290c67..6d8b9ce9c 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -409,7 +409,7 @@ "hide": 0, "destroy": 1, "progress": 0, - "frontstoryid": 0, + "frontstoryid": 10322, "afterstoryid": 0, "maingroupName": { "key": "", @@ -1053,7 +1053,7 @@ "chapterid": 11001, "group_id": 100112, "previous_group_id": [ - 100111 + 100109 ], "previoustage": 0, "Episodetype": 3, From 5b1085cd041e2bfee400c93d11a93ee069f88bd4 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 22:02:21 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/wtask/module.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 4f3bf6ef1..91f4c92a9 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -53,6 +53,10 @@ func (this *WTask) Start() (err error) { return } this.caravan = module.(comm.ICaravan) + if module, err = this.service.GetModule(comm.ModuleDailytask); err != nil { + return + } + this.dailytask = module.(comm.IDailytask) return } From 15a10c074d202242509aacbbf844ad41d4a69501 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 27 Jul 2023 10:08:41 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E6=8E=92=E5=90=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/guildgve/api_rank.go | 30 ++++++++++-- modules/guildgve/modelUniongve.go | 11 +++++ modules/guildgve/module_test.go | 77 +++++++++++++++++++++++++++++++ pb/guildgve_db.pb.go | 6 +-- 4 files changed, 117 insertions(+), 7 deletions(-) create mode 100644 modules/guildgve/module_test.go diff --git a/modules/guildgve/api_rank.go b/modules/guildgve/api_rank.go index d99b21e0f..850237b0a 100644 --- a/modules/guildgve/api_rank.go +++ b/modules/guildgve/api_rank.go @@ -1,6 +1,7 @@ package guildgve import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" ) @@ -17,6 +18,7 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.GuildGveRankReq) (e err error ids []string sociatys []*pb.DBSociaty + guilids []*pb.DBGuildGve ranks []*pb.GuildGveRankItem ) if errdata = this.RankCheck(session, req); errdata != nil { @@ -35,12 +37,32 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.GuildGveRankReq) (e return } + if guilids, err = this.module.modelGuildGve.querySociatys(ids); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + if len(guilids) != len(sociatys) { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: fmt.Sprintf("数据不对称 guilids:%d sociatys:%d", len(guilids), len(sociatys)), + } + return + } + for i, v := range sociatys { ranks = append(ranks, &pb.GuildGveRankItem{ - Guildid: v.Id, - Name: v.Name, - Icon: v.Icon, - Rank: int32(i), + Guildid: v.Id, + Name: v.Name, + Icon: v.Icon, + Rank: int32(i), + KillCount: guilids[i].Kills, + LastKillTime: guilids[i].Lastkilltime, }) } session.SendMsg(string(this.module.GetType()), "rank", &pb.GuildGveRankResp{List: ranks}) diff --git a/modules/guildgve/modelUniongve.go b/modules/guildgve/modelUniongve.go index d24942d9c..bfbffaf89 100644 --- a/modules/guildgve/modelUniongve.go +++ b/modules/guildgve/modelUniongve.go @@ -40,6 +40,17 @@ func (this *ModelUniongve) Start() (err error) { return } +// 批量查询工会信息 +func (this *ModelUniongve) querySociatys(guildids []string) (result []*pb.DBGuildGve, err error) { + result = make([]*pb.DBGuildGve, 0) + if _, err = this.Gets(guildids, &result); err != nil && err != mgo.MongodbNil { + this.module.Errorln(err) + return + } + err = nil + return +} + // 获取用户全部的埋点数据 func (this *ModelUniongve) getGuildGve(guildid string) (results *pb.DBGuildGve, err error) { var ( diff --git a/modules/guildgve/module_test.go b/modules/guildgve/module_test.go new file mode 100644 index 000000000..00063727d --- /dev/null +++ b/modules/guildgve/module_test.go @@ -0,0 +1,77 @@ +package guildgve_test + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/lego" + "go_dreamfactory/lego/base/rpcx" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/modules/chat" + "go_dreamfactory/services" + "go_dreamfactory/sys/db" + "os" + "testing" + "time" + + "github.com/go-redis/redis/v8" +) + +func newService(ops ...rpcx.Option) core.IService { + s := new(TestService) + s.Configure(ops...) + return s +} + +// 梦工厂基础服务对象 +type TestService struct { + services.ServiceBase +} + +// 初始化相关系统 +func (this *TestService) InitSys() { + this.ServiceBase.InitSys() + if err := db.OnInit(this.GetSettings().Sys["db"], db.SetServiceId(this.GetTag())); err != nil { + panic(fmt.Sprintf("init sys.db err: %s", err.Error())) + } else { + log.Infof("init sys.db success!") + } +} + +var service core.IService +var s_gateComp comm.ISC_GateRouteComp = services.NewGateRouteComp() +var module = new(chat.Chat) + +// 测试环境下初始化db和cache 系统 +func TestMain(m *testing.M) { + service = newService( + rpcx.SetConfPath("../../bin/conf/dfli_worker0.yaml"), + rpcx.SetVersion("1.0.0.0"), + ) + service.OnInstallComp( //装备组件 + s_gateComp, //此服务需要接受用户的消息 需要装备网关组件 + ) + go func() { + lego.Run(service) //运行模块 + + }() + time.Sleep(time.Second * 3) + defer os.Exit(m.Run()) +} + +func Test_Module(t *testing.T) { + var ( + key string + score float64 + menbers *redis.Z + conn *db.DBConn + err error + ) + key = "guildgvebattlerank:3" + score = 1 + menbers = &redis.Z{Score: (score), Member: "member"} + conn, err = db.Local() + if err = conn.Redis.ZAdd(key, menbers); err != nil { + log.Errorln(err) + } +} diff --git a/pb/guildgve_db.pb.go b/pb/guildgve_db.pb.go index 6c0ab8a23..53348455f 100644 --- a/pb/guildgve_db.pb.go +++ b/pb/guildgve_db.pb.go @@ -90,7 +90,7 @@ type DBGuildGve struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid" bson:"_id"` + Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid" bson:"_id"` Notice string `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"` //公告 Fire int32 `protobuf:"varint,3,opt,name=fire,proto3" json:"fire"` //火力 Currstage int32 `protobuf:"varint,4,opt,name=currstage,proto3" json:"currstage"` //当前第几阶段 @@ -716,8 +716,8 @@ var file_guildgve_guildgve_db_proto_rawDesc = []byte{ 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x22, 0xf9, 0x01, 0x0a, 0x0a, 0x44, - 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, - 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, + 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, + 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x69, 0x72, 0x65, 0x12, From fbdc11490b2080a52ae37ea0be9462d40655cfe0 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 27 Jul 2023 10:10:15 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/guildgve/modelrank.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/guildgve/modelrank.go b/modules/guildgve/modelrank.go index 0cb5b57dc..f88069f58 100644 --- a/modules/guildgve/modelrank.go +++ b/modules/guildgve/modelrank.go @@ -113,7 +113,8 @@ func (this *modelRank) raceSettlement() { this.rankRewardPush(result[i], v.Reward) } } - + //清理排行榜 + this.DBModel.Redis.Delete(this.TableName) } // boos 奖励推送