From d695df321b19912ef0a54393a4c74c7e09c566db Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 30 Dec 2022 15:10:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E9=98=B5=E5=9B=BE=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_awaken.go | 3 +- modules/hero/api_resonance.go | 3 +- modules/hero/api_strengthenUpSkill.go | 9 ++-- modules/hero/api_strengthenUpStar.go | 9 ++-- modules/hero/model_hero.go | 14 +++-- modules/hero/module.go | 32 +++++++----- modules/pagoda/module.go | 5 -- modules/smithy/comp_configure.go | 21 -------- modules/smithy/module.go | 3 +- pb/userexpand.pb.go | 74 ++++++++++++--------------- services/worker/main.go | 3 +- 11 files changed, 77 insertions(+), 99 deletions(-) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 93d084f24..a383d7932 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -64,11 +64,12 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c _hero.SameCount -= 1 _hero.JuexProperty = map[string]int32{} - newHero := this.module.modelHero.CloneNewHero(_hero) + newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) _hero.JuexProperty = map[string]int32{} chanegCard = append(chanegCard, newHero) _heroMap["isOverlying"] = false _heroMap["sameCount"] = 1 + _heroMap["horoscopeProperty"] = _hero.HoroscopeProperty } _hero.SameCount = 1 _hero.IsOverlying = false diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index e2366f73d..dbcd45254 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -124,7 +124,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR } if _hero.SameCount > 1 { _hero.SameCount -= 1 - newHero := this.module.modelHero.CloneNewHero(_hero) + newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) ChangeList = append(ChangeList, newHero) } _hero.SameCount = 1 @@ -136,6 +136,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR "distributionResonate": _hero.DistributionResonate, "isOverlying": false, "sameCount": 1, + "horoscopeProperty": _hero.HoroscopeProperty, } err := this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息 if err != nil { diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 15301253b..55957ea25 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -141,15 +141,16 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt }) v.SkillLv = 1 } - newHero := this.module.modelHero.CloneNewHero(_hero) + newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) ChangeList = append(ChangeList, newHero) _hero.NormalSkill = sz } _heroMap := map[string]interface{}{ - "normalSkill": _hero.NormalSkill, - "isOverlying": false, - "sameCount": 1, + "normalSkill": _hero.NormalSkill, + "isOverlying": false, + "sameCount": 1, + "horoscopeProperty": _hero.HoroscopeProperty, } _hero.SameCount = 1 err1 := this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息 diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 3a340e64d..4329ffd9d 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -139,15 +139,16 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr // 克隆一个新的 _hero.SameCount -= 1 - newHero := this.module.modelHero.CloneNewHero(_hero) + newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) chanegCard = append(chanegCard, newHero) } _hero.Star += 1 _hero.SameCount = 1 _heroMap := map[string]interface{}{ - "star": _hero.Star, - "sameCount": 1, - "isOverlying": false, + "star": _hero.Star, + "sameCount": 1, + "isOverlying": false, + "horoscopeProperty": _hero.HoroscopeProperty, } if heroConf != nil && heroConf.Type == comm.CardTypeStar { // 升星卡升星 修改heroid diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index c3aefbdeb..d0f568862 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -116,11 +116,14 @@ func (this *ModelHero) copyPoint(m *pb.DBHero) *pb.DBHero { // 克隆一个英雄 // 调用此方法前注意有使用map 切片等指针类型数据是 克隆完成后自行初始化这个指针对象 -func (this *ModelHero) CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) { +func (this *ModelHero) CloneNewHero(uid string, hero *pb.DBHero) (newHero *pb.DBHero) { newHero = new(pb.DBHero) *newHero = *hero //*this.copyPoint(hero) newHero.Id = primitive.NewObjectID().Hex() this.AddList(newHero.Uid, newHero.Id, newHero) + + // 星座图属性计算 + this.moduleHero.moduleHoroscope.ComputeHeroNumeric(uid, hero) return } @@ -336,7 +339,7 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen } //设置装备 -func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err error) { +func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DBHero, err error) { if len(hero.EquipID) == 0 { return } @@ -364,12 +367,13 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er hero.SuiteId = 0 hero.SuiteExtId = 0 hero.EquipID = make([]string, 8) - newHero = this.CloneNewHero(hero) + newHero = this.CloneNewHero(uid, hero) hero.EquipID = make([]string, 8) hero.SameCount = 1 hero.IsOverlying = false update["isoverlying"] = false update["sameCount"] = 1 + update["horoscopeProperty"] = hero.HoroscopeProperty } // 修改装备属性 并更新 update["suiteId"] = _suiteId @@ -555,14 +559,14 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex } if hero.SameCount > 1 { //有堆叠的情况 hero.SameCount -= 1 - newhero = this.CloneNewHero(hero) // 克隆一个新的 + newhero = this.CloneNewHero(session.GetUserId(), hero) // 克隆一个新的 } this.moduleHero.Debugf("add hero exp :old lv:%d,old exp:%d,new lv:%d,new exp:%d,addexp:%d", hero.Lv, hero.Exp, curLv, curExp, exp) update["lv"] = curLv update["exp"] = curExp update["isOverlying"] = false update["sameCount"] = 1 - + update["horoscopeProperty"] = hero.HoroscopeProperty hero.Lv = curLv hero.Exp = curExp hero.IsOverlying = false diff --git a/modules/hero/module.go b/modules/hero/module.go index 058914d1f..c8137f047 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -22,13 +22,14 @@ func NewModule() core.IModule { type Hero struct { modules.ModuleBase - api *apiComp - configure *configureComp - modelHero *ModelHero - modelRecord *ModelRecord // 英雄抽卡保底，次数等数据 - modelTalent *ModelTalent // 天赋系统 - moduleFetter comm.IHeroFetter - service core.IService + api *apiComp + configure *configureComp + modelHero *ModelHero + modelRecord *ModelRecord // 英雄抽卡保底，次数等数据 + modelTalent *ModelTalent // 天赋系统 + moduleFetter comm.IHeroFetter + service core.IService + moduleHoroscope comm.IHoroscope } //模块名 @@ -58,6 +59,12 @@ func (this *Hero) Start() (err error) { return } this.moduleFetter = module.(comm.IHeroFetter) + + if module, err = this.service.GetModule(comm.ModuleHoroscope); err != nil { + return + } + this.moduleHoroscope = module.(comm.IHoroscope) + err = this.ModuleBase.Start() event.RegisterGO(comm.EventUserOffline, this.EventUserOffline) return @@ -139,7 +146,7 @@ func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, eq } list := make([]*pb.DBHero, 0) - if newHero, err := this.modelHero.setEquipment(hero); err != nil { + if newHero, err := this.modelHero.setEquipment(session.GetUserId(), hero); err != nil { code = pb.ErrorCode_HeroEquipUpdate return } else { @@ -351,13 +358,14 @@ func (this *Hero) KungFuHero(session comm.IUserSession, heroObjID string, bKongf } if _hero.SameCount > 1 { _hero.SameCount -= 1 - newHero := this.modelHero.CloneNewHero(_hero) + newHero := this.modelHero.CloneNewHero(session.GetUserId(), _hero) _changeHero = append(_changeHero, newHero) } _heroMap := map[string]interface{}{ - "status": pb.HeroType_HeroTypeKongFu, - "isOverlying": false, - "sameCount": 1, + "status": pb.HeroType_HeroTypeKongFu, + "isOverlying": false, + "sameCount": 1, + "horoscopeProperty": _hero.HoroscopeProperty, } _hero.Status = pb.HeroType_HeroTypeKongFu _hero.SameCount = 1 diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index 50e1df804..b9fa8eb7c 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -98,11 +98,6 @@ func (this *Pagoda) ModifyPagodaFloor(session comm.IUserSession, level int32) (c // 通关校验 Nomalcfg := this.configure.GetPagodaConfigData(comm.PagodaType, level+1) if Nomalcfg == nil { - // 修改expand 数据 - update := map[string]interface{}{ - "completePagoda": true, - } - this.ModuleUser.ChangeUserExpand(session.GetUserId(), update) list.Complete = true mapData["complete"] = true } diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go index 2f37e0034..3487bcfb7 100644 --- a/modules/smithy/comp_configure.go +++ b/modules/smithy/comp_configure.go @@ -1,7 +1,6 @@ package smithy import ( - "fmt" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" @@ -13,7 +12,6 @@ import ( const ( game_smithy = "game_smithy.json" game_smithystove = "game_smithystove.json" - game_equip = "game_equip.json" //装备信息表 ) ///配置管理基础组件 @@ -44,7 +42,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp return }) err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStove) - err = this.LoadConfigure(game_equip, cfg.NewGameEquip) return } @@ -94,21 +91,3 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err func (this *configureComp) GetConfigure(name string) (v interface{}, err error) { return configure.GetConfigure(name) } - -func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (configure *cfg.GameEquipData, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(game_equip); err != nil { - this.module.Errorf("err:%v", err) - return - } else { - if configure, ok = v.(*cfg.GameEquip).GetDataMap()[equipmentId]; !ok { - err = fmt.Errorf("EquipmentConfigure not found:%s ", equipmentId) - this.module.Errorf("err:%v", err) - return - } - } - return -} diff --git a/modules/smithy/module.go b/modules/smithy/module.go index 9944aaa94..1bcebeaaf 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -53,8 +53,7 @@ func (this *Smithy) SendRdTask(session comm.IUserSession, Items []*pb.UserAssets var equip map[int32]int32 // key xingji value 数量 equip = make(map[int32]int32, 0) for _, v := range Items { - cfg, err := this.configure.GetEquipmentConfigureById(v.T) - if err == nil { + if cfg := this.configure.GetEquipmentConfigureById(v.T); cfg == nil { equip[cfg.Star]++ } } diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index 2ec9d59cf..0aa817e80 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -42,15 +42,14 @@ type DBUserExpand struct { FriendPointOD int32 `protobuf:"varint,16,opt,name=friendPointOD,proto3" json:"friendPointOD" bson:"friendPointOD"` //每日送出友情点 LoginAddCount int32 `protobuf:"varint,19,opt,name=loginAddCount,proto3" json:"loginAddCount"` //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数 LoginContinueCount int32 `protobuf:"varint,20,opt,name=loginContinueCount,proto3" json:"loginContinueCount"` //@go_tasgs(`bson:"loginContinueCount"`) 连续登录天数 - CompletePagoda bool `protobuf:"varint,21,opt,name=completePagoda,proto3" json:"completePagoda" bson:"completePagoda"` //通关普通塔 - RtaskId int32 `protobuf:"varint,22,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID - TeamHeroIds []string `protobuf:"bytes,23,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs - SociatyId string `protobuf:"bytes,24,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"` //公会ID - SociatyCd int64 `protobuf:"varint,25,opt,name=sociatyCd,proto3" json:"sociatyCd" bson:"sociatyCd"` //主动退出CD - SociatyCoin int32 `protobuf:"varint,26,opt,name=sociatyCoin,proto3" json:"sociatyCoin" bson:"sociatyCoin"` //公会币 - ArenaCoin int32 `protobuf:"varint,27,opt,name=arenaCoin,proto3" json:"arenaCoin" bson:"arenaCoin"` //竞技场币 - Physicalbuynum int32 `protobuf:"varint,28,opt,name=physicalbuynum,proto3" json:"physicalbuynum"` //@go_tags(`bson:"physicalbuynum"`)体力购买次数 - PhysicalbuyLasttime int64 `protobuf:"varint,29,opt,name=physicalbuyLasttime,proto3" json:"physicalbuyLasttime"` //@go_tags(`bson:"physicalbuyLasttime"`)最后购买体力事件 + RtaskId int32 `protobuf:"varint,21,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID + TeamHeroIds []string `protobuf:"bytes,22,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs + SociatyId string `protobuf:"bytes,23,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"` //公会ID + SociatyCd int64 `protobuf:"varint,24,opt,name=sociatyCd,proto3" json:"sociatyCd" bson:"sociatyCd"` //主动退出CD + SociatyCoin int32 `protobuf:"varint,25,opt,name=sociatyCoin,proto3" json:"sociatyCoin" bson:"sociatyCoin"` //公会币 + ArenaCoin int32 `protobuf:"varint,26,opt,name=arenaCoin,proto3" json:"arenaCoin" bson:"arenaCoin"` //竞技场币 + Physicalbuynum int32 `protobuf:"varint,27,opt,name=physicalbuynum,proto3" json:"physicalbuynum"` //@go_tags(`bson:"physicalbuynum"`)体力购买次数 + PhysicalbuyLasttime int64 `protobuf:"varint,28,opt,name=physicalbuyLasttime,proto3" json:"physicalbuyLasttime"` //@go_tags(`bson:"physicalbuyLasttime"`)最后购买体力事件 } func (x *DBUserExpand) Reset() { @@ -197,13 +196,6 @@ func (x *DBUserExpand) GetLoginContinueCount() int32 { return 0 } -func (x *DBUserExpand) GetCompletePagoda() bool { - if x != nil { - return x.CompletePagoda - } - return false -} - func (x *DBUserExpand) GetRtaskId() int32 { if x != nil { return x.RtaskId @@ -264,7 +256,7 @@ var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xba, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0x92, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, @@ -300,31 +292,29 @@ var file_userexpand_proto_rawDesc = []byte{ 0x69, 0x6e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, - 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x18, 0x15, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x67, 0x6f, - 0x64, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x16, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, - 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x17, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x1c, - 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, - 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, - 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x68, - 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x1c, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, - 0x75, 0x6d, 0x12, 0x30, 0x0a, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, - 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, - 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, + 0x49, 0x64, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, + 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x49, 0x64, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, + 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x43, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x69, + 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, + 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, + 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, + 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x70, 0x68, 0x79, 0x73, + 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x30, 0x0a, 0x13, 0x70, 0x68, + 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, + 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, + 0x6c, 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, + 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/services/worker/main.go b/services/worker/main.go index afa3dbd24..ecf1a9312 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -5,7 +5,6 @@ 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" @@ -109,7 +108,7 @@ func main() { reddot.NewModule(), combat.NewModule(), enchant.NewModule(), - autoBattle.NewModule(), + //autoBattle.NewModule(), ) }