Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client

# Conflicts:
#	Assets/Resource/Logo.unity
#	Assets/Resource/Prefab/Object/Flower.prefab
#	Assets/Resource/Prefab/PrefabUI/CloseItem.prefab
#	Assets/Resource/Prefab/PrefabUI/GroupE.prefab
#	Assets/Resource/XML/Config/dressRoom_config.xml
#	Assets/Resource/Xlsx/dressRoom_config.xlsx

.gitignore

@@ -70,3 +70,4 @@ UnityVS
 
 Fight/fight.txt
 /.vscode
+/Assets/UnityAds

Assets/Plugins/Android/UnityAds.aar.meta

@@ -2,6 +2,18 @@ fileFormatVersion: 2
 guid: c7905556f07564410bd4fb75975e28fa
 PluginImporter:
   serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
   platformData:
     Android:
       enabled: 1
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/libs.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1fe9b973dc1406347bc199210a79400b
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/libs/armeabi-v7a.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6c36f1ca524a598468088118c3d62a29
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/libs/x86.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 62d964146e37e214bab16658bd8210a3
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/res.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 4c9f5afeeeddcf64b8840240869eaab3
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/res/anim.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d7d83cf01c3d7cc4d87ac279e9a571aa
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/res/drawable.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b07f610fc2c4cdf4c8fb4472e45b217a
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/res/layout.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 767b5da106a984d4888a898bf4a207cf
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/res/values-en.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5afe7594e9a87c0448f927bd93a2058b
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/res/values.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1efbb3035941f4e4aa77ef546d211700
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/UnityPurchasing/Bin/Security.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 88cb58f5be85146488a7d6c3b661acce
+folderAsset: yes
+timeCreated: 1500743932
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/UnityPurchasing/Bin/Security/live.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 9dc8e7589c2d8425d8eaa71ddef59033
+folderAsset: yes
+timeCreated: 1500743951
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/UnityPurchasing/UnityIAP.unitypackage.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 00074c1c02ec64cdd831187c085efe75
+timeCreated: 1477083777
+licenseType: Store
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/iOS/UnityAdsUnityWrapper.mm.meta

@@ -2,6 +2,18 @@ fileFormatVersion: 2
 guid: ecb70c48014d7481b9e8cd2adc66074b
 PluginImporter:
   serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
   platformData:
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
     iOS:
       enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/script.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f00b68a7f68dd6441b105a6168d77e57
+folderAsset: yes
+timeCreated: 1500621551
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: