fix wis jiangwei
Merge branch 'master' into attack-range-skill