#添加解析方法
Merge branch 'master' of https://github.com/LOLGame/MyLOLProj

Conflicts:
	.gitignore