usepackage{chngcntr}
counterwithin{figure}{chapter}
counterwithin{table}{chapter}

chapter1
  figure 1.1
  figure 1.2
  figure 1.3
chapter2
  figure 2.1
 section 2.1
  figure 2.2
  figure 2.3
chapter3
  figure 3.1
  figure 3.2
 section 3.1
  figure 3.3