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

GameClient/Assets/Resources/PlayerSettings.asset

@@ -13,9 +13,9 @@ MonoBehaviour:
   m_Name: PlayerSettings
   m_EditorClassIdentifier: 
   assets:
-  - txt_privacypolicy_d915f42e452e95a809ae0899c616160a
-  - txt_privacypolicychildren_a1d3fa64f1de766e5bfe011784c137c1
-  - txt_serviceprotocal_8c9edf9ef04964597ffe929c71755648
+  - privacypolicy_5177dd9afec4830d784008bb5adc6ade
+  - privacypolicychildren_20d086cd3eb4971e23c338d9a3d885d5
+  - serviceprotocal_bd8f44b0ae9e2dac4cfbf2ede199c4c8
   - Manifest.version
   - Manifest
   offlineMode: 0

GameClient/Assets/StreamingAssets/Bundles/Manifest

@@ -1 +1 @@
-{"version":1,"appVersion":"1.1","bundles":[{"id":0,"name":"txt_privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9291,"crc":954686481,"nameWithAppendHash":"txt_privacypolicy_d915f42e452e95a809ae0899c616160a","dependencies":[]},{"id":1,"name":"txt_privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12869,"crc":2786691600,"nameWithAppendHash":"txt_privacypolicychildren_a1d3fa64f1de766e5bfe011784c137c1","dependencies":[]},{"id":2,"name":"txt_serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14583,"crc":2060120973,"nameWithAppendHash":"txt_serviceprotocal_8c9edf9ef04964597ffe929c71755648","dependencies":[]}]}
+{"version":1,"appVersion":"1.1","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9282,"crc":2665965776,"nameWithAppendHash":"privacypolicy_5177dd9afec4830d784008bb5adc6ade","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12856,"crc":2871127001,"nameWithAppendHash":"privacypolicychildren_20d086cd3eb4971e23c338d9a3d885d5","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14574,"crc":3564359496,"nameWithAppendHash":"serviceprotocal_bd8f44b0ae9e2dac4cfbf2ede199c4c8","dependencies":[]}]}

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +1 @@
-{"crc":1496411970,"size":690,"version":1,"appVersion":"1.1"}
+{"crc":210833782,"size":667,"version":1,"appVersion":"1.1"}

GameClient/Assets/StreamingAssets/Bundles/txt_serviceprotocal_8c9edf9ef04964597ffe929c71755648.meta → GameClient/Assets/StreamingAssets/Bundles/privacypolicy_5177dd9afec4830d784008bb5adc6ade.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8b30905a465735d4ebd2da6927d182fd
+guid: f6da49fa24212574cb6a6ad5400f80fd
 DefaultImporter:
   externalObjects: {}
   userData: 

GameClient/Assets/StreamingAssets/Bundles/txt_privacypolicy_d915f42e452e95a809ae0899c616160a.meta → GameClient/Assets/StreamingAssets/Bundles/privacypolicychildren_20d086cd3eb4971e23c338d9a3d885d5.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 97dc68197aa5f29458882f6ae8aeb851
+guid: 5d760be993a60744bb2980e7b11f3531
 DefaultImporter:
   externalObjects: {}
   userData: 

GameClient/Assets/StreamingAssets/Bundles/txt_privacypolicychildren_a1d3fa64f1de766e5bfe011784c137c1.meta → GameClient/Assets/StreamingAssets/Bundles/serviceprotocal_bd8f44b0ae9e2dac4cfbf2ede199c4c8.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 44e2785d5b5fcbe4c84f3c8f214310ed
+guid: 174fbeff6ffcffb42a82d72dda92e93a
 DefaultImporter:
   externalObjects: {}
   userData: 

README.md

@@ -17,9 +17,9 @@ Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN
 
 #### 使用说明
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+1.  Assets/Res和Assets/ResIn要设置成AB包，以供编辑器模式启动游戏后Xasset加载资源
+2.  Assets/Res为svn嵌入模式
+3.  CSShare为gitsubmodule模式
 
 #### 参与贡献