Trigger and hammer are just fine, is the retaining springs that need to be checked.
Start off with the hammer retaining pin. Pull the hammer and check the bottom hole for the straight spring. It fits straight up in the hammer bottom, and keeps the hammer pin from walking. Yours may have fallen out, or just have straighten it's self to the point that it will not retain the pin. If the spring is still in the hammer, you may have to spin the hammer pin and deepen the center groove.
Once you straighten out the hammer retaining pin/spring, then move onto the trigger pin. On this pin, the hammer spring legs go over the top trigger pin and retain the trigger pin. You may have missed the top of the C groove on the out sides of the trigger, bent the hammer spring legs to the point that they no long apply pressure to the pin, or just polished the side groves out of the pin. Once you take a look at the problem, you will find the answer to keep this pin retained.
Note: If you need to deepen the grooves on the pins, use a drill and spin the pin while using a jeweler's file to deepen the grooves. Don't go buck wild, or you will cut too deep and weaken the pin. All that is needed is a slight groove to allow the springs the catch the groove.
Hope this helps.