Merge branch 'master' into win_zuffy
adjust the playother
Merge branch 'win_zuffy'