Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/StreamingAssets/Bundles/Manifest

@@ -1 +1 @@
-{"version":1,"appVersion":"1.4","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9314,"crc":65622739,"nameWithAppendHash":"privacypolicy_e619923224a05b27c6edbab55b2afbf7","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12857,"crc":2147024475,"nameWithAppendHash":"privacypolicychildren_4b4c084ab06cd5a3370e845b1479a003","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14562,"crc":952260727,"nameWithAppendHash":"serviceprotocal_c45e9bb36af2e000bbfa833337c6c345","dependencies":[]}]}
+{"version":3,"appVersion":"1.6","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9314,"crc":65622739,"nameWithAppendHash":"privacypolicy_e619923224a05b27c6edbab55b2afbf7","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12857,"crc":2147024475,"nameWithAppendHash":"privacypolicychildren_4b4c084ab06cd5a3370e845b1479a003","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14562,"crc":952260727,"nameWithAppendHash":"serviceprotocal_c45e9bb36af2e000bbfa833337c6c345","dependencies":[]}]}

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +1 @@
-{"crc":2604006040,"size":664,"version":1,"appVersion":"1.4"}
+{"crc":2491647443,"size":664,"version":3,"appVersion":"1.6"}