Browse Source

升级到2017

liuqilin 7 years ago
parent
commit
ab6df345e6
74 changed files with 940 additions and 416 deletions
  1. 8 8
      Assets/AtlasUtility/Script/Editor/AtlasUtilityWindow.cs
  2. 1 1
      Assets/AtlasUtility/Script/Editor/Reference/AssetBundleManager.cs
  3. 4 2
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReference.cs
  4. 2 2
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceManager.cs
  5. 3 1
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferencePair.cs
  6. 1 1
      Assets/AtlasUtility/Script/Editor/Reference/PackingTagManager.cs
  7. 1 1
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceSet.cs
  8. 1 1
      Assets/AtlasUtility/Script/Editor/Reference/ReferenceManager.cs
  9. 4 2
      Assets/AtlasUtility/Script/Extension/ExPath.cs
  10. 24 1
      Assets/Plugins/Android/libs/dagger.jar.meta
  11. 24 1
      Assets/Plugins/Android/libs/eventbus-2.4.0.jar.meta
  12. 24 1
      Assets/Plugins/Android/libs/javax.inject.jar.meta
  13. 24 1
      Assets/Plugins/Android/libs/json-simple-1.1.1.jar.meta
  14. 24 1
      Assets/Plugins/Android/libs/rxjava-core-0.20.7.jar.meta
  15. 2 1
      Assets/Plugins/Android/res/values-zh-rTW/strings.xml.meta
  16. 2 1
      Assets/Plugins/Android/res/values-zh-rTW/styles.xml.meta
  17. 1 1
      Assets/Plugins/UnityChannel/XiaomiSupport/Editor/AppStoreOnboardApi.cs
  18. 12 5
      Assets/Plugins/UnityPurchasing/Bin/Facebook/live/FacebookStore.dll.meta
  19. BIN
      Assets/Plugins/UnityPurchasing/Bin/Stores.dll
  20. 51 10
      Assets/Resource/Logo.unity
  21. BIN
      Assets/Resource/Plugins/ConsolePro/Editor/ConsolePro.Editor.dll
  22. 33 86
      Assets/Resource/Shader/MaskMat.mat
  23. 10 2
      Assets/Resource/Sprite/Editor/PlazaRoom/派对图标1.png.meta
  24. 10 2
      Assets/Resource/Sprite/Editor/PlazaRoom/派对图标2.png.meta
  25. 10 2
      Assets/Resource/Sprite/Editor/SpriteUI/wifi_lost.png.meta
  26. 10 2
      Assets/Resource/Sprite/Editor/SpriteUI/wifi_ok.png.meta
  27. 1 1
      Assets/Script/AssetBundleUtility/AssetBundleGroup.cs
  28. 3 3
      Assets/Script/AssetBundleUtility/AssetBundleUtility.cs
  29. 1 1
      Assets/Script/AssetBundleUtility/Editor/InstanceUtility.cs
  30. 5 3
      Assets/Script/AssetBundleUtility/Extensions/PathExtension.cs
  31. 2 2
      Assets/Script/Editor/EditorAuxiliary.cs
  32. 12 11
      Assets/Script/Editor/EditorBundle.cs
  33. 10 10
      Assets/Script/Editor/EditorPlayerBuilder.cs
  34. 2 1
      Assets/Script/Label/LanguageLabel.cs
  35. 13 13
      Assets/Script/Manage/ConfigManager.cs
  36. 3 2
      Assets/Script/Manage/EnterMinigamePanelManager.cs
  37. 1 1
      Assets/Script/Manage/GardenManager.cs
  38. 9 9
      Assets/Script/Manage/HttpManager.cs
  39. 1 1
      Assets/Script/Manage/Initializer.cs
  40. 3 3
      Assets/Script/Manage/MiniGameManager.cs
  41. 7 7
      Assets/Script/Manage/RechargeGiftManager.cs
  42. 5 5
      Assets/Script/Manage/TutorialManager.cs
  43. 7 7
      Assets/Script/Manage/UIManager.cs
  44. 3 1
      Assets/Script/Object/DropDiamond.cs
  45. 3 1
      Assets/Script/Object/DropGold.cs
  46. 2 2
      Assets/Script/Object/Flower.cs
  47. 6 6
      Assets/Script/Object/Player.cs
  48. 1 1
      Assets/Script/Object/PlazaRoomChest.cs
  49. 5 4
      Assets/Script/SFS/CSharpExtension/DataParse.cs
  50. 1 1
      Assets/Script/SFS/Manager/ChestManager.cs
  51. 2 2
      Assets/Script/SFS/Manager/PlazaRoomController.cs
  52. 3 3
      Assets/Script/Social/FriendPanel.cs
  53. 1 0
      Assets/Script/Tool/Auxiliary.cs
  54. 10 10
      Assets/Script/Tool/Bundle.cs
  55. 2 1
      Assets/Script/Tool/Test.cs
  56. 6 4
      Assets/Tookits/DeleteUtility/DeleteUtility.cs
  57. 5 3
      Assets/Tookits/DeleteUtility/ExPath.cs
  58. 1 1
      Assets/Tookits/LabelUtility/Editor/InstanceUtility.cs
  59. 1 1
      Assets/Tookits/LabelUtility/Editor/LabelSetDrawer.cs
  60. 4 2
      Assets/Tookits/LabelUtility/ExPath.cs
  61. 28 28
      Assets/Tookits/LabelUtility/LabelUtility.cs
  62. 60 18
      Assets/UnityAds/UnityEngine.Advertisements.Android.dll.meta
  63. BIN
      Assets/UnityAds/UnityEngine.Advertisements.Editor.dll
  64. 60 18
      Assets/UnityAds/UnityEngine.Advertisements.Editor.dll.meta
  65. 99 36
      Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll.meta
  66. 59 17
      Assets/UnityAds/UnityEngine.Advertisements.iOS.dll.meta
  67. 2 0
      Garden5_2017.csproj.DotSettings
  68. 2 0
      ProjectSettings/DynamicsManager.asset
  69. 11 12
      ProjectSettings/GraphicsSettings.asset
  70. 5 2
      ProjectSettings/Physics2DSettings.asset
  71. 174 24
      ProjectSettings/ProjectSettings.asset
  72. 1 1
      ProjectSettings/ProjectVersion.txt
  73. 8 1
      ProjectSettings/UnityConnectSettings.asset
  74. 4 0
      UnityPackageManager/manifest.json

+ 8 - 8
Assets/AtlasUtility/Script/Editor/AtlasUtilityWindow.cs

@@ -116,7 +116,7 @@ namespace AtlasUtility
 
                 if (RawWidth < originWidth || RawHeight < originHeight)
                 {
-                    Debug.LogWarning($"注意 {texture2D.name} 将被缩小");
+                    Debug.LogWarning(string.Format("注意 {0} 将被缩小", texture2D.name));
                 }
 
                 if (!textureImporter.isReadable)
@@ -461,7 +461,7 @@ namespace AtlasUtility
                     }
                 }
 
-                string path = index == 0 ? parameter.Path + ".png" : $"{parameter.Path} ({index}).png";
+                string path = index == 0 ? parameter.Path + ".png" : string.Format("{0} ({1}).png", parameter.Path, index);
 
                 if (File.Exists(path))
                 {
@@ -639,7 +639,7 @@ namespace AtlasUtility
                 textureInfoList = FillBox(parameter, box, textureInfoList, atlasList);
             }
             
-            if (EditorUtility.DisplayDialog("打包", $"将新建{atlasList.Count}张图集", "继续", "取消"))
+            if (EditorUtility.DisplayDialog("打包", string.Format("将新建{0}张图集", atlasList.Count), "继续", "取消"))
             {
                 for (int i = 0; i < atlasList.Count; i++)
                 {
@@ -706,7 +706,7 @@ namespace AtlasUtility
                 {
                     if (Instance.TextureList[i].name == Instance.TextureList[j].name)
                     {
-                        throw new Exception($"Sprite名字重复 {Instance.TextureList[i].name}");
+                        throw new Exception(string.Format("Sprite名字重复 {0}", Instance.TextureList[i].name));
                     }
                 }
             }
@@ -981,7 +981,7 @@ namespace AtlasUtility
 
             for (int i = 0; i < textureInfoList.Count; i++)
             {
-                stringBuilder.AppendLine($"Width:{textureInfoList[i].Width} Height:{textureInfoList[i].Height} Pivot:{textureInfoList[i].Pivot} Border:{textureInfoList[i].Border}");
+                stringBuilder.AppendLine(string.Format("Width:{0} Height:{1} Pivot:{2} Border:{3}", textureInfoList[i].Width, textureInfoList[i].Height, textureInfoList[i].Pivot, textureInfoList[i].Border));
             }
             
             StreamWriter streamWriter = new StreamWriter(parameter.Path);
@@ -1031,7 +1031,7 @@ namespace AtlasUtility
             {
                 SpriteMetaData metaData = textureImporter.spritesheet[k];
 
-                EditorUtility.DisplayProgressBar("切图", $"新建 {metaData.name}", (k + 1)/(float) textureImporter.spritesheet.Length);
+                EditorUtility.DisplayProgressBar("切图", string.Format("新建 {0}", metaData.name), (k + 1)/(float) textureImporter.spritesheet.Length);
 
                 int width = (int)metaData.rect.width + 2 * parameter.Padding;
                 int height = (int)metaData.rect.height + 2 * parameter.Padding;
@@ -1064,7 +1064,7 @@ namespace AtlasUtility
 
                 texture2D.Apply();
 
-                string spritePath = $"{parameter.Path}{metaData.name}.png".GetUnRepeatFileName();
+                string spritePath = string.Format("{0}{1}.png", parameter.Path, metaData.name).GetUnRepeatFileName();
 
                 File.WriteAllBytes(spritePath, texture2D.EncodeToPNG());
 
@@ -1157,7 +1157,7 @@ namespace AtlasUtility
         {
             if (File.Exists(path))
             {
-                Debug.LogError($"{path} 存在同名文件");
+                Debug.LogError(string.Format("{0} 存在同名文件", path));
                 return;
             }
 

+ 1 - 1
Assets/AtlasUtility/Script/Editor/Reference/AssetBundleManager.cs

@@ -82,7 +82,7 @@ namespace AtlasUtility
 
             if (!IsSameAssetBundle(pathes, bundleNames, bundleVariants))
             {
-                Debug.LogWarning($"{editorPath} 的不同版本有不同的AssetBundle");
+                Debug.LogWarning(string.Format("{0} 的不同版本有不同的AssetBundle", editorPath));
 
                 return;
             }

+ 4 - 2
Assets/AtlasUtility/Script/Editor/Reference/AtlasReference.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace AtlasUtility
 {
     using UnityEditor;
@@ -20,7 +22,7 @@ namespace AtlasUtility
 
                 TextureImporter textureImporter = (TextureImporter)AssetImporter.GetAtPath(assetPath);
 
-                return $"{assetPath}/{textureImporter.spritesheet[spriteIndex].name}";
+                return string.Format("{0}/{1}", assetPath, textureImporter.spritesheet[spriteIndex].name);
             }
         }
 
@@ -35,7 +37,7 @@ namespace AtlasUtility
 
         public AtlasReference(string fileID, string guid)
         {
-            Content = $"fileID: {fileID}, guid: {guid}";
+            Content = string.Format("fileID: {0}, guid: {1}", fileID, guid);
             GUID = guid;
             FileID = fileID;
         }

+ 2 - 2
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceManager.cs

@@ -46,7 +46,7 @@ namespace AtlasUtility
                 {
                     int index = fromReferenceList.IndexOf(sourceAtlasReference);
 
-                    Debug.LogWarning($"重复的Sprite    {atlasReference.DebugPath}    {toReferenceList[index].DebugPath}");
+                    Debug.LogWarning(string.Format("重复的Sprite    {0}    {1}", atlasReference.DebugPath, toReferenceList[index].DebugPath));
                 }
 
                 fromReferenceList.Add(sourceAtlasReference);
@@ -88,7 +88,7 @@ namespace AtlasUtility
                 {
                     int index = fromReferenceList.IndexOf(sourceAtlasReference);
 
-                    Debug.LogWarning($"重复的Sprite    {atlasReference.DebugPath}    {toReferenceList[index].DebugPath}");
+                    Debug.LogWarning(string.Format("重复的Sprite    {0}    {1}", atlasReference.DebugPath, toReferenceList[index].DebugPath));
                 }
 
                 fromReferenceList.Add(sourceAtlasReference);

+ 3 - 1
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferencePair.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace AtlasUtility
 {
     public class AtlasReferencePair
@@ -19,7 +21,7 @@ namespace AtlasUtility
 
         public AtlasReferencePair(AtlasReference atlasReference, AtlasReference sourceAtlasReference)
         {
-            Content = $"{atlasReference.Content}|{sourceAtlasReference.Content}";
+            Content = string.Format("{0}|{1}", atlasReference.Content, sourceAtlasReference.Content);
             AtlasReference = atlasReference;
             SourceAtlasReference = sourceAtlasReference;
         }

+ 1 - 1
Assets/AtlasUtility/Script/Editor/Reference/PackingTagManager.cs

@@ -81,7 +81,7 @@ namespace AtlasUtility
 
             if (!IsSamePackingTag(pathes, packingTags))
             {
-                Debug.LogWarning($"{editorPath} 的不同版本有不同的PackingTag");
+                Debug.LogWarning(string.Format("{0} 的不同版本有不同的PackingTag", editorPath));
 
                 return;
             }

+ 1 - 1
Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceSet.cs

@@ -17,7 +17,7 @@ namespace AtlasUtility
         }
         public string Content
         {
-            get { return $"{EditorReference.GUID}|{MobileReference.GUID}|{DesktopReference.GUID}"; }
+            get { return string.Format("{0}|{1}|{2}", EditorReference.GUID, MobileReference.GUID, DesktopReference.GUID); }
         }
 
         public Texture2D MobileTexture

+ 1 - 1
Assets/AtlasUtility/Script/Editor/Reference/ReferenceManager.cs

@@ -30,7 +30,7 @@ namespace AtlasUtility
 
                 if (count > 0)
                 {
-                    Debug.LogWarning($"{count}处引用 {pathList[i].GetRelativePath()}");
+                    Debug.LogWarning(string.Format("{0}处引用 {1}", count, pathList[i].GetRelativePath()));
                 }
             }
 

+ 4 - 2
Assets/AtlasUtility/Script/Extension/ExPath.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace AtlasUtility
 {
     using System.IO;
@@ -19,13 +21,13 @@ namespace AtlasUtility
 
             int count = 0;
 
-            string newFileName = $"{directory}/{name}{extension}";
+            string newFileName = string.Format("{0}/{1}{2}", directory, name, extension);
 
             while (File.Exists(newFileName))
             {
                 count++;
 
-                newFileName = $"{directory}/{name} ({count}){extension}";
+                newFileName = string.Format("{0}/{1} ({2}){3}", directory, name, count, extension);
             }
 
             return newFileName;

+ 24 - 1
Assets/Plugins/Android/libs/dagger.jar.meta

@@ -1,6 +1,29 @@
 fileFormatVersion: 2
 guid: 2a510e5852b194a86bd96ed74e4a7480
-DefaultImporter:
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 24 - 1
Assets/Plugins/Android/libs/eventbus-2.4.0.jar.meta

@@ -1,6 +1,29 @@
 fileFormatVersion: 2
 guid: 296b291ff7c4442fdbfab7f86b9cd672
-DefaultImporter:
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 24 - 1
Assets/Plugins/Android/libs/javax.inject.jar.meta

@@ -1,6 +1,29 @@
 fileFormatVersion: 2
 guid: 3204f64de9e914717806406314ce451d
-DefaultImporter:
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 24 - 1
Assets/Plugins/Android/libs/json-simple-1.1.1.jar.meta

@@ -1,6 +1,29 @@
 fileFormatVersion: 2
 guid: c465fb6f5aa694b50a1d5b2723dcb786
-DefaultImporter:
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 24 - 1
Assets/Plugins/Android/libs/rxjava-core-0.20.7.jar.meta

@@ -1,6 +1,29 @@
 fileFormatVersion: 2
 guid: de7c43fae25164f81a42c914d2b904ae
-DefaultImporter:
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 2 - 1
Assets/Plugins/Android/res/values-zh-rTW/strings.xml.meta

@@ -1,8 +1,9 @@
 fileFormatVersion: 2
-guid: c703ca4c82f9f174e8fb58c90579f102
+guid: 3315c8d84c99e074a8cc3f3ac6f9e349
 timeCreated: 1500960752
 licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 2 - 1
Assets/Plugins/Android/res/values-zh-rTW/styles.xml.meta

@@ -1,8 +1,9 @@
 fileFormatVersion: 2
-guid: 46e9ba2d27e5006448e64ceb922accf1
+guid: 6636ee8e27df36243a20ef5439d7835a
 timeCreated: 1500960752
 licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Plugins/UnityChannel/XiaomiSupport/Editor/AppStoreOnboardApi.cs

@@ -43,7 +43,7 @@ namespace AppStoresSupport
 			if (token != null) {
 				request.SetRequestHeader ("Authorization", "Bearer " + token);
 			}
-			request.Send ();
+		    request.SendWebRequest();
 			return request;
 		}
 

+ 12 - 5
Assets/Plugins/UnityPurchasing/Bin/Facebook/live/FacebookStore.dll.meta

@@ -1,22 +1,29 @@
 fileFormatVersion: 2
 guid: 97e43e86f5dfe4cb4a0eeee600af6b43
-timeCreated: 1513086172
+timeCreated: 1523932893
 licenseType: Pro
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    Any:
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    WindowsStoreApps:
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU

BIN
Assets/Plugins/UnityPurchasing/Bin/Stores.dll


+ 51 - 10
Assets/Resource/Logo.unity

@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 8
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
   m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_AmbientIntensity: 1
   m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
   m_SkyboxMaterial: {fileID: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
 --- !u!157 &4
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 11
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 4
+    serializedVersion: 9
     m_Resolution: 1
     m_BakeResolution: 50
     m_TextureWidth: 1024
@@ -66,13 +67,29 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 0
-    m_DirectLightInLightProbes: 1
     m_FinalGather: 0
     m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
+    m_MixedBakeMode: 1
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVRFilteringMode: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
   m_LightingDataAsset: {fileID: 0}
-  m_RuntimeCPUUsage: 25
+  m_UseShadowmask: 0
 --- !u!196 &5
 NavMeshSettings:
   serializedVersion: 2
@@ -89,7 +106,11 @@ NavMeshSettings:
     minRegionArea: 2
     manualCellSize: 0
     cellSize: 0.16666666
+    manualTileSize: 0
+    tileSize: 256
     accuratePlacement: 0
+    debug:
+      m_Flags: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1 &465425181
 GameObject:
@@ -129,6 +150,7 @@ SpriteRenderer:
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -144,17 +166,25 @@ SpriteRenderer:
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
   m_SelectedEditorRenderState: 0
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: e4b9c6a4105e96345a144d5439198512, type: 3}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
 --- !u!1 &722194761
 GameObject:
   m_ObjectHideFlags: 0
@@ -291,7 +321,7 @@ Canvas:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 841147520}
   m_Enabled: 1
-  serializedVersion: 2
+  serializedVersion: 3
   m_RenderMode: 0
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
@@ -300,6 +330,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -310,8 +341,8 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 841147520}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 488.5, y: 275, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 722194762}
   m_Father: {fileID: 0}
@@ -392,10 +423,11 @@ Camera:
   m_TargetDisplay: 0
   m_TargetEye: 3
   m_HDR: 0
+  m_AllowMSAA: 1
+  m_ForceIntoRT: 0
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!4 &1218118082
 Transform:
   m_ObjectHideFlags: 0
@@ -454,6 +486,7 @@ SpriteRenderer:
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -469,17 +502,25 @@ SpriteRenderer:
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
   m_SelectedEditorRenderState: 0
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: e7385bf81916ffd438b73826f587c7df, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
 --- !u!4 &1511433819
 Transform:
   m_ObjectHideFlags: 0
@@ -614,7 +655,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   AuditEdition: 0
   DebugMode: 0
-  CatchException: 1
+  CatchException: 0
   DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:

BIN
Assets/Resource/Plugins/ConsolePro/Editor/ConsolePro.Editor.dll


+ 33 - 86
Assets/Resource/Shader/MaskMat.mat

@@ -8,123 +8,70 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: MaskMat
   m_Shader: {fileID: 4800000, guid: 31909e78665c0ad4d9b29dabc53c63fd, type: 3}
-  m_ShaderKeywords: _EMISSION
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _EMISSION
   m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
     m_TexEnvs:
-    - first:
-        name: _BumpMap
-      second:
+    - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailAlbedoMap
-      second:
+    - _DetailAlbedoMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailMask
-      second:
+    - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _DetailNormalMap
-      second:
+    - _DetailNormalMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _EmissionMap
-      second:
+    - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _MainTex
-      second:
+    - _MainTex:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _MetallicGlossMap
-      second:
+    - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _OcclusionMap
-      second:
+    - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - first:
-        name: _ParallaxMap
-      second:
+    - _ParallaxMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - first:
-        name: PixelSnap
-      second: 0
-    - first:
-        name: _BumpScale
-      second: 1
-    - first:
-        name: _Cutoff
-      second: 0.5
-    - first:
-        name: _DetailNormalMapScale
-      second: 1
-    - first:
-        name: _DstBlend
-      second: 0
-    - first:
-        name: _GlossMapScale
-      second: 1
-    - first:
-        name: _Glossiness
-      second: 0.5
-    - first:
-        name: _GlossyReflections
-      second: 1
-    - first:
-        name: _Metallic
-      second: 0
-    - first:
-        name: _Mode
-      second: 0
-    - first:
-        name: _OcclusionStrength
-      second: 1
-    - first:
-        name: _Parallax
-      second: 0.02
-    - first:
-        name: _SmoothnessTextureChannel
-      second: 0
-    - first:
-        name: _SpecularHighlights
-      second: 1
-    - first:
-        name: _SrcBlend
-      second: 1
-    - first:
-        name: _UVSec
-      second: 0
-    - first:
-        name: _ZWrite
-      second: 1
+    - PixelSnap: 0
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
     m_Colors:
-    - first:
-        name: _Color
-      second: {r: 1, g: 1, b: 1, a: 1}
-    - first:
-        name: _EmissionColor
-      second: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 10 - 2
Assets/Resource/Sprite/Editor/PlazaRoom/派对图标1.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1511918669
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -62,7 +69,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 10 - 2
Assets/Resource/Sprite/Editor/PlazaRoom/派对图标2.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1511918669
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -62,7 +69,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 10 - 2
Assets/Resource/Sprite/Editor/SpriteUI/wifi_lost.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1511772865
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -62,7 +69,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 10 - 2
Assets/Resource/Sprite/Editor/SpriteUI/wifi_ok.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1511772866
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -62,7 +69,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Script/AssetBundleUtility/AssetBundleGroup.cs

@@ -67,7 +67,7 @@ namespace assetBundleUtility
 	            throw new Exception("文件名包含无效字符");
 	        }
 	
-	        return $"{path}{Path.DirectorySeparatorChar}{name}";
+	        return string.Format("{0}{1}{2}", path, Path.DirectorySeparatorChar, name);
 	    }
 	}
 #endif

+ 3 - 3
Assets/Script/AssetBundleUtility/AssetBundleUtility.cs

@@ -55,10 +55,10 @@ namespace assetBundleUtility
             StringBuilder stringBuilder = new StringBuilder();
             for (int i = 0; i < assetBundleSets.Count; i++)
             {
-                stringBuilder.Append($"{assetBundleSets[i].Name}|{assetBundleSets[i].MD5}");
+                stringBuilder.Append(string.Format("{0}|{1}", assetBundleSets[i].Name, assetBundleSets[i].MD5));
                 if (includeURL)
                 {
-                    stringBuilder.Append($"|{assetBundleSets[i].URL}");
+                    stringBuilder.Append(string.Format("|{0}", assetBundleSets[i].URL));
                 }
                 if (i < assetBundleSets.Count - 1)
                 {
@@ -158,7 +158,7 @@ namespace assetBundleUtility
                 }
                 if (missingFlag)
                 {
-                    serverAssetBundleSet.PersistentPath = $"{persistentFolder}{Path.DirectorySeparatorChar}{serverAssetBundleSet.Name}";
+                    serverAssetBundleSet.PersistentPath = string.Format("{0}{1}{2}", persistentFolder, Path.DirectorySeparatorChar, serverAssetBundleSet.Name);
                     staleAssetBundleSets.Add(serverAssetBundleSet);
                 }
             }

+ 1 - 1
Assets/Script/AssetBundleUtility/Editor/InstanceUtility.cs

@@ -54,7 +54,7 @@ namespace assetBundleUtility
 	                return relativeObject;
 	            }
 	
-	            throw new Exception($"{FieldName} {IsEnumerable} {EnumerableIndex}");
+	            throw new Exception(string.Format("{0} {1} {2}", FieldName, IsEnumerable, EnumerableIndex));
 	        }
 	    }
 	

+ 5 - 3
Assets/Script/AssetBundleUtility/Extensions/PathExtension.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace assetBundleUtility
 {
 
@@ -30,10 +32,10 @@ namespace assetBundleUtility
 	        string directory = Path.GetDirectoryName(fileName);
 	        string name = Path.GetFileNameWithoutExtension(fileName);
 	        int count = 1;
-	        string newFileName = $"{directory}{Path.DirectorySeparatorChar}{name}{extension}";
+	        string newFileName = string.Format("{0}{1}{2}{3}", directory, Path.DirectorySeparatorChar, name, extension);
 	        while (File.Exists(newFileName))
 	        {
-	            newFileName = $"{directory}{Path.DirectorySeparatorChar}{name} ({count++}){extension}";
+	            newFileName = string.Format("{0}{1}{2} ({3}){4}", directory, Path.DirectorySeparatorChar, name, count++, extension);
 	        }
 	        return newFileName;
 	    }
@@ -44,7 +46,7 @@ namespace assetBundleUtility
 	        string newDirectoryName = directoryName;
 	        while (Directory.Exists(newDirectoryName))
 	        {
-	            newDirectoryName = $"{directoryName} ({count++})";
+	            newDirectoryName = string.Format("{0} ({1})", directoryName, count++);
 	        }
 	        return newDirectoryName;
 	    }

+ 2 - 2
Assets/Script/Editor/EditorAuxiliary.cs

@@ -39,8 +39,8 @@ public class EditorAuxiliary : Editor
             string projectName = match.Value.Replace("\"name\":\"", "").Replace("\"", "");
             foreach (var sprite in Script.Sprites)
             {
-                string content = $"{{ \"imagePath\":\"{sprite.name}.png\",\"SubTexture\":[{{\"width\":{sprite.rect.width},\"y\":0,\"height\":{sprite.rect.height},\"name\":\"{sprite.name}\",\"x\":0}}],\"name\":\"{projectName}\"}}";
-                File.WriteAllText($"{Application.dataPath}/Resource/Sprite/Editor/Dress/{sprite.name}_tex.json", content);
+                string content = string.Format("{{ \"imagePath\":\"{0}.png\",\"SubTexture\":[{{\"width\":{1},\"y\":0,\"height\":{2},\"name\":\"{3}\",\"x\":0}}],\"name\":\"{4}\"}}", sprite.name, sprite.rect.width, sprite.rect.height, sprite.name, projectName);
+                File.WriteAllText(string.Format("{0}/Resource/Sprite/Editor/Dress/{1}_tex.json", Application.dataPath, sprite.name), content);
             }
             AssetDatabase.Refresh();
         }

+ 12 - 11
Assets/Script/Editor/EditorBundle.cs

@@ -1,3 +1,4 @@
+using System;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Events;
@@ -178,21 +179,21 @@ public class EditorBundle : Editor
         };
         foreach (var name in names)
         {
-            File.Delete($"{prefix}/HotUpdate/{name}");
-            File.Delete($"{prefix}/HotUpdate/{name}.meta");
-            File.Delete($"{prefix}/HotUpdate/{name}.manifest");
-            File.Delete($"{prefix}/HotUpdate/{name}.manifest.meta");
+            File.Delete(string.Format("{0}/HotUpdate/{1}", prefix, name));
+            File.Delete(string.Format("{0}/HotUpdate/{1}.meta", prefix, name));
+            File.Delete(string.Format("{0}/HotUpdate/{1}.manifest", prefix, name));
+            File.Delete(string.Format("{0}/HotUpdate/{1}.manifest.meta", prefix, name));
 
-            File.Move($"{prefix}/{name}", $"{prefix}/HotUpdate/{name}");
-            File.Move($"{prefix}/{name}.manifest", $"{prefix}/HotUpdate/{name}.manifest");
+            File.Move(string.Format("{0}/{1}", prefix, name), string.Format("{0}/HotUpdate/{1}", prefix, name));
+            File.Move(string.Format("{0}/{1}.manifest", prefix, name), string.Format("{0}/HotUpdate/{1}.manifest", prefix, name));
 
-            if (File.Exists($"{prefix}/{name}.meta"))
+            if (File.Exists(string.Format("{0}/{1}.meta", prefix, name)))
             {
-                File.Move($"{prefix}/{name}.meta", $"{prefix}/HotUpdate/{name}.meta");
+                File.Move(string.Format("{0}/{1}.meta", prefix, name), string.Format("{0}/HotUpdate/{1}.meta", prefix, name));
             }
-            if (File.Exists($"{prefix}/{name}.manifest.meta"))
+            if (File.Exists(string.Format("{0}/{1}.manifest.meta", prefix, name)))
             {
-                File.Move($"{prefix}/{name}.manifest.meta", $"{prefix}/HotUpdate/{name}.manifest.meta");
+                File.Move(string.Format("{0}/{1}.manifest.meta", prefix, name), string.Format("{0}/HotUpdate/{1}.manifest.meta", prefix, name));
             }
         }
         string hotUpdateFolder = null;
@@ -212,7 +213,7 @@ public class EditorBundle : Editor
         {
             foreach (var name in names)
             {
-                byte[] bytes = File.ReadAllBytes($"{prefix}/HotUpdate/{name}");
+                byte[] bytes = File.ReadAllBytes(string.Format("{0}/HotUpdate/{1}", prefix, name));
                 File.WriteAllBytes(hotUpdateFolder + "/" + name + Bundle.version, bytes);
             }
         }

+ 10 - 10
Assets/Script/Editor/EditorPlayerBuilder.cs

@@ -13,12 +13,12 @@ public class BuildForAllPlatforms : EditorWindow
 	private static string version = "1.0.0";
 	private static string gameName = "MyLovelyGarden";
 	private static string companyName = "DashGame Technology Inc.";
-	private static ApiCompatibilityLevel apiCompatLevel = ApiCompatibilityLevel.NET_2_0;
+	//private static ApiCompatibilityLevel apiCompatLevel = ApiCompatibilityLevel.NET_2_0;
 
 	//string path = EditorUtility.SaveFolderPanel("Choose Location of Built Game", "", "");
 	static string path = "build";
 	// iOS
-	private static string iOSBundleIdentifier = "com.dashgame.garden";
+	//private static string iOSBundleIdentifier = "com.dashgame.garden";
 	private static iOSTargetDevice iOSTargetDev = iOSTargetDevice.iPhoneOnly;
 	//private static iOSTargetOSVersion iOSTargetVer = iOSTargetOSVersion.iOS_8_0;
 
@@ -93,8 +93,8 @@ public class BuildForAllPlatforms : EditorWindow
 
 		// Setup settings shared between Android and iOS
 		// PlayerSettings.bundleVersion = Version;
-		PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
-		PlayerSettings.companyName = companyName;
+		//PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
+        PlayerSettings.companyName = companyName;
 		PlayerSettings.productName = gameName;
 
 		// Build osx64 player
@@ -118,10 +118,10 @@ public class BuildForAllPlatforms : EditorWindow
 
 		// Setup settings shared between Android and iOS
 		// PlayerSettings.bundleVersion = Version;
-		PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
+		//PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
 
 		// Setup settings for iOS player
-		PlayerSettings.iPhoneBundleIdentifier = iOSBundleIdentifier;
+		//PlayerSettings.iPhoneBundleIdentifier = iOSBundleIdentifier;
 		PlayerSettings.iOS.targetDevice = iOSTargetDev;
 		//PlayerSettings.iOS.targetOSVersion = iOSTargetVer;
 		PlayerSettings.iOS.allowHTTPDownload = true;
@@ -150,10 +150,10 @@ public class BuildForAllPlatforms : EditorWindow
 
 		// Setup settings shared between Android and iOS
 		// PlayerSettings.bundleVersion = Version;
-		PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
+		//PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
 
 		// Setup settings for iOS player
-		PlayerSettings.iPhoneBundleIdentifier = iOSBundleIdentifier;
+		//PlayerSettings.iPhoneBundleIdentifier = iOSBundleIdentifier;
 		PlayerSettings.iOS.targetDevice = iOSTargetDev;
 		//PlayerSettings.iOS.targetOSVersion = iOSTargetVer;
 		PlayerSettings.iOS.allowHTTPDownload = true;
@@ -183,13 +183,13 @@ public class BuildForAllPlatforms : EditorWindow
 		// Setup settings shared between Android and iOS
 		// PlayerSettings.bundleVersion = version;
 		// PlayerSettings.Android.bundleVersionCode =  versionCode;
-		PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
+		//PlayerSettings.apiCompatibilityLevel = apiCompatLevel;
 
 		// Setup settings for Android player
 		// PlayerSettings.Android.bundleVersionCode = VersionCode;
 		PlayerSettings.Android.minSdkVersion = androidMinSdk;
 		PlayerSettings.Android.androidIsGame = true;
-		PlayerSettings.bundleIdentifier = androidBundleIdentifier;
+		PlayerSettings.applicationIdentifier = androidBundleIdentifier;
 		PlayerSettings.Android.targetDevice = AndroidTargetDevice.ARMv7;
 
 		PlayerSettings.strippingLevel = StrippingLevel.Disabled;

+ 2 - 1
Assets/Script/Label/LanguageLabel.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -13,7 +14,7 @@ public class LanguageLabel
 
     public static string CombineLanguageLabel(string page, string id)
     {
-        return $"{page}{LanguagePageSeperator}{id}";
+        return string.Format("{0}{1}{2}", page, LanguagePageSeperator, id);
     }
 
     public static string UI__AJ_Title = "UI__AJ_Title";

+ 13 - 13
Assets/Script/Manage/ConfigManager.cs

@@ -1809,7 +1809,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 18.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1822,7 +1822,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 19.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1845,7 +1845,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 21.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1858,7 +1858,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 22.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1871,7 +1871,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 23.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1884,7 +1884,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 24.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1916,7 +1916,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 27.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1929,7 +1929,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 28.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1942,7 +1942,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 29.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1955,7 +1955,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 30.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1968,7 +1968,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 31.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1981,7 +1981,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 32.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);
@@ -1994,7 +1994,7 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 33.ToString();
 
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (Directory.Exists(persistentFolderPath))
         {
             Directory.Delete(persistentFolderPath, true);

+ 3 - 2
Assets/Script/Manage/EnterMinigamePanelManager.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Xml;
 using UnityEngine;
@@ -144,7 +145,7 @@ public class EnterMinigamePanelManager : Regist
         MinigameTypeText0.text = Language.GetStr(languageLabel);
         MinigameTypeText1.text = Language.GetStr(languageLabel);
         ChangeGameTypeCost = Auxiliary.FmlParse(ChangeGameTypeCostFormula, "i", Manager.CircleIncome.ToString());
-        CostText.text = $"{TransferLabel.CoinSprite}{Auxiliary.ShrinkBigNumberStr(ChangeGameTypeCost)}";
+        CostText.text = string.Format("{0}{1}", TransferLabel.CoinSprite, Auxiliary.ShrinkBigNumberStr(ChangeGameTypeCost));
         PanelMask.TweenForCG();
     }
 

+ 1 - 1
Assets/Script/Manage/GardenManager.cs

@@ -593,7 +593,7 @@ public class GardenManager : Regist
 
                             AudioManager.PlayClip(AudioLabel.GetCurrent);
 
-                            ResourceManager.Get(CanvasLabel.H_Icon1).FindChild($"{CanvasLabel.H_UIFlashLight}/{CanvasLabel.H_UIParticleSystem}").GetComponent<UIPartical>().Begin();
+                            ResourceManager.Get(CanvasLabel.H_Icon1).Find(string.Format("{0}/{1}", CanvasLabel.H_UIFlashLight, CanvasLabel.H_UIParticleSystem)).GetComponent<UIPartical>().Begin();
                         },
                         StaticsManager.ItemID.解锁花朵,
                         StaticsManager.ConsumeModule.Shop,

+ 9 - 9
Assets/Script/Manage/HttpManager.cs

@@ -880,7 +880,7 @@ public class HttpManager : Regist
 
     public static void GetMailReward(MailReward mailReward)
     {
-        ConfigManager.SaveStringToConfig(PlayerConfigLabel.OneTimeReward, $"{ConfigManager.GetStringFormConfig(PlayerConfigLabel.OneTimeReward)} {mailReward.ID}".Trim(' '));
+        ConfigManager.SaveStringToConfig(PlayerConfigLabel.OneTimeReward, string.Format("{0} {1}", ConfigManager.GetStringFormConfig(PlayerConfigLabel.OneTimeReward), mailReward.ID).Trim(' '));
 
         Transform mailItem = ResourceManager.Get(ResourceLabel.MailItem, Folder.UI, false, ResourceManager.Get(CanvasLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
         Dictionary<string, Transform> childDictionary = new Dictionary<string, Transform>();
@@ -903,7 +903,7 @@ public class HttpManager : Regist
         {
             SkillRoot skillRoot;
 
-            if (Manager.SkillDictionary.TryGetValue($"{SkillConfigLabel.Pack}{mailReward.Value}", out skillRoot))
+            if (Manager.SkillDictionary.TryGetValue(string.Format("{0}{1}", SkillConfigLabel.Pack, mailReward.Value), out skillRoot))
             {
                 Pack pack = (Pack) skillRoot;
 
@@ -918,11 +918,11 @@ public class HttpManager : Regist
                 Icon1.transform.localPosition = new Vector2(0, 0);
                 lab.GetComponent<Text>().text = pack.Name;
 
-                InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Display(string.Format("{0} {1}{2}", Language.GetStr(LanguageLabel.Common__Get), TransferLabel.PackSprite, pack.Name), 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
             }
             else
             {
-                Debug.LogWarning($"Unknown id {mailReward.Value}");
+                Debug.LogWarning(string.Format("Unknown id {0}", mailReward.Value));
             }
         }
         else if (mailReward.Key == "close")
@@ -946,11 +946,11 @@ public class HttpManager : Regist
                     closeItem.SetupUI(newSpriteSize, new Vector2(), Icon1, Icon3, Icon2);
                     lab.text = closeItem.Name;
 
-                    InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Display(string.Format("{0} {1}{2}", Language.GetStr(LanguageLabel.Common__Get), TransferLabel.CloseSprite, closeItem.Name), 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
                 }
                 else
                 {
-                    Debug.LogWarning($"Unknown id {idList[i]}");
+                    Debug.LogWarning(string.Format("Unknown id {0}", idList[i]));
                 }
             }
         }
@@ -981,7 +981,7 @@ public class HttpManager : Regist
                     Icon1.transform.localPosition = new Vector2(0, 0);
                     lab.text = flowerInfo.Name;
 
-                    InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Display(string.Format("{0} {1}{2}", Language.GetStr(LanguageLabel.Common__Get), TransferLabel.FlowerSprite, flowerInfo.Name), 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
                 //}
                 //else
                 //{
@@ -1002,7 +1002,7 @@ public class HttpManager : Regist
             Icon1.transform.localPosition = new Vector2(0, 0);
             lab.text = Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display(string.Format("{0} {1}{2}", Language.GetStr(LanguageLabel.Common__Get), TransferLabel.CoinSprite, Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value))), 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
@@ -1016,7 +1016,7 @@ public class HttpManager : Regist
             Icon1.transform.localPosition = new Vector2(0, 0);
             lab.text = Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display(string.Format("{0} {1}{2}", Language.GetStr(LanguageLabel.Common__Get), TransferLabel.DiamondSprite, Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value))), 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else
         {

+ 1 - 1
Assets/Script/Manage/Initializer.cs

@@ -40,7 +40,7 @@ public class Initializer : MonoBehaviour
     {
         if (!Application.isEditor)
         {
-            Debug.logger.logEnabled = false;
+            Debug.unityLogger.logEnabled = false;
         }
 
         if (CatchException)

+ 3 - 3
Assets/Script/Manage/MiniGameManager.cs

@@ -1438,7 +1438,7 @@ public class MiniGameManager : Regist
         {
             Flower flower = MinigameIdleFlowerList.Find(tempFlower => { return tempFlower.ID == id; });
 
-            ResourceManager.GetHudText($"+{FindSoloCorrectScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
+            ResourceManager.GetHudText(string.Format("+{0}", FindSoloCorrectScore), Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
             Score += FindSoloCorrectScore;
 
@@ -1485,7 +1485,7 @@ public class MiniGameManager : Regist
 
             Flower flower = MinigameFlowerDictionary[slotIndex];
 
-            ResourceManager.GetHudText($"+{MemoryCorrectScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
+            ResourceManager.GetHudText(string.Format("+{0}", MemoryCorrectScore), Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
             Score += MemoryCorrectScore;
 
@@ -2297,7 +2297,7 @@ public class MiniGameManager : Regist
             return;
         }
 
-        ResourceManager.GetHudText($"+{FindMissingCorrectScore}", Color.white, 90, FindMissingCorrectFlower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
+        ResourceManager.GetHudText(string.Format("+{0}", FindMissingCorrectScore), Color.white, 90, FindMissingCorrectFlower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
         Score += FindSoloCorrectScore;
 

+ 7 - 7
Assets/Script/Manage/RechargeGiftManager.cs

@@ -66,7 +66,7 @@ public class RechargeGift
                 }
                 giftAwardInfo.Key = type;
                 giftAwardInfo.Value = value;
-                Debug.LogWarning($"{giftAwardInfo.Key} {giftAwardInfo.Value}");
+                Debug.LogWarning(string.Format("{0} {1}", giftAwardInfo.Key, giftAwardInfo.Value));
             }
             else if (type == GiftType.服装)
             {
@@ -84,7 +84,7 @@ public class RechargeGift
                     giftAwardInfo.Key = type;
                     giftAwardInfo.Value = value;
                 }
-                Debug.LogWarning($"{giftAwardInfo.Key} {giftAwardInfo.Value}");
+                Debug.LogWarning(string.Format("{0} {1}", giftAwardInfo.Key, giftAwardInfo.Value));
             }
             else if (type == GiftType.礼包)
             {
@@ -92,7 +92,7 @@ public class RechargeGift
                 (Manager.SkillDictionary[packID] as Pack).OnBuySucceed(false);
                 giftAwardInfo.Key = type;
                 giftAwardInfo.Value = value;
-                Debug.LogWarning($"{giftAwardInfo.Key} {giftAwardInfo.Value}");
+                Debug.LogWarning(string.Format("{0} {1}", giftAwardInfo.Key, giftAwardInfo.Value));
             }
             else if (type == GiftType.精灵)
             {
@@ -121,7 +121,7 @@ public class RechargeGift
                 {
                     throw new Exception();
                 }
-                Debug.LogWarning($"{giftAwardInfo.Key} {giftAwardInfo.Value}");
+                Debug.LogWarning(string.Format("{0} {1}", giftAwardInfo.Key, giftAwardInfo.Value));
             }
             else if (type == GiftType.花朵)
             {
@@ -133,7 +133,7 @@ public class RechargeGift
                 flowerInfo.Add();
                 giftAwardInfo.Key = type;
                 giftAwardInfo.Value = value;
-                Debug.LogWarning($"{giftAwardInfo.Key} {giftAwardInfo.Value}");
+                Debug.LogWarning(string.Format("{0} {1}", giftAwardInfo.Key, giftAwardInfo.Value));
             }
             else if (type == GiftType.金币)
             {
@@ -141,7 +141,7 @@ public class RechargeGift
                 Manager.AddCoin(value, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Gift);
                 giftAwardInfo.Key = type;
                 giftAwardInfo.Value = value;
-                Debug.LogWarning($"{giftAwardInfo.Key} {giftAwardInfo.Value}");
+                Debug.LogWarning(string.Format("{0} {1}", giftAwardInfo.Key, giftAwardInfo.Value));
             }
             else if (type == GiftType.钻石)
             {
@@ -149,7 +149,7 @@ public class RechargeGift
                 Manager.AddDiamond(value, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Gift);
                 giftAwardInfo.Key = type;
                 giftAwardInfo.Value = value;
-                Debug.LogWarning($"{giftAwardInfo.Key} {giftAwardInfo.Value}");
+                Debug.LogWarning(string.Format("{0} {1}", giftAwardInfo.Key, giftAwardInfo.Value));
             }
             else
             {

+ 5 - 5
Assets/Script/Manage/TutorialManager.cs

@@ -166,7 +166,7 @@ public class TutorialManager : Regist
 
                 Transform tra = GardenManager.SlotList[0].transform;
 
-                Tutorial.HightScene(0.1f, 0.075f, tra.FindChild(SlotLabel.SlotArrow), tra);
+                Tutorial.HightScene(0.1f, 0.075f, tra.Find(SlotLabel.SlotArrow), tra);
             }
             else if (NewplayerTutorialIndex == 6)
             {
@@ -571,7 +571,7 @@ public class TutorialManager : Regist
 
                 Transform tra = GardenManager.SlotList[0].transform;
 
-                Tutorial.HightScene(0.1f, 0.075f, tra.FindChild(SlotLabel.SlotArrow), tra);
+                Tutorial.HightScene(0.1f, 0.075f, tra.Find(SlotLabel.SlotArrow), tra);
             }
         );
     }
@@ -587,7 +587,7 @@ public class TutorialManager : Regist
             {
                 Transform tra = ResourceManager.Get(CanvasLabel.G_RegularGrid).GetChild(0);
 
-                Tutorial.HightScreen(tra.FindChild(FlowerItemLabel.ArrowPos), tra);
+                Tutorial.HightScreen(tra.Find(FlowerItemLabel.ArrowPos), tra);
             }
         );
 
@@ -697,7 +697,7 @@ public class TutorialManager : Regist
             {
                 Transform tra = Manager.SkillDictionary["Ability1"].SkillItem;
 
-                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.ArrowPosition), tra.FindChild(SkillItemLabel.ArrowDestination), tra.FindChild(SkillItemLabel.Button));
+                Tutorial.HightScreen(tra.Find(SkillItemLabel.ArrowPosition), tra.Find(SkillItemLabel.ArrowDestination), tra.Find(SkillItemLabel.Button));
             }
         );
 
@@ -750,7 +750,7 @@ public class TutorialManager : Regist
             {
                 Transform tra = Manager.SkillDictionary["Skill1"].SkillItem;
 
-                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.ArrowPosition), tra.FindChild(SkillItemLabel.ArrowDestination), tra.FindChild(SkillItemLabel.Button));
+                Tutorial.HightScreen(tra.Find(SkillItemLabel.ArrowPosition), tra.Find(SkillItemLabel.ArrowDestination), tra.Find(SkillItemLabel.Button));
             }
         );
 

+ 7 - 7
Assets/Script/Manage/UIManager.cs

@@ -743,8 +743,8 @@ public class UIManager : Regist
                 ResourceManager.Get(CanvasLabel.Da_DiamondGroup).GetTweenScale().InDestination = true;
 
                 ResourceManager.SetText(CanvasLabel.Da_Tit, Language.GetStr(LanguageLabel.UI__Da_Tit0));
-                ResourceManager.SetText(CanvasLabel.Da_CoinLab, $"{MinigameDisplayCoinAwardRatio*Manager.GardenLevel}+");
-                ResourceManager.SetText(CanvasLabel.Da_DiamondLab, $"{MinigameDisplayDiamondAward}+");
+                ResourceManager.SetText(CanvasLabel.Da_CoinLab, string.Format("{0}+", MinigameDisplayCoinAwardRatio*Manager.GardenLevel));
+                ResourceManager.SetText(CanvasLabel.Da_DiamondLab, string.Format("{0}+", MinigameDisplayDiamondAward));
 
                 ResourceManager.SetActive(CanvasLabel.Da_Lab, true);
                 ResourceManager.SetActive(CanvasLabel.Da_Quit, true);
@@ -1745,7 +1745,7 @@ public class UIManager : Regist
                     {
                         if (i < Manager.ExtraPersonSourceSpritesName.Count)
                         {
-                            stringBuilder.Append($"<({Manager.ExtraPersonSourceSpritesName[i]})>");
+                            stringBuilder.Append(string.Format("<({0})>", Manager.ExtraPersonSourceSpritesName[i]));
                         }
                         if (i < MaxSkillIconForIncomeDetailPanel - 1)
                         {
@@ -1813,7 +1813,7 @@ public class UIManager : Regist
                     {
                         if (i < Manager.ExtraCoinPersonSourceSpritesName.Count)
                         {
-                            stringBuilder.Append($"<({Manager.ExtraCoinPersonSourceSpritesName[i]})>");
+                            stringBuilder.Append(string.Format("<({0})>", Manager.ExtraCoinPersonSourceSpritesName[i]));
                         }
                         if (i < MaxSkillIconForIncomeDetailPanel - 1)
                         {
@@ -2073,8 +2073,8 @@ public class UIManager : Regist
 
         tween.OnBackwardFinish += () =>
         {
-            ResourceManager.Get(CanvasLabel.H_Icon1).FindChild($"{CanvasLabel.H_UIFlashLight}/{CanvasLabel.H_UIFlash}").SetActive(false);
-            ResourceManager.Get(CanvasLabel.H_Icon1).FindChild($"{CanvasLabel.H_UIFlashLight}/{CanvasLabel.H_UIParticleSystem}").SetActive(false);
+            ResourceManager.Get(CanvasLabel.H_Icon1).Find(string.Format("{0}/{1}", CanvasLabel.H_UIFlashLight, CanvasLabel.H_UIFlash)).SetActive(false);
+            ResourceManager.Get(CanvasLabel.H_Icon1).Find(string.Format("{0}/{1}", CanvasLabel.H_UIFlashLight, CanvasLabel.H_UIParticleSystem)).SetActive(false);
 
             if (GardenManager.FlowerCardMaterialTween != null)
                 GardenManager.FlowerCardMaterialTween.Pause();
@@ -3878,7 +3878,7 @@ public class UIManager : Regist
         texture2D.ReadPixels(new Rect(screenPosition.x, screenPosition.y, width, height), 0, 0);
         texture2D.Apply();
 
-        string screenShotPath = $"{Application.persistentDataPath}/MyLovelyGarden.png";
+        string screenShotPath = string.Format("{0}/MyLovelyGarden.png", Application.persistentDataPath);
         File.WriteAllBytes(screenShotPath, texture2D.EncodeToPNG());
 
         IAPManager.Share(screenShotPath, Language.GetStr(LanguageLabel.Common__ScreenShotShareContent));

+ 3 - 1
Assets/Script/Object/DropDiamond.cs

@@ -1,8 +1,10 @@
+using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
 using System.Collections;
 using System.Collections.Generic;
+using Random = UnityEngine.Random;
 
 public class DropDiamond : Drop
 {
@@ -21,6 +23,6 @@ public class DropDiamond : Drop
 
         MinigameAward.DropDiamond += diamond;
 
-        ResourceManager.GetHudText($"{TransferLabel.DiamondSprite}+{diamond}", Color.white, 90, transform, ResourceManager.Get(CanvasLabel.D_HudParent), true);
+        ResourceManager.GetHudText(string.Format("{0}+{1}", TransferLabel.DiamondSprite, diamond), Color.white, 90, transform, ResourceManager.Get(CanvasLabel.D_HudParent), true);
     }
 }

+ 3 - 1
Assets/Script/Object/DropGold.cs

@@ -1,8 +1,10 @@
+using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
 using System.Collections;
 using System.Collections.Generic;
+using Random = UnityEngine.Random;
 
 public class DropGold : Drop
 {
@@ -20,6 +22,6 @@ public class DropGold : Drop
 
         MinigameAward.DropCoin += coin;
 
-        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, transform, ResourceManager.Get(CanvasLabel.D_HudParent), true);
+        ResourceManager.GetHudText(string.Format("{0}+{1}", TransferLabel.CoinSprite, coin), Color.white, 90, transform, ResourceManager.Get(CanvasLabel.D_HudParent), true);
     }
 }

+ 2 - 2
Assets/Script/Object/Flower.cs

@@ -461,7 +461,7 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            ResourceManager.GetHudText($"+{MiniGameManager.PunchCorrectScore}", Color.white, 90, ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
+            ResourceManager.GetHudText(string.Format("+{0}", MiniGameManager.PunchCorrectScore), Color.white, 90, ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
             MiniGameManager.Score += MiniGameManager.PunchCorrectScore;
 
@@ -647,7 +647,7 @@ public class Flower : Regist, IPointerClickHandler
             }
         );
 
-        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic[FlowerLabel.AwardGoldPos], ResourceManager.Get(CanvasLabel.A_HudParent), true);
+        ResourceManager.GetHudText(string.Format("{0}+{1}", TransferLabel.CoinSprite, coin), Color.white, 90, ChildDic[FlowerLabel.AwardGoldPos], ResourceManager.Get(CanvasLabel.A_HudParent), true);
 
         ResetAward();
     }

+ 6 - 6
Assets/Script/Object/Player.cs

@@ -853,7 +853,7 @@ public class Player : Regist , IPointerClickHandler
         {
             if (pivot == null)
             {
-                pivot = UAC.transform.FindChild(PlayerLabel.Pivot);
+                pivot = UAC.transform.Find(PlayerLabel.Pivot);
             }
 
             return pivot;
@@ -1606,8 +1606,8 @@ public class Player : Regist , IPointerClickHandler
         LeftLegSlot = UAC.armature.GetSlot("左腿");
         RightLegSlot = UAC.armature.GetSlot("右腿");
 
-        LeftLongSleeveUAC = UAC.transform.FindChild("长袖9左 (长袖9左)").GetComponent<UnityArmatureComponent>();
-        RightLongSleeveUAC = UAC.transform.FindChild("长袖9右 (长袖9右)").GetComponent<UnityArmatureComponent>();
+        LeftLongSleeveUAC = UAC.transform.Find("长袖9左 (长袖9左)").GetComponent<UnityArmatureComponent>();
+        RightLongSleeveUAC = UAC.transform.Find("长袖9右 (长袖9右)").GetComponent<UnityArmatureComponent>();
 
 		LeftShortSleeveSlot = UAC.armature.GetSlot("上衣1袖子左");
 		RightShortSleeveSlot = UAC.armature.GetSlot("上衣1袖子右");
@@ -1784,7 +1784,7 @@ public class Player : Regist , IPointerClickHandler
     {
         if (slot.UnityTransform == null)
         {
-            UAC.transform.FindChild(slot.name).SetLZ(z);
+            UAC.transform.Find(slot.name).SetLZ(z);
         }
         else
         {
@@ -1796,7 +1796,7 @@ public class Player : Regist , IPointerClickHandler
     {
         if (slot.UnityTransform == null)
         {
-            UAC.transform.FindChild(slot.name).SetAsFirstSibling();
+            UAC.transform.Find(slot.name).SetAsFirstSibling();
         }
         else
         {
@@ -1947,7 +1947,7 @@ public class Player : Regist , IPointerClickHandler
 
         if (bodyPart == BodyPart.Wing)
         {
-            TweenRoot tweenRoot = transform.FindChild("Armature/" + Wing).GetChild(0).CreateTweenScale(new Vector3(1, 1, 1), new Vector3(0.6f, 1, 1), 0.75f, true, true, Curve.Linear);
+            TweenRoot tweenRoot = transform.Find("Armature/" + Wing).GetChild(0).CreateTweenScale(new Vector3(1, 1, 1), new Vector3(0.6f, 1, 1), 0.75f, true, true, Curve.Linear);
 
             tweenRoot.PingPong = true;
 

+ 1 - 1
Assets/Script/Object/PlazaRoomChest.cs

@@ -324,7 +324,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
             ChestTimerTransform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
             PlazaRoom.ControllDepthDictionary.Add(transform, new List<Transform> {ChestTimerTransform});
         }
-        hudTarget.PosTra = transform.parent.FindChild(PlazaRoomChestLabel.Hud);
+        hudTarget.PosTra = transform.parent.Find(PlazaRoomChestLabel.Hud);
         ResetChestRefreshTimer();
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(chestData.DatabaseRoomID);
 

+ 5 - 4
Assets/Script/SFS/CSharpExtension/DataParse.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -13,13 +14,13 @@ public static class DataParse
 
     public static string ToStr(this Vector3 vector)
     {
-        return $"{vector.x} {vector.y} {vector.z}";
+        return string.Format("{0} {1} {2}", vector.x, vector.y, vector.z);
     }
 
     public static string ToStr(this Vector3 vector, int accuray)
     {
-        string accurayStr = $"F{accuray}";
-        return $"{vector.x.ToString(accurayStr)} {vector.y.ToString(accurayStr)} {vector.z.ToString(accurayStr)}";
+        string accurayStr = string.Format("F{0}", accuray);
+        return string.Format("{0} {1} {2}", vector.x.ToString(accurayStr), vector.y.ToString(accurayStr), vector.z.ToString(accurayStr));
     }
 
     public static Vector3 ToVector(this string str)
@@ -32,7 +33,7 @@ public static class DataParse
 
     public static string ToStr(this Transform transform)
     {
-        return $"{transform.position.x} {transform.position.y} {transform.position.z} {transform.eulerAngles.x} {transform.eulerAngles.y} {transform.eulerAngles.z}";
+        return string.Format("{0} {1} {2} {3} {4} {5}", transform.position.x, transform.position.y, transform.position.z, transform.eulerAngles.x, transform.eulerAngles.y, transform.eulerAngles.z);
     }
 
     public static Vector3[] ToTransform(this string str)

+ 1 - 1
Assets/Script/SFS/Manager/ChestManager.cs

@@ -534,7 +534,7 @@ public class ChestManager : Regist
             ResourceManager.SetActive(CanvasLabel.Y_Guess, false);
             ResourceManager.SetActive(CanvasLabel.Yb_CreateChest, false);
 
-            ResourceManager.SetText(CanvasLabel.Ya_Desc, $"x{award}");
+            ResourceManager.SetText(CanvasLabel.Ya_Desc, string.Format("x{0}", award));
             Manager.AddDiamond(award, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestAward);
 
             Manager.GetChestAwardAmt++;

+ 2 - 2
Assets/Script/SFS/Manager/PlazaRoomController.cs

@@ -626,7 +626,7 @@ public class PlazaRoomController
         plazaRoomPlayer.Player.ChangeExpression(expressionName, ExpressionDuration);
 
         string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr(LanguageLabel.UI__X_Self) : plazaRoomPlayer.NickName;
-        string message = $"{senderName}:\u3000<({expressionName}按钮)>";
+        string message = string.Format("{0}:\u3000<({1}按钮)>", senderName, expressionName);
         Color textColor = senderID == SFSManager.GardenSmartFox.User.Id ? Lib.SelfMessage : Lib.OtherMessage;
         InfoBoxManager.PlazaRoomInfoBox.Display(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
         Text text = ResourceManager.Get<Text>(CanvasLabel.X_CurrentInfoLab);
@@ -643,7 +643,7 @@ public class PlazaRoomController
 
         string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr(LanguageLabel.UI__X_Self) : plazaRoomPlayer.NickName;
 
-        message = $"{senderName}:\u3000{message}";
+        message = string.Format("{0}:\u3000{1}", senderName, message);
         InfoBoxManager.PlazaRoomInfoBox.Display(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
 
         ResourceManager.SetText(CanvasLabel.X_CurrentInfoLab, message);

+ 3 - 3
Assets/Script/Social/FriendPanel.cs

@@ -255,7 +255,7 @@ public class FriendPanel : Regist
 
     public static void UpdateFriendAmountText()
     {
-        FriendAmountText.text = $"{FriendItems.Count}/{maxFriend}";
+        FriendAmountText.text = string.Format("{0}/{1}", FriendItems.Count, maxFriend);
     }
 
     public static void RefreshFriendList()
@@ -554,7 +554,7 @@ public class FriendPanel : Regist
             string serialNumber = strings[0];
             if (targetSerialNumber == serialNumber)
             {
-                nodes[i].Attributes[0].Value = $"{targetSerialNumber}|{dateTime}";
+                nodes[i].Attributes[0].Value = string.Format("{0}|{1}", targetSerialNumber, dateTime);
                 //ConfigManager.SaveConfigDocument();
                 return;
             }
@@ -562,7 +562,7 @@ public class FriendPanel : Regist
         
         XmlNode node = ConfigManager.ConfigDocument.CreateNode(XmlNodeType.Element, PlayerConfigLabel.LastPrivateMessageDate, null);
         XmlAttribute attribute = node.Attributes.Append(ConfigManager.ConfigDocument.CreateAttribute(PlayerConfigLabel.AttributeName));
-        attribute.Value = $"{targetSerialNumber}|{dateTime}";
+        attribute.Value = string.Format("{0}|{1}", targetSerialNumber, dateTime);
         parentNode.AppendChild(node);
         //ConfigManager.SaveConfigDocument();
     }

+ 1 - 0
Assets/Script/Tool/Auxiliary.cs

@@ -23,6 +23,7 @@ using System.Security.Cryptography;
 using System.Runtime.Serialization.Formatters.Binary;
 
 using System.Security;
+//using System.Security.Cryptography.Xml;
 using System.Text.RegularExpressions;
 using System.Security.Cryptography.Xml;
 using Sfs2X.Entities.Data;

+ 10 - 10
Assets/Script/Tool/Bundle.cs

@@ -433,8 +433,8 @@ public class Bundle : MonoBehaviour
             //			return "file://" +  System.Environment.CurrentDirectory.Replace("\\", "/"); // Use the build output folder directly.
             return "file://" + Application.streamingAssetsPath + "/Bundle/Windows/"; //user local stream
 
-        else if (Application.isWebPlayer)
-            return System.IO.Path.GetDirectoryName(Application.absoluteURL).Replace("\\", "/") + "/StreamingAssets";
+        //else if (Application.isWebPlayer)
+        //    return System.IO.Path.GetDirectoryName(Application.absoluteURL).Replace("\\", "/") + "/StreamingAssets";
 
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
             return "file://" + Application.streamingAssetsPath + "/Bundle/IOS/";
@@ -728,7 +728,7 @@ public class Bundle : MonoBehaviour
     private static int CopyCount = 0;
     public static void CopyAssetBundles()
     {
-        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
         if (!Directory.Exists(persistentFolderPath))
         {
             Directory.CreateDirectory(persistentFolderPath);
@@ -807,7 +807,7 @@ public class Bundle : MonoBehaviour
             }
 
             Initializer.DebugText.text = "U1";
-            string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+            string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
 
             Initializer.DebugText.text = "U2";
             List<AssetBundleSet> assetBundleSets = AssetBundleUtility.GetAssetBundleSetsFromFolders
@@ -820,19 +820,19 @@ public class Bundle : MonoBehaviour
             if (string.IsNullOrEmpty(HttpManager.Md5) || string.IsNullOrEmpty(HttpManager.Md5Dictionnary) || string.IsNullOrEmpty(HttpManager.AssetbundleUrl))
             {
                 needUpdate = false;
-                Debug.LogWarning($"NeedUpdate : {needUpdate} connection error");
+                Debug.LogWarning(string.Format("NeedUpdate : {0} connection error", needUpdate));
             }
             else
             {
                 //Debug.Log(localMD5);
                 //Debug.Log(HttpManager.Md5);
                 needUpdate = localMD5 != HttpManager.Md5;
-                Debug.LogWarning($"NeedUpdate : {needUpdate}");
+                //Debug.LogWarning(string.Format("NeedUpdate : {0}", needUpdate));
+            }
+            if (Application.isEditor || Application.isMobilePlatform)
+            {
+                needUpdate = false;
             }
-            //if (Application.isEditor || Application.isMobilePlatform)
-            //{
-            //    needUpdate = false;
-            //}
             AssetBundleUtility.OnDownloadOrUpdateFinish += FinishDownloadAndLoad;
             if (needUpdate)
             {

+ 2 - 1
Assets/Script/Tool/Test.cs

@@ -1,3 +1,4 @@
+using System;
 using UnityEngine;
 
 using System.Collections;
@@ -15,7 +16,7 @@ public class Test : MonoBehaviour
 
     public void Awake()
     {
-        FilePath = $"{Application.persistentDataPath}/Test.png";
+        FilePath = string.Format("{0}/Test.png", Application.persistentDataPath);
         if (!File.Exists(FilePath))
         {
             File.WriteAllBytes(FilePath, Texture2D.EncodeToPNG());

+ 6 - 4
Assets/Tookits/DeleteUtility/DeleteUtility.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace deleteUtility
 {
 
@@ -48,20 +50,20 @@ public class DeleteUtility : MonoBehaviour
             DeleteUtility instance = InstanceManager.SearchInstance<DeleteUtility>();
             if (isDirectory)
             {
-                string recyclePath = $"{instance.Folder}{Path.DirectorySeparatorChar}{Path.GetFileName(path)}";
+                string recyclePath = string.Format("{0}{1}{2}", instance.Folder, Path.DirectorySeparatorChar, Path.GetFileName(path));
                 recyclePath = recyclePath.GetUnRepeatDirectoryName();
                 Directory.Move(path, recyclePath);
                 File.Delete(metaFilePath);
-                Debug.LogWarning($"回收文件夹 {Selection.objects[i].name}");
+                Debug.LogWarning(string.Format("回收文件夹 {0}", Selection.objects[i].name));
                 AssetDatabase.Refresh();
             }
             else
             {
-                string recyclePath = $"{instance.Folder}{Path.DirectorySeparatorChar}{Path.GetFileName(path)}";
+                string recyclePath = string.Format("{0}{1}{2}", instance.Folder, Path.DirectorySeparatorChar, Path.GetFileName(path));
                 recyclePath = recyclePath.GetUnRepeatFileName();
                 File.Move(path, recyclePath);
                 File.Delete(metaFilePath);
-                Debug.Log($"回收文件 {Selection.objects[i].name}");
+                Debug.Log(string.Format("回收文件 {0}", Selection.objects[i].name));
                 AssetDatabase.Refresh();
             }
         }

+ 5 - 3
Assets/Tookits/DeleteUtility/ExPath.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace deleteUtility
 {
 
@@ -20,10 +22,10 @@ public static class ExPath
         string directory = Path.GetDirectoryName(fileName);
         string name = Path.GetFileNameWithoutExtension(fileName);
         int count = 1;
-        string newFileName = $"{directory}{Path.DirectorySeparatorChar}{name}{extension}";
+        string newFileName = string.Format("{0}{1}{2}{3}", directory, Path.DirectorySeparatorChar, name, extension);
         while (File.Exists(newFileName))
         {
-            newFileName = $"{directory}{Path.DirectorySeparatorChar}{name} ({count++}){extension}";
+            newFileName = string.Format("{0}{1}{2} ({3}){4}", directory, Path.DirectorySeparatorChar, name, count++, extension);
         }
         return newFileName;
     }
@@ -34,7 +36,7 @@ public static class ExPath
         string newDirectoryName = directoryName;
         while (Directory.Exists(newDirectoryName))
         {
-            newDirectoryName = $"{directoryName} ({count++})";
+            newDirectoryName = string.Format("{0} ({1})", directoryName, count++);
         }
         return newDirectoryName;
     }

+ 1 - 1
Assets/Tookits/LabelUtility/Editor/InstanceUtility.cs

@@ -57,7 +57,7 @@ public class InstanceUtility
                 return relativeObject;
             }
 
-            throw new Exception($"{FieldName} {IsEnumerable} {EnumerableIndex}");
+            throw new Exception(string.Format("{0} {1} {2}", FieldName, IsEnumerable, EnumerableIndex));
         }
     }
 

+ 1 - 1
Assets/Tookits/LabelUtility/Editor/LabelSetDrawer.cs

@@ -253,7 +253,7 @@ namespace labelUtility
                             registTarget = new RegistTarget();
                             registTarget.Transform = transform;
                             registTarget.Type = componentTypes[i];
-                            registTarget.Name = string.IsNullOrEmpty(Instance.NameExcludeString) ? $"{transform.name}" : $"{transform.name.Replace(Instance.NameExcludeString, "")}";
+                            registTarget.Name = string.IsNullOrEmpty(Instance.NameExcludeString) ? string.Format("{0}", transform.name) : string.Format("{0}", transform.name.Replace(Instance.NameExcludeString, ""));
                         }
                         registTargets.Add(registTarget);
                     }

+ 4 - 2
Assets/Tookits/LabelUtility/ExPath.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace labelUtility
 {
 
@@ -22,13 +24,13 @@ public static class ExPath
 
         int count = 0;
 
-        string newFileName = $"{directory}/{name}{extension}";
+        string newFileName = string.Format("{0}/{1}{2}", directory, name, extension);
 
         while (File.Exists(newFileName))
         {
             count++;
 
-            newFileName = $"{directory}/{name} ({count}){extension}";
+            newFileName = string.Format("{0}/{1} ({2}){3}", directory, name, count, extension);
         }
 
         return newFileName;

+ 28 - 28
Assets/Tookits/LabelUtility/LabelUtility.cs

@@ -129,12 +129,12 @@ namespace labelUtility
             string scriptContent = "";
             foreach (var dllName in InstanceManager.SearchInstance<LabelUtility>().DllNames)
             {
-                scriptContent += $"using {dllName};\r\n";
+                scriptContent += string.Format("using {0};\r\n", dllName);
             }
             scriptContent += "\r\n";
-            scriptContent += $"public class {labelSet.LabelScriptName}";
+            scriptContent += string.Format("public class {0}", labelSet.LabelScriptName);
             scriptContent += "\r\n";
-            scriptContent += $"{{\r\n\t#region Config\r\n\r\n\t{StartMark}\r\n\t{EndMark}\r\n\r\n\t#endregion\r\n}}";
+            scriptContent += string.Format("{{\r\n\t#region Config\r\n\r\n\t{0}\r\n\t{1}\r\n\r\n\t#endregion\r\n}}", StartMark, EndMark);
 
             labelSet.LabelScript = CreateScript(labelSet.LabelScriptName, labelSet.LabelScriptPath, scriptContent);
 
@@ -169,35 +169,35 @@ namespace labelUtility
             string scriptContent = "";
             foreach (var dllName in InstanceManager.SearchInstance<LabelUtility>().DllNames)
             {
-                scriptContent += $"using {dllName};\r\n";
+                scriptContent += string.Format("using {0};\r\n", dllName);
             }
             scriptContent += "\r\n";
-            scriptContent += $"public class {labelSet.ComponentScriptName}";
+            scriptContent += string.Format("public class {0}", labelSet.ComponentScriptName);
             if (string.IsNullOrEmpty(labelSet.DerivedString))
             {
                 scriptContent += "\r\n";
             }
             else
             {
-                scriptContent += $" : {labelSet.DerivedString}\r\n";
+                scriptContent += string.Format(" : {0}\r\n", labelSet.DerivedString);
             }
-            scriptContent += $"{{\r\n\t#region Config\r\n\r\n\t{StartMark}\r\n\t{EndMark}\r\n\r\n\t#endregion\r\n";
+            scriptContent += string.Format("{{\r\n\t#region Config\r\n\r\n\t{0}\r\n\t{1}\r\n\r\n\t#endregion\r\n", StartMark, EndMark);
             scriptContent += "\r\n";
             if (!string.IsNullOrEmpty(labelSet.RegistMethodString))
             {
-                scriptContent += $"\t{labelSet.RegistMethodString}\r\n\t{{\r\n";
-                scriptContent += $"\t\t{RegistStartMark}\r\n";
-                scriptContent += $"\t\t{RegistEndMark}\r\n";
-                scriptContent += $"\t\t{RegistEventStartMark}\r\n";
-                scriptContent += $"\t\t{RegistEventEndMark}\r\n";
-                scriptContent += $"\t}}\r\n";
+                scriptContent += string.Format("\t{0}\r\n\t{{\r\n", labelSet.RegistMethodString);
+                scriptContent += string.Format("\t\t{0}\r\n", RegistStartMark);
+                scriptContent += string.Format("\t\t{0}\r\n", RegistEndMark);
+                scriptContent += string.Format("\t\t{0}\r\n", RegistEventStartMark);
+                scriptContent += string.Format("\t\t{0}\r\n", RegistEventEndMark);
+                scriptContent += "\t}\r\n";
             }
 
             scriptContent += "\r\n";
-            scriptContent += $"\t{EventStartMark}\r\n";
-            scriptContent += $"\t{EventEndMark}\r\n";
+            scriptContent += string.Format("\t{0}\r\n", EventStartMark);
+            scriptContent += string.Format("\t{0}\r\n", EventEndMark);
 
-            scriptContent += $"}}";
+            scriptContent += "}";
 
             labelSet.ComponentScript = CreateScript(labelSet.ComponentScriptName, labelSet.ComponentScriptPath, scriptContent);
 
@@ -226,10 +226,10 @@ namespace labelUtility
                 throw new Exception("ScripName包含无效字符");
             }
 
-            string fullPath = $"{scriptPath}/{scriptName}.cs";
+            string fullPath = string.Format("{0}/{1}.cs", scriptPath, scriptName);
             if (File.Exists(fullPath))
             {
-                throw new Exception($"已经存在一个 {fullPath}");
+                throw new Exception(string.Format("已经存在一个 {0}", fullPath));
             }
 
             File.WriteAllText(fullPath, content);
@@ -263,7 +263,7 @@ namespace labelUtility
             List<Transform> transforms = GetAllTransformFromPrefab(labelSet.Prefabs);
             foreach (var transform in transforms)
             {
-                labels.Add($"{labelSet.LabePrefix} {transform.name} = \"{transform.name}\";");
+                labels.Add(string.Format("{0} {1} = \"{2}\";", labelSet.LabePrefix, transform.name, transform.name));
             }
             InsertLineToScript(StartMark, EndMark, labelSet.LabelScript, labels);
 
@@ -313,10 +313,10 @@ namespace labelUtility
                 string label;
                 if (i == 0)
                 {
-                    label = $"\t{labelSet.LabePrefix} {node.Name} = \"{node.Name}\";";
+                    label = string.Format("\t{0} {1} = \"{2}\";", labelSet.LabePrefix, node.Name, node.Name);
                     labels.Add(label);
                 }
-                label = $"\t{labelSet.LabePrefix} {node.Name}{LanguageLabel.LanguagePageSeperator}{childNode.Name} = \"{node.Name}{LanguageLabel.LanguagePageSeperator}{childNode.Name}\";";
+                label = string.Format("\t{0} {1}{2}{3} = \"{4}{5}{6}\";", labelSet.LabePrefix, node.Name, LanguageLabel.LanguagePageSeperator, childNode.Name, node.Name, LanguageLabel.LanguagePageSeperator, childNode.Name);
                 labels.Add(label);
             }
             return labels;
@@ -326,16 +326,16 @@ namespace labelUtility
         public static Type GetType(ComponentType componentType)
         {
             Assembly assembly = Assembly.Load("UnityEngine.UI");
-            Type type = assembly.GetType($"UnityEngine.UI.{componentType}");
+            Type type = assembly.GetType(string.Format("UnityEngine.UI.{0}", componentType));
             if (type == null)
             {
                 assembly = Assembly.Load("UnityEngine");
-                type = assembly.GetType($"UnityEngine.{componentType}");
+                type = assembly.GetType(string.Format("UnityEngine.{0}", componentType));
             }
             if (type == null)
             {
                 assembly = Assembly.Load("Assembly-CSharp");
-                type = assembly.GetType($"{componentType}");
+                type = assembly.GetType(string.Format("{0}", componentType));
             }
             return type;
         }
@@ -365,7 +365,7 @@ namespace labelUtility
             foreach (var registTarget in labelSet.RegistTargets)
             {
                 if (registTarget.Ignore) continue;
-                defineStrings.Add($"{labelSet.ComponentPrefix} {registTarget.Type} {registTarget.Transform.name};");
+                defineStrings.Add(string.Format("{0} {1} {2};", labelSet.ComponentPrefix, registTarget.Type, registTarget.Transform.name));
                 string registString = labelSet.RegistString.Replace("#NAME", registTarget.Transform.name).Replace("#TYPE", registTarget.Type.ToString()).Replace("#NEWNAME", registTarget.Name);
                 if (labelSet.LabelScript != null)
                 {
@@ -383,11 +383,11 @@ namespace labelUtility
                         }
                         for (int i = 0; i < eventString.MethodNames.Count; i++)
                         {
-                            eventNames.Add($"{eventString.MethodNames[i].Replace("#NEWNAME", registTarget.Name).Replace("#NAME", registTarget.Transform.name)}");
+                            eventNames.Add(string.Format("{0}", eventString.MethodNames[i].Replace("#NEWNAME", registTarget.Name).Replace("#NAME", registTarget.Transform.name)));
                         }
                         for (int i = 0; i < eventString.RegistStrings.Count; i++)
                         {
-                            registEventStrings.Add($"{eventString.RegistStrings[i].Replace("#NEWNAME", registTarget.Name).Replace("#NAME", registTarget.Transform.name)};");
+                            registEventStrings.Add(string.Format("{0};", eventString.RegistStrings[i].Replace("#NEWNAME", registTarget.Name).Replace("#NAME", registTarget.Transform.name)));
                         }
                     }
                 }
@@ -431,7 +431,7 @@ namespace labelUtility
                 }
                 else
                 {
-                    newEventMethods.Add($"{labelSet.ComponentPrefix} {eventNames[i]}");
+                    newEventMethods.Add(string.Format("{0} {1}", labelSet.ComponentPrefix, eventNames[i]));
                     newEventMethods.Add("{\r\n");
                     newEventMethods.Add(i < eventNames.Count - 1 ? "}\r\n" : "}");
                 }

+ 60 - 18
Assets/UnityAds/UnityEngine.Advertisements.Android.dll.meta

@@ -1,57 +1,99 @@
 fileFormatVersion: 2
 guid: cad99f482ce25421196533fe02e6a13e
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 1
       settings:
         CPU: AnyCPU
-    Any:
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
         OS: AnyOS
-    Linux:
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Samsung TV: SamsungTV
+    second:
+      enabled: 0
+      settings:
+        STV_MODEL: STANDARD_13
+  - first:
+      Standalone: Linux
+    second:
       enabled: 0
       settings:
         CPU: x86
-    Linux64:
+  - first:
+      Standalone: Linux64
+    second:
       enabled: 0
       settings:
         CPU: x86_64
-    OSXIntel:
+  - first:
+      Standalone: OSXIntel
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    OSXIntel64:
+  - first:
+      Standalone: OSXIntel64
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    SamsungTV:
+  - first:
+      Standalone: Win
+    second:
       enabled: 0
       settings:
-        STV_MODEL: STANDARD_13
-    Win:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    Win64:
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    iOS:
+  - first:
+      iPhone: iOS
+    second:
       enabled: 0
       settings:
-        CompileFlags:
-        FrameworkDependencies:
-  userData:
-  assetBundleName:
-  assetBundleVariant:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/UnityAds/UnityEngine.Advertisements.Editor.dll


+ 60 - 18
Assets/UnityAds/UnityEngine.Advertisements.Editor.dll.meta

@@ -1,57 +1,99 @@
 fileFormatVersion: 2
 guid: 56921141d53fd4a5888445107b1b1286
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    Any:
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 1
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
         OS: AnyOS
-    Linux:
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Samsung TV: SamsungTV
+    second:
+      enabled: 0
+      settings:
+        STV_MODEL: STANDARD_13
+  - first:
+      Standalone: Linux
+    second:
       enabled: 0
       settings:
         CPU: x86
-    Linux64:
+  - first:
+      Standalone: Linux64
+    second:
       enabled: 0
       settings:
         CPU: x86_64
-    OSXIntel:
+  - first:
+      Standalone: OSXIntel
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    OSXIntel64:
+  - first:
+      Standalone: OSXIntel64
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    SamsungTV:
+  - first:
+      Standalone: Win
+    second:
       enabled: 0
       settings:
-        STV_MODEL: STANDARD_13
-    Win:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    Win64:
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    iOS:
+  - first:
+      iPhone: iOS
+    second:
       enabled: 0
       settings:
-        CompileFlags:
-        FrameworkDependencies:
-  userData:
-  assetBundleName:
-  assetBundleVariant:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 99 - 36
Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll.meta

@@ -1,78 +1,141 @@
 fileFormatVersion: 2
 guid: 7166c387502014892b69bef26f88b978
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Android:
+  - first:
+      '': BlackBerry
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      '': Web
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      '': WebStreamed
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Android: Android
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    Any:
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    BlackBerry:
-      enabled: 1
-      settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
         OS: AnyOS
-    Linux:
+  - first:
+      Facebook: WebGL
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Facebook: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Samsung TV: SamsungTV
+    second:
+      enabled: 1
+      settings:
+        STV_MODEL: STANDARD_13
+  - first:
+      Standalone: Linux
+    second:
       enabled: 1
       settings:
         CPU: x86
-    Linux64:
+  - first:
+      Standalone: Linux64
+    second:
       enabled: 1
       settings:
         CPU: x86_64
-    LinuxUniversal:
+  - first:
+      Standalone: LinuxUniversal
+    second:
       enabled: 1
-      settings: {}
-    OSXIntel:
+      settings:
+        CPU: 
+  - first:
+      Standalone: OSXIntel
+    second:
       enabled: 1
       settings:
         CPU: AnyCPU
-    OSXIntel64:
+  - first:
+      Standalone: OSXIntel64
+    second:
       enabled: 1
       settings:
         CPU: AnyCPU
-    OSXUniversal:
-      enabled: 1
-      settings: {}
-    SamsungTV:
+  - first:
+      Standalone: OSXUniversal
+    second:
       enabled: 1
       settings:
-        STV_MODEL: STANDARD_13
-    Tizen:
+        CPU: 
+  - first:
+      Standalone: Win
+    second:
       enabled: 1
-      settings: {}
-    Web:
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
       enabled: 1
-      settings: {}
-    WebGL:
+      settings:
+        CPU: AnyCPU
+  - first:
+      Tizen: Tizen
+    second:
       enabled: 1
       settings: {}
-    WebStreamed:
+  - first:
+      WebGL: WebGL
+    second:
       enabled: 1
       settings: {}
-    Win:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 1
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
       settings:
         CPU: AnyCPU
-    iOS:
+  - first:
+      iPhone: iOS
+    second:
       enabled: 0
       settings:
-        CompileFlags:
-        FrameworkDependencies:
-  userData:
-  assetBundleName:
-  assetBundleVariant:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 59 - 17
Assets/UnityAds/UnityEngine.Advertisements.iOS.dll.meta

@@ -1,57 +1,99 @@
 fileFormatVersion: 2
 guid: d6f3e2ade30154a80a137e0079f66a08
 PluginImporter:
-  serializedVersion: 1
+  externalObjects: {}
+  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Android:
+  - first:
+      Android: Android
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    Any:
+  - first:
+      Any: 
+    second:
       enabled: 0
       settings: {}
-    Editor:
+  - first:
+      Editor: Editor
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
         OS: AnyOS
-    Linux:
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Samsung TV: SamsungTV
+    second:
+      enabled: 0
+      settings:
+        STV_MODEL: STANDARD_13
+  - first:
+      Standalone: Linux
+    second:
       enabled: 0
       settings:
         CPU: x86
-    Linux64:
+  - first:
+      Standalone: Linux64
+    second:
       enabled: 0
       settings:
         CPU: x86_64
-    OSXIntel:
+  - first:
+      Standalone: OSXIntel
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    OSXIntel64:
+  - first:
+      Standalone: OSXIntel64
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    SamsungTV:
+  - first:
+      Standalone: Win
+    second:
       enabled: 0
       settings:
-        STV_MODEL: STANDARD_13
-    Win:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    Win64:
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-    iOS:
+  - first:
+      iPhone: iOS
+    second:
       enabled: 1
       settings:
-        CompileFlags:
+        CompileFlags: 
         FrameworkDependencies: AdSupport;CoreTelephony;StoreKit;
-  userData:
-  assetBundleName:
-  assetBundleVariant:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
Garden5_2017.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>

+ 2 - 0
ProjectSettings/DynamicsManager.asset

@@ -16,3 +16,5 @@ PhysicsManager:
   m_EnableAdaptiveForce: 0
   m_EnablePCM: 1
   m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_AutoSimulation: 1
+  m_AutoSyncTransforms: 1

+ 11 - 12
ProjectSettings/GraphicsSettings.asset

@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 12
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -38,29 +38,28 @@ GraphicsSettings:
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
   - {fileID: 4800000, guid: e73e8e8cfe7b2344abcbf572918e22a1, type: 3}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
-  m_TierSettings_Tier1:
-    renderingPath: 1
-    useCascadedShadowMaps: 0
-  m_TierSettings_Tier2:
-    renderingPath: 1
-    useCascadedShadowMaps: 0
-  m_TierSettings_Tier3:
-    renderingPath: 1
-    useCascadedShadowMaps: 0
+  m_CustomRenderPipeline: {fileID: 0}
+  m_TransparencySortMode: 0
+  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []
   m_LightmapStripping: 0
   m_FogStripping: 0
+  m_InstancingStripping: 0
   m_LightmapKeepPlain: 1
   m_LightmapKeepDirCombined: 1
-  m_LightmapKeepDirSeparate: 1
   m_LightmapKeepDynamicPlain: 1
   m_LightmapKeepDynamicDirCombined: 1
-  m_LightmapKeepDynamicDirSeparate: 1
+  m_LightmapKeepShadowMask: 1
+  m_LightmapKeepSubtractive: 1
   m_FogKeepLinear: 1
   m_FogKeepExp: 1
   m_FogKeepExp2: 1
+  m_AlbedoSwatchInfos: []
+  m_LightsUseLinearIntensity: 0
+  m_LightsUseColorTemperature: 0

+ 5 - 2
ProjectSettings/Physics2DSettings.asset

@@ -3,7 +3,7 @@
 --- !u!19 &1
 Physics2DSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 2
+  serializedVersion: 3
   m_Gravity: {x: 0, y: -9.81}
   m_DefaultMaterial: {fileID: 0}
   m_VelocityIterations: 8
@@ -13,15 +13,18 @@ Physics2DSettings:
   m_MaxAngularCorrection: 8
   m_MaxTranslationSpeed: 100
   m_MaxRotationSpeed: 360
-  m_MinPenetrationForPenalty: 0.01
   m_BaumgarteScale: 0.2
   m_BaumgarteTimeOfImpactScale: 0.75
   m_TimeToSleep: 0.5
   m_LinearSleepTolerance: 0.01
   m_AngularSleepTolerance: 2
+  m_DefaultContactOffset: 0.01
+  m_AutoSimulation: 1
   m_QueriesHitTriggers: 1
   m_QueriesStartInColliders: 1
   m_ChangeStopsCallbacks: 0
+  m_CallbacksOnDisable: 1
+  m_AutoSyncTransforms: 1
   m_AlwaysShowColliders: 0
   m_ShowColliderSleep: 1
   m_ShowColliderContacts: 0

+ 174 - 24
ProjectSettings/ProjectSettings.asset

@@ -3,9 +3,10 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 10
+  serializedVersion: 13
   productGUID: 548c8e2bb13123a4c87608ea03ec4bff
   AndroidProfiler: 0
+  AndroidFilterTouchesWhenObscured: 0
   defaultScreenOrientation: 4
   targetDevice: 0
   useOnDemandResources: 0
@@ -40,8 +41,6 @@ PlayerSettings:
   m_SplashScreenLogos:
   - logo: {fileID: 21300000, guid: 9c5809f759997a043b3c85230b4118d1, type: 3}
     duration: 2.5
-  m_SplashScreenBackgroundLandscape: {fileID: 0}
-  m_SplashScreenBackgroundPortrait: {fileID: 0}
   m_VirtualRealitySplashScreen: {fileID: 0}
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1024
@@ -51,7 +50,6 @@ PlayerSettings:
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
-  m_MobileMTRendering: 0
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
@@ -66,18 +64,22 @@ PlayerSettings:
   useOSAutorotation: 1
   use32BitDisplayBuffer: 1
   disableDepthAndStencilBuffers: 0
+  androidBlitType: 0
   defaultIsFullScreen: 1
   defaultIsNativeResolution: 1
+  macRetinaSupport: 1
   runInBackground: 1
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
+  Force IOS Speakers When Recording: 0
   submitAnalytics: 1
   usePlayerLog: 1
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
   resizableWindow: 0
   useMacAppStoreValidation: 0
+  macAppStoreCategory: public.app-category.games
   gpuSkinning: 0
   graphicsJobs: 0
   xboxPIXTextureCapture: 0
@@ -95,14 +97,16 @@ PlayerSettings:
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0
   xboxEnablePIXSampling: 0
+  metalFramebufferOnly: 0
   n3dsDisableStereoscopicView: 0
   n3dsEnableSharedListOpt: 1
   n3dsEnableVSync: 0
-  uiUse16BitDepthBuffer: 0
   ignoreAlphaClear: 0
   xboxOneResolution: 0
   xboxOneMonoLoggingLevel: 0
   xboxOneLoggingLevel: 1
+  xboxOneDisableEsram: 0
+  xboxOnePresentImmediateThreshold: 0
   videoMemoryForVertexBuffers: 0
   psp2PowerMode: 0
   psp2AcquireBGM: 1
@@ -121,27 +125,51 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleIdentifier: com.dashgame.garden
   bundleVersion: 1.3.1
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
+  xboxOneEnable7thCore: 0
+  vrSettings:
+    cardboard:
+      depthFormat: 0
+      enableTransitionView: 0
+    daydream:
+      depthFormat: 0
+      useSustainedPerformanceMode: 0
+      enableVideoLayer: 0
+      useProtectedVideoMemory: 0
+    hololens:
+      depthFormat: 1
   protectGraphicsMemory: 0
+  useHDRDisplay: 0
+  m_ColorGamuts: 00000000
+  targetPixelDensity: 0
+  resolutionScalingMode: 0
+  androidSupportedAspectRatio: 1
+  androidMaxAspectRatio: 2.1
+  applicationIdentifier:
+    Android: com.dashgame.garden
+    Standalone: unity.DashGame Technology Inc..MyLovelyGarden
+    Tizen: com.dashgame.garden
+    iOS: com.dashgame.garden
+    tvOS: com.dashgame.garden
+  buildNumber:
+    iOS: 17
   AndroidBundleVersionCode: 25
   AndroidMinSdkVersion: 16
+  AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
-  apiCompatibilityLevel: 1
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 17
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0
   APKExpansionFiles: 0
-  preloadShaders: 0
+  keepLoadedShadersAlive: 0
   StripUnusedMeshComponents: 0
   VertexChannelCompressionMask:
     serializedVersion: 2
@@ -150,7 +178,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 7.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 
+  tvOSTargetOSVersionString: 9.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
@@ -193,6 +221,9 @@ PlayerSettings:
   iOSURLSchemes: []
   iOSBackgroundModes: 0
   iOSMetalForceHardShadows: 0
+  metalEditorSupport: 1
+  metalAPIValidation: 1
+  iOSRenderExtraFrameOnPause: 1
   appleDeveloperTeamID: Daiqing Gao (dashgamemaster@gmail.com)
   iOSManualSigningProvisioningProfileID: 
   tvOSManualSigningProvisioningProfileID: 
@@ -204,7 +235,9 @@ PlayerSettings:
   AndroidKeyaliasName: 
   AndroidTVCompatibility: 0
   AndroidIsGame: 1
+  AndroidEnableTango: 0
   androidEnableBanner: 1
+  androidUseLowAccuracyLocation: 0
   m_AndroidBanners:
   - width: 320
     height: 180
@@ -218,6 +251,7 @@ PlayerSettings:
       m_Icon: {fileID: 2800000, guid: 3224ba5b4cbd4b746a4e82c8cb2aa6fd, type: 3}
       m_Width: 128
       m_Height: 128
+      m_Kind: 0
   m_BuildTargetBatching:
   - m_BuildTarget: Android
     m_StaticBatching: 1
@@ -230,10 +264,13 @@ PlayerSettings:
     m_DynamicBatching: 1
   m_BuildTargetGraphicsAPIs: []
   m_BuildTargetVRSettings: []
+  m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
-  webPlayerTemplate: APPLICATION:Default
   m_TemplateCustomTags: {}
+  mobileMTRendering:
+    iPhone: 1
+    tvOS: 1
   wiiUTitleID: 0005000011000000
   wiiUGroupID: 00010000
   wiiUCommonSaveSize: 4096
@@ -252,6 +289,7 @@ PlayerSettings:
   wiiUGamePadStartupScreen: {fileID: 0}
   wiiUDrcBufferDisabled: 0
   wiiUProfilerLibPath: 
+  playModeTestRunnerEnabled: 0
   actionOnDotNetUnhandledException: 1
   enableInternalProfiler: 0
   logObjCUncaughtExceptions: 1
@@ -259,16 +297,116 @@ PlayerSettings:
   cameraUsageDescription: 
   locationUsageDescription: 
   microphoneUsageDescription: 
-  XboxTitleId: 
-  XboxImageXexPath: 
-  XboxSpaPath: 
-  XboxGenerateSpa: 0
-  XboxDeployKinectResources: 0
-  XboxSplashScreen: {fileID: 0}
-  xboxEnableSpeech: 0
-  xboxAdditionalTitleMemorySize: 0
-  xboxDeployKinectHeadOrientation: 0
-  xboxDeployKinectHeadPosition: 0
+  switchNetLibKey: 
+  switchSocketMemoryPoolSize: 6144
+  switchSocketAllocatorPoolSize: 128
+  switchSocketConcurrencyLimit: 14
+  switchScreenResolutionBehavior: 2
+  switchUseCPUProfiler: 0
+  switchApplicationID: 0x01004b9000490000
+  switchNSODependencies: 
+  switchTitleNames_0: 
+  switchTitleNames_1: 
+  switchTitleNames_2: 
+  switchTitleNames_3: 
+  switchTitleNames_4: 
+  switchTitleNames_5: 
+  switchTitleNames_6: 
+  switchTitleNames_7: 
+  switchTitleNames_8: 
+  switchTitleNames_9: 
+  switchTitleNames_10: 
+  switchTitleNames_11: 
+  switchPublisherNames_0: 
+  switchPublisherNames_1: 
+  switchPublisherNames_2: 
+  switchPublisherNames_3: 
+  switchPublisherNames_4: 
+  switchPublisherNames_5: 
+  switchPublisherNames_6: 
+  switchPublisherNames_7: 
+  switchPublisherNames_8: 
+  switchPublisherNames_9: 
+  switchPublisherNames_10: 
+  switchPublisherNames_11: 
+  switchIcons_0: {fileID: 0}
+  switchIcons_1: {fileID: 0}
+  switchIcons_2: {fileID: 0}
+  switchIcons_3: {fileID: 0}
+  switchIcons_4: {fileID: 0}
+  switchIcons_5: {fileID: 0}
+  switchIcons_6: {fileID: 0}
+  switchIcons_7: {fileID: 0}
+  switchIcons_8: {fileID: 0}
+  switchIcons_9: {fileID: 0}
+  switchIcons_10: {fileID: 0}
+  switchIcons_11: {fileID: 0}
+  switchSmallIcons_0: {fileID: 0}
+  switchSmallIcons_1: {fileID: 0}
+  switchSmallIcons_2: {fileID: 0}
+  switchSmallIcons_3: {fileID: 0}
+  switchSmallIcons_4: {fileID: 0}
+  switchSmallIcons_5: {fileID: 0}
+  switchSmallIcons_6: {fileID: 0}
+  switchSmallIcons_7: {fileID: 0}
+  switchSmallIcons_8: {fileID: 0}
+  switchSmallIcons_9: {fileID: 0}
+  switchSmallIcons_10: {fileID: 0}
+  switchSmallIcons_11: {fileID: 0}
+  switchManualHTML: 
+  switchAccessibleURLs: 
+  switchLegalInformation: 
+  switchMainThreadStackSize: 1048576
+  switchPresenceGroupId: 
+  switchLogoHandling: 0
+  switchReleaseVersion: 0
+  switchDisplayVersion: 1.0.0
+  switchStartupUserAccount: 0
+  switchTouchScreenUsage: 0
+  switchSupportedLanguagesMask: 0
+  switchLogoType: 0
+  switchApplicationErrorCodeCategory: 
+  switchUserAccountSaveDataSize: 0
+  switchUserAccountSaveDataJournalSize: 0
+  switchApplicationAttribute: 0
+  switchCardSpecSize: -1
+  switchCardSpecClock: -1
+  switchRatingsMask: 0
+  switchRatingsInt_0: 0
+  switchRatingsInt_1: 0
+  switchRatingsInt_2: 0
+  switchRatingsInt_3: 0
+  switchRatingsInt_4: 0
+  switchRatingsInt_5: 0
+  switchRatingsInt_6: 0
+  switchRatingsInt_7: 0
+  switchRatingsInt_8: 0
+  switchRatingsInt_9: 0
+  switchRatingsInt_10: 0
+  switchRatingsInt_11: 0
+  switchLocalCommunicationIds_0: 
+  switchLocalCommunicationIds_1: 
+  switchLocalCommunicationIds_2: 
+  switchLocalCommunicationIds_3: 
+  switchLocalCommunicationIds_4: 
+  switchLocalCommunicationIds_5: 
+  switchLocalCommunicationIds_6: 
+  switchLocalCommunicationIds_7: 
+  switchParentalControl: 0
+  switchAllowsScreenshot: 1
+  switchDataLossConfirmation: 0
+  switchSupportedNpadStyles: 3
+  switchSocketConfigEnabled: 0
+  switchTcpInitialSendBufferSize: 32
+  switchTcpInitialReceiveBufferSize: 64
+  switchTcpAutoSendBufferSizeMax: 256
+  switchTcpAutoReceiveBufferSizeMax: 256
+  switchUdpSendBufferSize: 9
+  switchUdpReceiveBufferSize: 42
+  switchSocketBufferEfficiency: 4
+  switchSocketInitializeEnabled: 1
+  switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchPlayerConnectionEnabled: 1
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -306,7 +444,6 @@ PlayerSettings:
   ps4GarlicHeapSize: 2048
   ps4ProGarlicHeapSize: 2560
   ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
-  ps4UseDebugIl2cppLibs: 0
   ps4pnSessions: 1
   ps4pnPresence: 1
   ps4pnFriends: 1
@@ -381,13 +518,14 @@ PlayerSettings:
   psp2UseLibLocation: 0
   psp2InfoBarOnStartup: 0
   psp2InfoBarColor: 0
-  psp2UseDebugIl2cppLibs: 0
+  psp2ScriptOptimizationLevel: 0
   psmSplashimage: {fileID: 0}
   splashScreenBackgroundSourceLandscape: {fileID: 0}
   splashScreenBackgroundSourcePortrait: {fileID: 0}
   spritePackerPolicy: DefaultPackerPolicy
   webGLMemorySize: 256
   webGLExceptionSupport: 1
+  webGLNameFilesAsHashes: 0
   webGLDataCaching: 0
   webGLDebugSymbols: 0
   webGLEmscriptenArgs: 
@@ -403,6 +541,10 @@ PlayerSettings:
   scriptingBackend: {}
   incrementalIl2cppBuild: {}
   additionalIl2CppArgs: 
+  scriptingRuntimeVersion: 0
+  apiCompatibilityLevelPerPlatform:
+    Android: 1
+    Standalone: 1
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: MyLovelyGarden
@@ -478,14 +620,22 @@ PlayerSettings:
   XboxOneSplashScreen: {fileID: 0}
   XboxOneAllowedProductIds: []
   XboxOnePersistentLocalStorageSize: 0
-  vrEditorSettings: {}
+  xboxOneScriptCompiler: 0
+  vrEditorSettings:
+    daydream:
+      daydreamIconForeground: {fileID: 0}
+      daydreamIconBackground: {fileID: 0}
   cloudServicesEnabled:
     Build: 0
     Collab: 0
     ErrorHub: 0
     Hub: 0
     UNet: 1
+  facebookSdkVersion: 7.9.4
+  apiCompatibilityLevel: 2
   cloudProjectId: b4188c96-b5ff-4320-bf7e-76fd8d448514
   projectName: My Lovely Garden
   organizationId: dashgame-qilin
   cloudEnabled: 0
+  enableNativePlatformBackendsForNewInputSystem: 0
+  disableOldInputManagerSupport: 0

+ 1 - 1
ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.2f1
+m_EditorVersion: 2017.2.0f3

+ 8 - 1
ProjectSettings/UnityConnectSettings.asset

@@ -7,8 +7,10 @@ UnityConnectSettings:
   m_TestMode: 0
   m_TestEventUrl: 
   m_TestConfigUrl: 
+  m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
+    m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
     m_Enabled: 0
     m_CaptureEditorExceptions: 1
   UnityPurchasingSettings:
@@ -24,6 +26,11 @@ UnityConnectSettings:
     m_Enabled: 0
     m_InitializeOnStartup: 0
     m_TestMode: 0
-    m_EnabledPlatforms: 4294964991
     m_IosGameId: 1408492
     m_AndroidGameId: 1408493
+    m_GameIds:
+      AndroidPlayer: 1408493
+      iPhonePlayer: 1408492
+    m_GameId: 
+  PerformanceReportingSettings:
+    m_Enabled: 0

+ 4 - 0
UnityPackageManager/manifest.json

@@ -0,0 +1,4 @@
+{
+	"dependencies": {
+	}
+}