Both influence the tides noticeably yes, but I believe Moon tides are stronger than Sun tides. And sometimes they stack together for extra high tides
winton
overwat