liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
meixiongfeng 2022-10-14 11:17:53 +08:00
commit ae21093938
3 changed files with 6 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comm/imodule.go
View File

@ -175,7 +175,7 @@ type (
ModifyHeroFetterData(uid string, obj string, data map[string]interface{}) (code pb.ErrorCode) // 修改羁绊信息 ModifyHeroFetterData(uid string, obj string, data map[string]interface{}) (code pb.ErrorCode) // 修改羁绊信息
QueryHeroFetter(uid string) (data []*pb.DBHeroFetter) // 查询所有的羁绊信息 QueryHeroFetter(uid string) (data []*pb.DBHeroFetter) // 查询所有的羁绊信息
//QueryOneHeroFetter(uid string, cid string) *pb.DBHeroFetter // 通过英雄配置id 查询羁绊信息 //QueryOneHeroFetter(uid string, cid string) *pb.DBHeroFetter // 通过英雄配置id 查询羁绊信息
AddHeroFetterData(session IUserSession, heroConfId string) (code pb.ErrorCode) // 创建一条羁绊信息 AddHeroFetterData(session IUserSession, heroConfId ...string) (code pb.ErrorCode) // 创建一条羁绊信息
} }
//月子秘境 //月子秘境
IMoonFantasy interface { IMoonFantasy interface {

48
modules/hero/module.go
View File

@ -238,59 +238,17 @@ func (this *Hero) EventUserOffline(session comm.IUserSession) {
// 批量创建多个英雄 // 批量创建多个英雄
func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]int32, bPush bool) (code pb.ErrorCode) { func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]int32, bPush bool) (code pb.ErrorCode) {
changeHero := make([]*pb.DBHero, 0)
for heroCfgId, num := range heros { for heroCfgId, num := range heros {
if num == 0 { // 数量为0 不做处理 if num == 0 { // 数量为0 不做处理
continue continue
} }
hero, err := this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num) if code = this.CreateRepeatHero(session, heroCfgId, num, bPush); code != pb.ErrorCode_Success {
if err != nil { this.Errorf("create hero %s failed", heroCfgId)
code = pb.ErrorCode_HeroCreate
continue
}
changeHero = append(changeHero, hero)
// 查品质
cfg := this.configure.GetHeroConfig(heroCfgId)
if cfg != nil {
this.ModuleRtask.SendToRtask(session, comm.Rtype30, 1, cfg.Color)
this.ModuleRtask.SendToRtask(session, comm.Rtype31, 1, cfg.Color)
} }
} }
for k := range heros {
this.moduleFetter.AddHeroFetterData(session, k)
}
// 添加图鉴
go func(uid string, heros map[string]int32) { // 携程处理 图鉴数据
if result, err1 := this.ModuleUser.GetUserExpand(uid); err1 == nil {
initUpdate := map[string]interface{}{}
sz := result.GetTujian()
if len(sz) == 0 {
sz = make(map[string]int32, 0)
}
for k := range heros {
if _, ok := result.GetTujian()[k]; !ok {
sz[k] = 0
initUpdate["tujian"] = sz
}
}
if len(initUpdate) != 0 {
this.ModuleUser.ChangeUserExpand(uid, initUpdate)
}
}
}(session.GetUserId(), heros)
for k := range heros { // 任务统计
this.ModuleRtask.SendToRtask(session, comm.Rtype1, utils.ToInt32(k))
}
if bPush && len(changeHero) > 0 { //推送
session.SendMsg("hero", "change", &pb.HeroChangePush{List: changeHero})
}
return return
} }
func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp int32) (code pb.ErrorCode) { func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp int32) (code pb.ErrorCode) {
var ( var (
_hero *pb.DBHero _hero *pb.DBHero

3
modules/library/module.go
View File

@ -175,7 +175,8 @@ func (this *Library) AddHeroFetterData(session comm.IUserSession, heroConfId str
} }
rsp.Data = append(rsp.Data, obj) rsp.Data = append(rsp.Data, obj)
} }
session.SendMsg(string(this.GetType()), LibraryChangePush, rsp) this.SendMsgToUser(string(this.GetType()), LibraryChangePush, rsp, uid)
//session.SendMsg(string(this.GetType()), LibraryChangePush, rsp)
} }
} }