Merge pull request #62 from HollyDAI/xr

Xr各种merge
Merge pull request #63 from HollyDAI/master

Merge pull request #62 from HollyDAI/xr