yanxin merge tranckFighting version 1.0