Revert "."

This reverts commit 0f80331a14ccf35b9f2cd70e29af412cdc42c7c4.
Merge branch 'master' of https://github.com/SwordElucidator/QSanguosha-For-Saimoe
kanade
Merge branch 'master' of https://github.com/SwordElucidator/QSanguosha-For-Saimoe

Conflicts:
	src/package/animation.cpp
	src/ui/roomscene.cpp
reset aidelay after revive
Merge branch 'master' of https://github.com/SwordElucidator/QSanguosha-For-Saimoe