Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

# Conflicts:
#	GameClient/Assets/Game/CSShare

.gitignore

@@ -21,3 +21,4 @@
 /GameClient/Bundles_temp
 /GameClient/Assets/StreamingAssets/Bundles_temp.meta
 /GameClient/Assets/StreamingAssets/Bundles_temp
+/GameClient/Assets/Game/CSShare

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "GameClient/Assets/Game/CSShare"]
-	path = GameClient/Assets/Game/CSShare
-	url = https://e.coding.net/shenyou-gfg/gfgclient/CSShare.git

GameClient/Assets/Editor/Bat/updateGame.bat

@@ -3,6 +3,8 @@ svn up --force --accept tc
 
 cd ../../../
 git pull
-git submodule update
+
+cd GameClient/Assets/Game/CSShare
+git pull
 
 pause