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

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

Browse Source
This commit is contained in:
liwei1dao 2024-02-05 16:22:48 +08:00
commit b47789cd54
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/hero/model_hero.go
View File

@ -953,6 +953,9 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c
N: 1, N: 1,
O: hero.Id, O: hero.Id,
}) })
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleEntertain.AddXxlCard(session, map[string]int32{hero.HeroID: 1}, true)
})
} }
res := make([]*cfg.Gameatn, 0) res := make([]*cfg.Gameatn, 0)
rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()) rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
@ -1137,7 +1140,11 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
if bFirst { // 没有当前英雄 if bFirst { // 没有当前英雄
if bImitate { if bImitate {
hero = this.InitHero(uid, heroCfgId) // 模拟英雄不用真实数据
hero = &pb.DBHero{
HeroID: heroCfgId,
}
//hero = this.InitHero(uid, heroCfgId)
} else { } else {
hero, err = this.initHeroOverlying(uid, heroCfgId, 1) hero, err = this.initHeroOverlying(uid, heroCfgId, 1)
} }
@ -1203,18 +1210,16 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
} }
addres = append(addres, res) addres = append(addres, res)
} }
if !bImitate && bChange { if !bImitate {
this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
"herofrag": rst.Herofrag,
"expitem": rst.Expitem,
})
}
if !bImitate { // 获得三消卡片资源数据
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleEntertain.AddXxlCard(session, szCard, true) this.module.ModuleEntertain.AddXxlCard(session, szCard, true)
}) })
if bChange {
this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
"herofrag": rst.Herofrag,
"expitem": rst.Expitem,
})
}
} }
return return
} }

2
modules/plunder/api_rankscore.go
View File

@ -34,7 +34,7 @@ func (this *apiComp) RankSocre(session comm.IUserSession, req *pb.PlunderRankSoc
} }
return return
} }
session.SendMsg(string(this.module.GetType()), "refresh", &pb.PlunderRankSocreResp{ session.SendMsg(string(this.module.GetType()), "ranksocre", &pb.PlunderRankSocreResp{
Score: land.Score, Score: land.Score,
}) })