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 2023-08-25 17:18:36 +08:00
commit 100b79516b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/battle/modelBattle.go
View File

@ -803,6 +803,13 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, vlv int32, tid, p
} }
// 新需求 觉醒回响技能 统一放装备技能中
if len(hero.Talentskill) > 0 {
role.EquipSkill = append(role.EquipSkill, hero.Talentskill...)
}
if len(hero.Awakenskill) > 0 {
role.EquipSkill = append(role.EquipSkill, hero.Awakenskill...)
}
return return
} }

2
modules/privilege/module.go
View File

@ -340,7 +340,7 @@ func (this *Privilege) SendDailyMail(session comm.IUserSession, cId string, coun
if pType == 1 { if pType == 1 {
this.mail.SendMailByCid(session, comm.Yueka_1, res) this.mail.SendMailByCid(session, comm.Yueka_1, res)
} else if pType == 2 { } else if pType == 2 {
this.mail.SendMailByCid(session, comm.Yueka_1, res) this.mail.SendMailByCid(session, comm.Yueka_2, res)
} }
} }
} }