Tan I did/do what you said too. If the tanty started properly I get down to her level and ask her if she's finished being silly yet. Even at that age she could repsond with yes or no. If she says no I say OK and wait 15ish seconds and ask again. Usually its a yes, then i explain again she usually says sorry - I guess it's a daycare thing they do, without me even prompting.
Distraction works often but not always and if she's doing something naughty I just pick her up and mover her.
DH hasn't figured out that no one but him yells so she doesn't respond at all.....