Merge branch 'develop' into release

worldsrv/player.go

@@ -4341,7 +4341,6 @@ func (this *Player) RandRobotVip(scene *Scene) {
 
 func (this *Player) RandRobotPetSkillLevel() {
 	//随机机器人宠物技能等级
-	if this.Pets.SkillInfo == nil {
 	this.Pets.SkillInfo = make(map[int32]map[int32]int32)
 	for petId, _ := range this.Pets.ModUnlock {
 		skillLevel := int32(0)
@@ -4362,7 +4361,6 @@ func (this *Player) RandRobotPetSkillLevel() {
 		this.Pets.SkillInfo[petId][10001] = skillLevel
 	}
 }
-}
 
 // BindTelReward 发送绑定手机号奖励
 func (this *Player) BindTelReward() {