Browse Source

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

# Conflicts:
#	GameClient/Assets/ResIn/Config.meta
guodong 3 years ago
parent
commit
85ad1f466e

+ 1 - 1
GameClient/Assets/Editor/Bat/updateGame.bat

@@ -3,6 +3,6 @@ svn up --force --accept tc
 
 
 cd ../../../
 cd ../../../
 git pull
 git pull
-git submodule foreach git pull
+git submodule update
 
 
 pause
 pause

+ 1 - 1
GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 376f3fa7f7e04d01df06e736c4e9a95661543e1e
+Subproject commit cffdd22715bb605ad381c546d7a19691d2d85bbe

File diff suppressed because it is too large
+ 0 - 0
GameClient/Assets/MD5/DressUpMd5


BIN
GameClient/Assets/Plugins/Android/gfglibrary-debug.aar


+ 1 - 1
GameClient/Assets/ResIn/Config.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: f6f65997b10f98946b108b0d4740ffe7
+guid: f3e788236d9da284e8fa725fc87ababd
 folderAsset: yes
 folderAsset: yes
 DefaultImporter:
 DefaultImporter:
   externalObjects: {}
   externalObjects: {}

Some files were not shown because too many files changed in this diff