From 263747a760ab0a7c9abf7de9a5bb6e0d09f89521 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 28 Dec 2022 10:09:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bingo=E7=8E=A9=E5=AE=B6lv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 4 +++- modules/user/module.go | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/comm/imodule.go b/comm/imodule.go index 5648fd7b3..9b9c0401e 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -121,6 +121,8 @@ type ( SearchRmoteUser(nickname string) ([]*pb.DBUser, error) // 检查是不是新获得的英雄 CheckTujianHero(session IUserSession, heros []string) []bool + // bingo设置玩家等级 + BingoSetUserLv(session IUserSession, lv int32) error } //武器模块 IEquipment interface { @@ -271,7 +273,7 @@ type ( MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo) // 设置工会经验 BingoSetExp(session IUserSession, exp int32) error - // 设置工会经验 + // 设置工会活跃度 BingoSetActivity(session IUserSession, activity int32) error ///红点 IReddot diff --git a/modules/user/module.go b/modules/user/module.go index 2f6e74134..6eac79c81 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -580,3 +580,14 @@ func (this *User) CheckTujianHero(session comm.IUserSession, heros []string) []b } return sz } + +func (this *User) BingoSetUserLv(session comm.IUserSession, lv int32) error { + if lv <= 0 { + return comm.NewCustomError(pb.ErrorCode_ReqParameterError) + } + update := map[string]interface{}{ + "lv": lv, + "exp": 0, + } + return this.modelUser.Change(session.GetUserId(), update) +} From dac702a58a5d95c97d37ad536d5ed2750b33104f Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 28 Dec 2022 11:13:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?bingo=E6=94=AF=E6=8C=81=E6=94=B9=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/v2/FyneApp.toml | 4 ++-- cmd/v2/ui/views/bingoview.go | 2 +- modules/gm/module.go | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cmd/v2/FyneApp.toml b/cmd/v2/FyneApp.toml index 57d737750..1e39ea0ea 100644 --- a/cmd/v2/FyneApp.toml +++ b/cmd/v2/FyneApp.toml @@ -4,5 +4,5 @@ Website = "http://legu.cc" Icon = "app.png" Name = "RobotGUI" ID = "cc.legu.app" - Version = "1.2.2" - Build = 29 + Version = "1.2.3" + Build = 31 diff --git a/cmd/v2/ui/views/bingoview.go b/cmd/v2/ui/views/bingoview.go index 77effa410..59cf6819a 100644 --- a/cmd/v2/ui/views/bingoview.go +++ b/cmd/v2/ui/views/bingoview.go @@ -46,7 +46,7 @@ func (this *BingoView) CreateView(t *model.TestCase) fyne.CanvasObject { aSel = &widget.Select{} gridContainer = container.NewGridWithColumns(3, aSel, tEntry, nEntry) - aSel.Options = []string{"选择", "attr", "item", "hero", "equi", "mapid", "pataid", "alltask", "worldtask", "sociatyexp", "sociatyactivity", "allgrowtask"} + aSel.Options = []string{"选择", "attr", "item", "hero", "equi", "mapid", "pataid", "alltask", "worldtask", "sociatyexp", "sociatyactivity", "allgrowtask","userlv"} aSel.SetSelected("选择") aSel.OnChanged = func(s string) { if s == "attr" { diff --git a/modules/gm/module.go b/modules/gm/module.go index 82938fb79..6f75987b3 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -342,6 +342,24 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorC log.Field{Key: "param", Value: datas[0]}, log.Field{Key: "res", Value: res}, ) + } else if len(datas) == 2 && (datas[0] == "userlv") { // 玩家等级 + module1, err := this.service.GetModule(comm.ModuleUser) + if err != nil { + return + } + num, err := strconv.Atoi(datas[1]) + if err != nil { + code = pb.ErrorCode_ReqParameterError + return + } + if err = module1.(comm.IUser).BingoSetUserLv(session, int32(num)); err == nil { + code = pb.ErrorCode_Success + } + this.Debug("使用bingo命令:uid = %s ", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "0", Value: datas[0]}, + log.Field{Key: "N", Value: int32(num)}, + ) } } From 0122bd44d56c200661b154e8a9809d7e0e917a21 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 28 Dec 2022 15:53:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/sociaty/api_cross_apply.go | 3 +++ modules/sociaty/api_cross_create.go | 3 +++ modules/sociaty/api_cross_mine.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index 43096f836..ae62325b1 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -21,6 +21,9 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.SociatyApplyR } func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (code pb.ErrorCode, data proto.Message) { + if code = this.module.ModuleSys.IsAccess(comm.Guild, session.GetUserId()); code != pb.ErrorCode_Success { + return + } if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index edc000eda..4968d2b42 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -24,6 +24,9 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.SociatyCreat } func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) (code pb.ErrorCode, data proto.Message) { + if code = this.module.ModuleSys.IsAccess(comm.Guild, session.GetUserId()); code != pb.ErrorCode_Success { + return + } if code = this.CreateCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index e9add906e..f9f2bbe1a 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -16,6 +16,9 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.SociatyMineReq } func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode, data proto.Message) { + if code = this.module.ModuleSys.IsAccess(comm.Guild, session.GetUserId()); code != pb.ErrorCode_Success { + return + } uid := session.GetUserId() userEx, err := this.module.ModuleUser.GetUserExpand(uid) if err != nil { From 58797027fc3436489ffc6cc4211f78155ad217e9 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Dec 2022 15:54:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/{auto => autoBattle}/api.go | 0 .../{auto => autoBattle}/api_autochallenge.go | 8 +- modules/{auto => autoBattle}/api_autoover.go | 8 +- modules/autoBattle/api_autostop.go | 49 +++ .../{auto => autoBattle}/comp_configure.go | 0 modules/{auto => autoBattle}/model_auto.go | 0 modules/{auto => autoBattle}/module.go | 9 +- pb/auto_msg.pb.go | 309 +++++++++++++----- services/worker/main.go | 2 + 9 files changed, 280 insertions(+), 105 deletions(-) rename modules/{auto => autoBattle}/api.go (100%) rename modules/{auto => autoBattle}/api_autochallenge.go (85%) rename modules/{auto => autoBattle}/api_autoover.go (82%) create mode 100644 modules/autoBattle/api_autostop.go rename modules/{auto => autoBattle}/comp_configure.go (100%) rename modules/{auto => autoBattle}/model_auto.go (100%) rename modules/{auto => autoBattle}/module.go (89%) diff --git a/modules/auto/api.go b/modules/autoBattle/api.go similarity index 100% rename from modules/auto/api.go rename to modules/autoBattle/api.go diff --git a/modules/auto/api_autochallenge.go b/modules/autoBattle/api_autochallenge.go similarity index 85% rename from modules/auto/api_autochallenge.go rename to modules/autoBattle/api_autochallenge.go index d67a9ecc7..3e4d25bb7 100644 --- a/modules/auto/api_autochallenge.go +++ b/modules/autoBattle/api_autochallenge.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) AutoChallengeCheck(session comm.IUserSession, req *pb.BattleAutoChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) AutoChallengeCheck(session comm.IUserSession, req *pb.AutoBattleChallengeReq) (code pb.ErrorCode) { if req.BossId <= 0 || req.Difficulty <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) AutoChallengeCheck(session comm.IUserSession, req *pb.Battl return } -func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.BattleAutoChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.AutoBattleChallengeReq) (code pb.ErrorCode, data proto.Message) { var ( battleInfo *pb.BattleInfo ) @@ -60,13 +60,13 @@ func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.BattleAuto this.viking.AutoBuyTicket(session) code = this.viking.CheckBattelParameter(session, req.Teamids, req.BossId, req.Difficulty, req.Leadpos) if code == pb.ErrorCode_Success { - session.SendMsg(string(this.module.GetType()), "autochallenge", &pb.BattleAutoChallengeResp{ + session.SendMsg(string(this.module.GetType()), "challenge", &pb.AutoBattleChallengeResp{ Info: battleInfo, }) } code, battleInfo = this.viking.AutoBattleInfo(session, req.Leadpos, req.Teamids, req.BossId, req.Difficulty) if code == pb.ErrorCode_Success { - session.SendMsg(string(this.module.GetType()), "autochallenge", &pb.BattleAutoChallengeResp{ + session.SendMsg(string(this.module.GetType()), "challenge", &pb.AutoBattleChallengeResp{ Info: battleInfo, }) } diff --git a/modules/auto/api_autoover.go b/modules/autoBattle/api_autoover.go similarity index 82% rename from modules/auto/api_autoover.go rename to modules/autoBattle/api_autoover.go index d40c793d1..21c6940c7 100644 --- a/modules/auto/api_autoover.go +++ b/modules/autoBattle/api_autoover.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) AutoOverCheck(session comm.IUserSession, req *pb.BattleAutoOverReq) (code pb.ErrorCode) { +func (this *apiComp) AutoOverCheck(session comm.IUserSession, req *pb.AutoBattleOverReq) (code pb.ErrorCode) { if req.Ptype == pb.PlayType_null || req.Report == nil { code = pb.ErrorCode_ReqParameterError return @@ -20,7 +20,7 @@ func (this *apiComp) AutoOverCheck(session comm.IUserSession, req *pb.BattleAuto return } -func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.BattleAutoOverReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.AutoBattleOverReq) (code pb.ErrorCode, data proto.Message) { var ( autoBattle *pb.DBAutoBattle atno []*pb.UserAtno @@ -46,13 +46,13 @@ func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.BattleAutoOverR if req.Ptype == pb.PlayType_viking { if code, atno = this.viking.AutoBattleOver(session, autoBattle.BossId, autoBattle.Difficulty, req.Report, autoBattle); code != pb.ErrorCode_Success { this.module.modelAutoBattle.DelListByObjId(session.GetUserId(), autoBattle.Id) // 自动战斗结束 删除数据 - session.SendMsg(string(this.module.GetType()), "autooverenv", &pb.BattleAutoOverEnvPush{ + session.SendMsg(string(this.module.GetType()), "overenv", &pb.AutoBattleOverEnvPush{ Success: false, }) return } } - session.SendMsg(string(this.module.GetType()), "autoover", &pb.BattleAutoOverResp{ + session.SendMsg(string(this.module.GetType()), "over", &pb.AutoBattleOverResp{ Asset: atno, }) return diff --git a/modules/autoBattle/api_autostop.go b/modules/autoBattle/api_autostop.go new file mode 100644 index 000000000..9549ec216 --- /dev/null +++ b/modules/autoBattle/api_autostop.go @@ -0,0 +1,49 @@ +package autoBattle + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) AutoStopCheck(session comm.IUserSession, req *pb.AutoBattleStopReq) (code pb.ErrorCode) { + if req.Ptype == pb.PlayType_null { + code = pb.ErrorCode_ReqParameterError + return + } + + return +} + +func (this *apiComp) AutoStop(session comm.IUserSession, req *pb.AutoBattleStopReq) (code pb.ErrorCode, data proto.Message) { + var ( + autoBattle *pb.DBAutoBattle + ) + if code = this.AutoStopCheck(session, req); code != pb.ErrorCode_Success { + return + } + list, err := this.module.modelAutoBattle.getAutoBattleList(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + for _, v := range list { + if v.Ptype == req.Ptype { // 有正在自动战斗的数据 + autoBattle = v + } + } + if autoBattle == nil { + code = pb.ErrorCode_AutoBattleNoData + return + } + if err = this.module.modelAutoBattle.DelListByObjId(session.GetUserId(), autoBattle.Id); err != nil { + code = pb.ErrorCode_DBError + return + } + session.SendMsg(string(this.module.GetType()), "stop", &pb.AutoBattleStopReq{ + Ptype: req.Ptype, + }) + return +} diff --git a/modules/auto/comp_configure.go b/modules/autoBattle/comp_configure.go similarity index 100% rename from modules/auto/comp_configure.go rename to modules/autoBattle/comp_configure.go diff --git a/modules/auto/model_auto.go b/modules/autoBattle/model_auto.go similarity index 100% rename from modules/auto/model_auto.go rename to modules/autoBattle/model_auto.go diff --git a/modules/auto/module.go b/modules/autoBattle/module.go similarity index 89% rename from modules/auto/module.go rename to modules/autoBattle/module.go index 3c995d8a9..d995a3b89 100644 --- a/modules/auto/module.go +++ b/modules/autoBattle/module.go @@ -13,7 +13,6 @@ type AutoBattle struct { modelAutoBattle *modelAutoBattle api *apiComp configure *configureComp - battle comm.IBattle service core.IService } @@ -33,12 +32,6 @@ func (this *AutoBattle) Init(service core.IService, module core.IModule, options func (this *AutoBattle) Start() (err error) { err = this.ModuleBase.Start() - var module core.IModule - if module, err = this.service.GetModule(comm.ModuleBattle); err != nil { - return - } - - this.battle = module.(comm.IBattle) event.RegisterGO(comm.EventUserOffline, this.EventUserOffline) return @@ -47,7 +40,7 @@ func (this *AutoBattle) Start() (err error) { func (this *AutoBattle) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) - + this.modelAutoBattle = this.RegisterComp(new(modelAutoBattle)).(*modelAutoBattle) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } diff --git a/pb/auto_msg.pb.go b/pb/auto_msg.pb.go index 83aa35f7a..471b958af 100644 --- a/pb/auto_msg.pb.go +++ b/pb/auto_msg.pb.go @@ -20,7 +20,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type BattleAutoChallengeReq struct { +type AutoBattleChallengeReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -36,8 +36,8 @@ type BattleAutoChallengeReq struct { Ptype PlayType `protobuf:"varint,9,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` // 类型 } -func (x *BattleAutoChallengeReq) Reset() { - *x = BattleAutoChallengeReq{} +func (x *AutoBattleChallengeReq) Reset() { + *x = AutoBattleChallengeReq{} if protoimpl.UnsafeEnabled { mi := &file_auto_auto_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -45,13 +45,13 @@ func (x *BattleAutoChallengeReq) Reset() { } } -func (x *BattleAutoChallengeReq) String() string { +func (x *AutoBattleChallengeReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*BattleAutoChallengeReq) ProtoMessage() {} +func (*AutoBattleChallengeReq) ProtoMessage() {} -func (x *BattleAutoChallengeReq) ProtoReflect() protoreflect.Message { +func (x *AutoBattleChallengeReq) ProtoReflect() protoreflect.Message { mi := &file_auto_auto_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -63,75 +63,75 @@ func (x *BattleAutoChallengeReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use BattleAutoChallengeReq.ProtoReflect.Descriptor instead. -func (*BattleAutoChallengeReq) Descriptor() ([]byte, []int) { +// Deprecated: Use AutoBattleChallengeReq.ProtoReflect.Descriptor instead. +func (*AutoBattleChallengeReq) Descriptor() ([]byte, []int) { return file_auto_auto_msg_proto_rawDescGZIP(), []int{0} } -func (x *BattleAutoChallengeReq) GetBossId() int32 { +func (x *AutoBattleChallengeReq) GetBossId() int32 { if x != nil { return x.BossId } return 0 } -func (x *BattleAutoChallengeReq) GetDifficulty() int32 { +func (x *AutoBattleChallengeReq) GetDifficulty() int32 { if x != nil { return x.Difficulty } return 0 } -func (x *BattleAutoChallengeReq) GetLeadpos() int32 { +func (x *AutoBattleChallengeReq) GetLeadpos() int32 { if x != nil { return x.Leadpos } return 0 } -func (x *BattleAutoChallengeReq) GetTeamids() []string { +func (x *AutoBattleChallengeReq) GetTeamids() []string { if x != nil { return x.Teamids } return nil } -func (x *BattleAutoChallengeReq) GetAutoWin() bool { +func (x *AutoBattleChallengeReq) GetAutoWin() bool { if x != nil { return x.AutoWin } return false } -func (x *BattleAutoChallengeReq) GetMaxExp() bool { +func (x *AutoBattleChallengeReq) GetMaxExp() bool { if x != nil { return x.MaxExp } return false } -func (x *BattleAutoChallengeReq) GetAutoBuy() bool { +func (x *AutoBattleChallengeReq) GetAutoBuy() bool { if x != nil { return x.AutoBuy } return false } -func (x *BattleAutoChallengeReq) GetAutoSell() int32 { +func (x *AutoBattleChallengeReq) GetAutoSell() int32 { if x != nil { return x.AutoSell } return 0 } -func (x *BattleAutoChallengeReq) GetPtype() PlayType { +func (x *AutoBattleChallengeReq) GetPtype() PlayType { if x != nil { return x.Ptype } return PlayType_null } -type BattleAutoChallengeResp struct { +type AutoBattleChallengeResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -139,8 +139,8 @@ type BattleAutoChallengeResp struct { Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` } -func (x *BattleAutoChallengeResp) Reset() { - *x = BattleAutoChallengeResp{} +func (x *AutoBattleChallengeResp) Reset() { + *x = AutoBattleChallengeResp{} if protoimpl.UnsafeEnabled { mi := &file_auto_auto_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -148,13 +148,13 @@ func (x *BattleAutoChallengeResp) Reset() { } } -func (x *BattleAutoChallengeResp) String() string { +func (x *AutoBattleChallengeResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*BattleAutoChallengeResp) ProtoMessage() {} +func (*AutoBattleChallengeResp) ProtoMessage() {} -func (x *BattleAutoChallengeResp) ProtoReflect() protoreflect.Message { +func (x *AutoBattleChallengeResp) ProtoReflect() protoreflect.Message { mi := &file_auto_auto_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -166,19 +166,19 @@ func (x *BattleAutoChallengeResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use BattleAutoChallengeResp.ProtoReflect.Descriptor instead. -func (*BattleAutoChallengeResp) Descriptor() ([]byte, []int) { +// Deprecated: Use AutoBattleChallengeResp.ProtoReflect.Descriptor instead. +func (*AutoBattleChallengeResp) Descriptor() ([]byte, []int) { return file_auto_auto_msg_proto_rawDescGZIP(), []int{1} } -func (x *BattleAutoChallengeResp) GetInfo() *BattleInfo { +func (x *AutoBattleChallengeResp) GetInfo() *BattleInfo { if x != nil { return x.Info } return nil } -type BattleAutoOverReq struct { +type AutoBattleOverReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -187,8 +187,8 @@ type BattleAutoOverReq struct { Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报 } -func (x *BattleAutoOverReq) Reset() { - *x = BattleAutoOverReq{} +func (x *AutoBattleOverReq) Reset() { + *x = AutoBattleOverReq{} if protoimpl.UnsafeEnabled { mi := &file_auto_auto_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -196,13 +196,13 @@ func (x *BattleAutoOverReq) Reset() { } } -func (x *BattleAutoOverReq) String() string { +func (x *AutoBattleOverReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*BattleAutoOverReq) ProtoMessage() {} +func (*AutoBattleOverReq) ProtoMessage() {} -func (x *BattleAutoOverReq) ProtoReflect() protoreflect.Message { +func (x *AutoBattleOverReq) ProtoReflect() protoreflect.Message { mi := &file_auto_auto_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -214,19 +214,19 @@ func (x *BattleAutoOverReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use BattleAutoOverReq.ProtoReflect.Descriptor instead. -func (*BattleAutoOverReq) Descriptor() ([]byte, []int) { +// Deprecated: Use AutoBattleOverReq.ProtoReflect.Descriptor instead. +func (*AutoBattleOverReq) Descriptor() ([]byte, []int) { return file_auto_auto_msg_proto_rawDescGZIP(), []int{2} } -func (x *BattleAutoOverReq) GetPtype() PlayType { +func (x *AutoBattleOverReq) GetPtype() PlayType { if x != nil { return x.Ptype } return PlayType_null } -func (x *BattleAutoOverReq) GetReport() *BattleReport { +func (x *AutoBattleOverReq) GetReport() *BattleReport { if x != nil { return x.Report } @@ -234,7 +234,7 @@ func (x *BattleAutoOverReq) GetReport() *BattleReport { } // 客户端通知服务器打赢了 -type BattleAutoOverResp struct { +type AutoBattleOverResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -242,8 +242,8 @@ type BattleAutoOverResp struct { Asset []*UserAtno `protobuf:"bytes,1,rep,name=asset,proto3" json:"asset"` // GameRe // 推送atn } -func (x *BattleAutoOverResp) Reset() { - *x = BattleAutoOverResp{} +func (x *AutoBattleOverResp) Reset() { + *x = AutoBattleOverResp{} if protoimpl.UnsafeEnabled { mi := &file_auto_auto_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -251,13 +251,13 @@ func (x *BattleAutoOverResp) Reset() { } } -func (x *BattleAutoOverResp) String() string { +func (x *AutoBattleOverResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*BattleAutoOverResp) ProtoMessage() {} +func (*AutoBattleOverResp) ProtoMessage() {} -func (x *BattleAutoOverResp) ProtoReflect() protoreflect.Message { +func (x *AutoBattleOverResp) ProtoReflect() protoreflect.Message { mi := &file_auto_auto_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -269,12 +269,12 @@ func (x *BattleAutoOverResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use BattleAutoOverResp.ProtoReflect.Descriptor instead. -func (*BattleAutoOverResp) Descriptor() ([]byte, []int) { +// Deprecated: Use AutoBattleOverResp.ProtoReflect.Descriptor instead. +func (*AutoBattleOverResp) Descriptor() ([]byte, []int) { return file_auto_auto_msg_proto_rawDescGZIP(), []int{3} } -func (x *BattleAutoOverResp) GetAsset() []*UserAtno { +func (x *AutoBattleOverResp) GetAsset() []*UserAtno { if x != nil { return x.Asset } @@ -282,7 +282,7 @@ func (x *BattleAutoOverResp) GetAsset() []*UserAtno { } // 自动战斗结束 -type BattleAutoOverEnvPush struct { +type AutoBattleOverEnvPush struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -290,8 +290,8 @@ type BattleAutoOverEnvPush struct { Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success"` } -func (x *BattleAutoOverEnvPush) Reset() { - *x = BattleAutoOverEnvPush{} +func (x *AutoBattleOverEnvPush) Reset() { + *x = AutoBattleOverEnvPush{} if protoimpl.UnsafeEnabled { mi := &file_auto_auto_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -299,13 +299,13 @@ func (x *BattleAutoOverEnvPush) Reset() { } } -func (x *BattleAutoOverEnvPush) String() string { +func (x *AutoBattleOverEnvPush) String() string { return protoimpl.X.MessageStringOf(x) } -func (*BattleAutoOverEnvPush) ProtoMessage() {} +func (*AutoBattleOverEnvPush) ProtoMessage() {} -func (x *BattleAutoOverEnvPush) ProtoReflect() protoreflect.Message { +func (x *AutoBattleOverEnvPush) ProtoReflect() protoreflect.Message { mi := &file_auto_auto_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -317,18 +317,114 @@ func (x *BattleAutoOverEnvPush) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use BattleAutoOverEnvPush.ProtoReflect.Descriptor instead. -func (*BattleAutoOverEnvPush) Descriptor() ([]byte, []int) { +// Deprecated: Use AutoBattleOverEnvPush.ProtoReflect.Descriptor instead. +func (*AutoBattleOverEnvPush) Descriptor() ([]byte, []int) { return file_auto_auto_msg_proto_rawDescGZIP(), []int{4} } -func (x *BattleAutoOverEnvPush) GetSuccess() bool { +func (x *AutoBattleOverEnvPush) GetSuccess() bool { if x != nil { return x.Success } return false } +// 主动结束战斗 +type AutoBattleStopReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Ptype PlayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` // 类型 +} + +func (x *AutoBattleStopReq) Reset() { + *x = AutoBattleStopReq{} + if protoimpl.UnsafeEnabled { + mi := &file_auto_auto_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AutoBattleStopReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AutoBattleStopReq) ProtoMessage() {} + +func (x *AutoBattleStopReq) ProtoReflect() protoreflect.Message { + mi := &file_auto_auto_msg_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use AutoBattleStopReq.ProtoReflect.Descriptor instead. +func (*AutoBattleStopReq) Descriptor() ([]byte, []int) { + return file_auto_auto_msg_proto_rawDescGZIP(), []int{5} +} + +func (x *AutoBattleStopReq) GetPtype() PlayType { + if x != nil { + return x.Ptype + } + return PlayType_null +} + +// 客户端通知服务器打赢了 +type AutoBattleStopResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Ptype PlayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` // 类型 +} + +func (x *AutoBattleStopResp) Reset() { + *x = AutoBattleStopResp{} + if protoimpl.UnsafeEnabled { + mi := &file_auto_auto_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AutoBattleStopResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AutoBattleStopResp) ProtoMessage() {} + +func (x *AutoBattleStopResp) ProtoReflect() protoreflect.Message { + mi := &file_auto_auto_msg_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use AutoBattleStopResp.ProtoReflect.Descriptor instead. +func (*AutoBattleStopResp) Descriptor() ([]byte, []int) { + return file_auto_auto_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *AutoBattleStopResp) GetPtype() PlayType { + if x != nil { + return x.Ptype + } + return PlayType_null +} + var File_auto_auto_msg_proto protoreflect.FileDescriptor var file_auto_auto_msg_proto_rawDesc = []byte{ @@ -337,8 +433,8 @@ var file_auto_auto_msg_proto_rawDesc = []byte{ 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x8d, 0x02, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x41, 0x75, 0x74, - 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, + 0x74, 0x6f, 0x22, 0x8d, 0x02, 0x0a, 0x16, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, @@ -354,24 +450,31 @@ var file_auto_auto_msg_proto_rawDesc = []byte{ 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x65, 0x6c, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3a, 0x0a, 0x17, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, + 0x70, 0x65, 0x22, 0x3a, 0x0a, 0x17, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5b, - 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x4f, 0x76, 0x65, 0x72, + 0x0a, 0x11, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x35, 0x0a, 0x12, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, + 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x35, 0x0a, 0x12, 0x41, + 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x73, 0x73, - 0x65, 0x74, 0x22, 0x31, 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, + 0x65, 0x74, 0x22, 0x31, 0x0a, 0x15, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x34, 0x0a, 0x11, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, + 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x22, 0x35, 0x0a, 0x12, 0x41, + 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, + 0x70, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -386,29 +489,33 @@ func file_auto_auto_msg_proto_rawDescGZIP() []byte { return file_auto_auto_msg_proto_rawDescData } -var file_auto_auto_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_auto_auto_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_auto_auto_msg_proto_goTypes = []interface{}{ - (*BattleAutoChallengeReq)(nil), // 0: BattleAutoChallengeReq - (*BattleAutoChallengeResp)(nil), // 1: BattleAutoChallengeResp - (*BattleAutoOverReq)(nil), // 2: BattleAutoOverReq - (*BattleAutoOverResp)(nil), // 3: BattleAutoOverResp - (*BattleAutoOverEnvPush)(nil), // 4: BattleAutoOverEnvPush - (PlayType)(0), // 5: PlayType - (*BattleInfo)(nil), // 6: BattleInfo - (*BattleReport)(nil), // 7: BattleReport - (*UserAtno)(nil), // 8: UserAtno + (*AutoBattleChallengeReq)(nil), // 0: AutoBattleChallengeReq + (*AutoBattleChallengeResp)(nil), // 1: AutoBattleChallengeResp + (*AutoBattleOverReq)(nil), // 2: AutoBattleOverReq + (*AutoBattleOverResp)(nil), // 3: AutoBattleOverResp + (*AutoBattleOverEnvPush)(nil), // 4: AutoBattleOverEnvPush + (*AutoBattleStopReq)(nil), // 5: AutoBattleStopReq + (*AutoBattleStopResp)(nil), // 6: AutoBattleStopResp + (PlayType)(0), // 7: PlayType + (*BattleInfo)(nil), // 8: BattleInfo + (*BattleReport)(nil), // 9: BattleReport + (*UserAtno)(nil), // 10: UserAtno } var file_auto_auto_msg_proto_depIdxs = []int32{ - 5, // 0: BattleAutoChallengeReq.ptype:type_name -> PlayType - 6, // 1: BattleAutoChallengeResp.info:type_name -> BattleInfo - 5, // 2: BattleAutoOverReq.ptype:type_name -> PlayType - 7, // 3: BattleAutoOverReq.report:type_name -> BattleReport - 8, // 4: BattleAutoOverResp.asset:type_name -> UserAtno - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 7, // 0: AutoBattleChallengeReq.ptype:type_name -> PlayType + 8, // 1: AutoBattleChallengeResp.info:type_name -> BattleInfo + 7, // 2: AutoBattleOverReq.ptype:type_name -> PlayType + 9, // 3: AutoBattleOverReq.report:type_name -> BattleReport + 10, // 4: AutoBattleOverResp.asset:type_name -> UserAtno + 7, // 5: AutoBattleStopReq.ptype:type_name -> PlayType + 7, // 6: AutoBattleStopResp.ptype:type_name -> PlayType + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_auto_auto_msg_proto_init() } @@ -421,7 +528,7 @@ func file_auto_auto_msg_proto_init() { file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_auto_auto_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleAutoChallengeReq); i { + switch v := v.(*AutoBattleChallengeReq); i { case 0: return &v.state case 1: @@ -433,7 +540,7 @@ func file_auto_auto_msg_proto_init() { } } file_auto_auto_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleAutoChallengeResp); i { + switch v := v.(*AutoBattleChallengeResp); i { case 0: return &v.state case 1: @@ -445,7 +552,7 @@ func file_auto_auto_msg_proto_init() { } } file_auto_auto_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleAutoOverReq); i { + switch v := v.(*AutoBattleOverReq); i { case 0: return &v.state case 1: @@ -457,7 +564,7 @@ func file_auto_auto_msg_proto_init() { } } file_auto_auto_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleAutoOverResp); i { + switch v := v.(*AutoBattleOverResp); i { case 0: return &v.state case 1: @@ -469,7 +576,31 @@ func file_auto_auto_msg_proto_init() { } } file_auto_auto_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleAutoOverEnvPush); i { + switch v := v.(*AutoBattleOverEnvPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_auto_auto_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AutoBattleStopReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_auto_auto_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AutoBattleStopResp); i { case 0: return &v.state case 1: @@ -487,7 +618,7 @@ func file_auto_auto_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_auto_auto_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 7, NumExtensions: 0, NumServices: 0, }, diff --git a/services/worker/main.go b/services/worker/main.go index 9c4cd6aeb..afa3dbd24 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -5,6 +5,7 @@ import ( "fmt" "go_dreamfactory/modules/academy" "go_dreamfactory/modules/arena" + "go_dreamfactory/modules/autoBattle" "go_dreamfactory/modules/battle" "go_dreamfactory/modules/chat" "go_dreamfactory/modules/combat" @@ -108,6 +109,7 @@ func main() { reddot.NewModule(), combat.NewModule(), enchant.NewModule(), + autoBattle.NewModule(), ) }