fix some equip and skill
Merge branch 'master' of github.com:Xusine1131/QSanguoshaForSowrdRain

Conflicts:
	src/package/special1v1-package.cpp