iOS merge win32 - edited

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>