配置文件　
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.下载，解压调整
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW

Conflicts:
	VERSION1.0/ClientLogic/BeforeGame/src/NDBeforeGameMgr.cpp
1.是否是WIFI环境的提示调整
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW

Conflicts:
	VERSION1.0/ClientLogic/GameScene/src/SMLoginScene.cpp
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.修正输入控件问题2.修正WriteStr接口错误3.修正快速训练页面字符错误4.修正添加好友控件字体大小
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.更新下载提示调整
Nothing,index is locked.
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW