Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

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"
+  Version = "1.2.3"
-  Build = 29
+  Build = 31

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" {

comm/imodule.go

@@ -123,6 +123,8 @@ type (
 		SearchRmoteUser(nickname string) ([]*pb.DBUser, error)
 		// 检查是不是新获得的英雄
 		CheckTujianHero(session IUserSession, heros []string) []bool
+		// bingo设置玩家等级
+		BingoSetUserLv(session IUserSession, lv int32) error
 	}
 	//武器模块
 	IEquipment interface {
@@ -275,7 +277,7 @@ type (
 		MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo)
 		// 设置工会经验
 		BingoSetExp(session IUserSession, exp int32) error
-		// 设置工会经验
+		// 设置工会活跃度
 		BingoSetActivity(session IUserSession, activity int32) error
 		///红点
 		IReddot

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,
 				})
 			}

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

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
+}

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)
 }
 

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)},
+				)
 			}
 
 		}

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
 	}

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
 	}

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 {

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)
+}

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() {
+func (x *AutoBattleChallengeReq) Reset() {
-	*x = BattleAutoChallengeReq{}
+	*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.
+// Deprecated: Use AutoBattleChallengeReq.ProtoReflect.Descriptor instead.
-func (*BattleAutoChallengeReq) Descriptor() ([]byte, []int) {
+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() {
+func (x *AutoBattleChallengeResp) Reset() {
-	*x = BattleAutoChallengeResp{}
+	*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.
+// Deprecated: Use AutoBattleChallengeResp.ProtoReflect.Descriptor instead.
-func (*BattleAutoChallengeResp) Descriptor() ([]byte, []int) {
+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() {
+func (x *AutoBattleOverReq) Reset() {
-	*x = BattleAutoOverReq{}
+	*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.
+// Deprecated: Use AutoBattleOverReq.ProtoReflect.Descriptor instead.
-func (*BattleAutoOverReq) Descriptor() ([]byte, []int) {
+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() {
+func (x *AutoBattleOverResp) Reset() {
-	*x = BattleAutoOverResp{}
+	*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.
+// Deprecated: Use AutoBattleOverResp.ProtoReflect.Descriptor instead.
-func (*BattleAutoOverResp) Descriptor() ([]byte, []int) {
+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() {
+func (x *AutoBattleOverEnvPush) Reset() {
-	*x = BattleAutoOverEnvPush{}
+	*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.
+// Deprecated: Use AutoBattleOverEnvPush.ProtoReflect.Descriptor instead.
-func (*BattleAutoOverEnvPush) Descriptor() ([]byte, []int) {
+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,
+	0x74, 0x6f, 0x22, 0x8d, 0x02, 0x0a, 0x16, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
+	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,
+	0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x35, 0x0a, 0x12, 0x41,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73,
+	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,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x34, 0x0a, 0x11, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	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
+	(*AutoBattleChallengeReq)(nil),  // 0: AutoBattleChallengeReq
-	(*BattleAutoChallengeResp)(nil), // 1: BattleAutoChallengeResp
+	(*AutoBattleChallengeResp)(nil), // 1: AutoBattleChallengeResp
-	(*BattleAutoOverReq)(nil),       // 2: BattleAutoOverReq
+	(*AutoBattleOverReq)(nil),       // 2: AutoBattleOverReq
-	(*BattleAutoOverResp)(nil),      // 3: BattleAutoOverResp
+	(*AutoBattleOverResp)(nil),      // 3: AutoBattleOverResp
-	(*BattleAutoOverEnvPush)(nil),   // 4: BattleAutoOverEnvPush
+	(*AutoBattleOverEnvPush)(nil),   // 4: AutoBattleOverEnvPush
-	(PlayType)(0),                   // 5: PlayType
+	(*AutoBattleStopReq)(nil),       // 5: AutoBattleStopReq
-	(*BattleInfo)(nil),              // 6: BattleInfo
+	(*AutoBattleStopResp)(nil),      // 6: AutoBattleStopResp
-	(*BattleReport)(nil),            // 7: BattleReport
+	(PlayType)(0),                   // 7: PlayType
-	(*UserAtno)(nil),                // 8: UserAtno
+	(*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
+	7,  // 0: AutoBattleChallengeReq.ptype:type_name -> PlayType
-	6, // 1: BattleAutoChallengeResp.info:type_name -> BattleInfo
+	8,  // 1: AutoBattleChallengeResp.info:type_name -> BattleInfo
-	5, // 2: BattleAutoOverReq.ptype:type_name -> PlayType
+	7,  // 2: AutoBattleOverReq.ptype:type_name -> PlayType
-	7, // 3: BattleAutoOverReq.report:type_name -> BattleReport
+	9,  // 3: AutoBattleOverReq.report:type_name -> BattleReport
-	8, // 4: BattleAutoOverResp.asset:type_name -> UserAtno
+	10, // 4: AutoBattleOverResp.asset:type_name -> UserAtno
-	5, // [5:5] is the sub-list for method output_type
+	7,  // 5: AutoBattleStopReq.ptype:type_name -> PlayType
-	5, // [5:5] is the sub-list for method input_type
+	7,  // 6: AutoBattleStopResp.ptype:type_name -> PlayType
-	5, // [5:5] is the sub-list for extension type_name
+	7,  // [7:7] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for extension extendee
+	7,  // [7:7] is the sub-list for method input_type
-	0, // [0:5] is the sub-list for field type_name
+	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,
 		},

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(),
 	)
 }