Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client into 新图集

# Conflicts:
#	Assets/Resource/Xlsx/language_config.xlsx

Assets/Resource/Sprite/SpriteUI/抽奖图标.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b302746e597587e4ea2e8d2e9765a58c
-timeCreated: 1501155153
+timeCreated: 1502703150
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -82,6 +82,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []