fixed tower 3 shooting
Merge remote-tracking branch 'origin/master'