add gamescene and charactor animation
fix conflict