衝突解決
Merge branch 'master' of https://github.com/javel555/JSTOHO

Conflicts:
	master/lua/ItemEffect.lua