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

modules/battle/modelBattle.go

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

modules/privilege/module.go

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