yanxin delete test file
Merge branch 'master' of github.com:yanxin59/tranckFighting
yanxin change file
yanxin change gameScene
yanxin merge bug
yanxin change some file
yanxin merge all file