Merge branch 'master' of http://192.168.1.190:3000/GFG/Client into GFG

GameClient/Assets/Editor/Bat/updateGame.bat

@@ -1,11 +1,11 @@
-cd ../../../../
-git clean -df
-git reset --hard
-git status
-git pull
+@REM cd ../../../../
+@REM git clean -df
+@REM git reset --hard
+@REM git status
+@REM git pull
 
-cd GameClient/Assets/Game/CSShare
-git clean -df
-git reset --hard
-git status
-git pull
+@REM cd GameClient/Assets/Game/CSShare
+@REM git clean -df
+@REM git reset --hard
+@REM git status
+@REM git pull