Revert "娴嬭瘯淇?鏀规仮澶峠it"

This reverts commit 6e28b8adaaca5685613ae296c77a2916941bcd1c.

Conflicts:
	Classes/game/ShowArea.cpp
Merge branch 'master' of https://github.com/liyan998/LineGame

Conflicts:
	Classes/game/ShowArea.cpp

Signed-off-by: liyan998@hotmail.com <liyan998@hotmail.com>
Revert "娴嬭瘯鍟婂晩"

This reverts commit 313a7bb91ff5c6ae5032d0eede7c74f5c642a2f2.

Conflicts:
	Classes/game/ShowArea.cpp
Revert "娴嬭瘯淇?鏀规仮澶峠it"

This reverts commit 6e28b8adaaca5685613ae296c77a2916941bcd1c.

Conflicts:
	Classes/game/ShowArea.cpp
Merge branch 'master' of https://github.com/liyan998/LineGame.git
Signed-off-by: liyan998@hotmail.com <liyan998@hotmail.com>