Merge remote-tracking branch 'remotes/origin/douyou' into douYou

# Conflicts:
#	GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle.meta
#	GameClient/Assets/Resources/mipmap/mipmap-hdpi.meta
#	GameClient/Assets/Resources/mipmap/mipmap-mdpi.meta
#	GameClient/Assets/Resources/mipmap/mipmap-xhdpi.meta
#	GameClient/Assets/Resources/mipmap/mipmap-xxhdpi.meta
#	GameClient/Assets/Resources/mipmap/mipmap-xxxhdpi.meta
#	GameClient/TapTap/AntiAddiction.meta
#	GameClient/TapTap/Bootstrap.meta
#	GameClient/TapTap/Common.meta
#	GameClient/TapTap/Gen.meta

GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>