Merge branch 'hy_dny' of http://43.226.57.217:3000/yishanyou/RoApp into hy_dny

# Conflicts:
#	Assets/Content/Icons/Activity_NewYear/img_shuang11Signin_cn.png.meta
#	Assets/Content/Icons/Activity_NewYear/shuang11charge1_cn.png.meta