From 976e4584933e63f26d44b3e99e8d9e62e354132c Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 6 Sep 2023 10:00:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0boos=E9=9A=BE=E5=BA=A6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_booschallengeover.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/mainline/api_booschallengeover.go b/modules/mainline/api_booschallengeover.go index 4e50ab3d9..a0daa091c 100644 --- a/modules/mainline/api_booschallengeover.go +++ b/modules/mainline/api_booschallengeover.go @@ -67,8 +67,9 @@ func (this *apiComp) BoosChallengeOver(session comm.IUserSession, req *pb.Mainli this.module.Debugf("Mline Boos DispenseRes err:+%v", conf.Reward) return } - - info.Chapterboos[conf.MonsterChapter] = conf.MonsterStrength + if info.Chapterboos[conf.MonsterChapter] < conf.MonsterStrength { + info.Chapterboos[conf.MonsterChapter] = conf.MonsterStrength + } info.Currbooschallengenum++ if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{ "chapterboos": info.Chapterboos, From f32f10292f4d19b51318ba0c10641a8067fa84eb Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 6 Sep 2023 10:32:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0cmd=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/cmd/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/cmd/main.go b/services/cmd/main.go index bef381597..b25b6dccf 100644 --- a/services/cmd/main.go +++ b/services/cmd/main.go @@ -29,7 +29,7 @@ var ( gmpath string //服务列表下标 crosspath string //服务列表下标 sid string //服务列表下标 - onelog bool //日志路径 + openlog bool //日志路径 ) var confCmd = &cobra.Command{ Use: "conf", @@ -79,7 +79,7 @@ func init() { RootCmd.PersistentFlags().StringVarP(&gmpath, "gm", "g", "./gm.json", "游戏区服配置") RootCmd.PersistentFlags().StringVarP(&crosspath, "cross", "c", "./cross.json", "游戏跨服配置") RootCmd.PersistentFlags().StringVarP(&sid, "sid", "i", "", "区服id") - RootCmd.PersistentFlags().BoolVarP(&onelog, "log", "l", false, "输出日志") + RootCmd.PersistentFlags().BoolVarP(&openlog, "log", "l", false, "输出日志") RootCmd.AddCommand(confCmd, startCmd, stopCmd, restart) } @@ -340,7 +340,7 @@ func convertServiceSttings(config *comm.GameConfig, id int, stype string, ip str } } - if !onelog { + if openlog { sseting.Sys["rpcx"]["Debug"] = true sseting.Sys["log"] = map[string]interface{}{ "FileName": fmt.Sprintf("./log/%s.log", sseting.Id), @@ -351,7 +351,7 @@ func convertServiceSttings(config *comm.GameConfig, id int, stype string, ip str } else { sseting.Sys["log"] = map[string]interface{}{ "Alias": sseting.Id, - "FileName": "./s.log", + "FileName": fmt.Sprintf("./log/%s.log", sseting.Id), "IsDebug": false, "Loglevel": log.ErrorLevel, "MaxAgeTime": 7,