冒险bug
删除无用文件
死灵
贤�
死灵
XianZhe
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test

Conflicts:
	GameServer/BackGroundEngine.cpp
	GameServer/Characters.cpp
	GameServer/Characters.h
	GameServer/main.h
	gui/gui.pro
	gui/logic/Logic.cpp
	瑙掕壊鎶€鑳介€氫俊鏍煎紡.xlsx
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
神官 fix
不朽、神圣启示、Round
31 & 一些微调
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
神官 fix
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
冒险 贤者 牌不对时改为reset 补图
GeDouJia
巫女半成品
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test

Conflicts:
	GameServer/Characters.cpp
	GameServer/Characters.h
	GameServer/Server.cpp
	gui/gui.pro
	gui/logic/Logic.cpp
	瑙掕壊鎶€鑳介€氫俊鏍煎紡.xlsx
修正 赐福 封印 可能重复贴的bug
巫女；手牌上限设置更改