소스 검색

Update 6.6

LiuQilin 8 년 전
부모
커밋
431a7d1cc9
34개의 변경된 파일167개의 추가작업 그리고 202개의 파일을 삭제
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. 0 9
      Assets/Advertisements/Editor.meta
  3. 0 9
      Assets/Advertisements/Editor/Resources.meta
  4. 0 9
      Assets/Advertisements/Editor/Resources/Android.meta
  5. 0 9
      Assets/Advertisements/Editor/Resources/Android/builds.meta
  6. 0 8
      Assets/Advertisements/Editor/Resources/Android/builds.zip.meta
  7. 0 9
      Assets/Advertisements/Editor/Resources/iOS.meta
  8. 2 2
      Assets/Extension.meta
  9. 3 1
      Assets/Plugins/Android.meta
  10. BIN
      Assets/Plugins/Android/UnityAds.aar
  11. 7 0
      Assets/Plugins/Android/UnityAds.aar.meta
  12. 0 7
      Assets/Plugins/ShareSDK/iOS.meta
  13. 3 3
      Assets/Plugins/UnityPurchasing.meta
  14. 1 1
      Assets/Plugins/UnityPurchasing/Editor.meta
  15. 3 1
      Assets/Plugins/iOS.meta
  16. 1 1
      Assets/Resource/XML/PlayerConfig.xml
  17. 3 3
      Assets/Script/Manage/ManaData.cs
  18. 3 3
      Assets/Script/Manage/ManaIAP.cs
  19. 2 23
      Assets/Script/Manage/ManaServer.cs
  20. 36 42
      Assets/Script/Manage/ManaUI.cs
  21. 9 10
      Assets/Script/Object/Skill/Ability.cs
  22. 7 7
      Assets/Script/Object/Skill/BigSkill.cs
  23. 1 3
      Assets/Script/Object/Skill/Pack.cs
  24. 20 3
      Assets/Script/Object/Skill/Skill.cs
  25. 12 0
      Assets/Script/Object/Skill/SkillRoot.cs
  26. 19 1
      Assets/Script/Object/Slot.cs
  27. 1 2
      Assets/Script/Tool/Auxiliary.cs
  28. 2 1
      Assets/Script/Tool/UI/Bubble.cs
  29. 2 2
      Assets/UnityAds.meta
  30. 3 3
      MyLovelyGarden.Editor.csproj
  31. 3 3
      MyLovelyGarden.csproj
  32. 23 26
      MyLovelyGarden.sln
  33. BIN
      ProjectSettings/UnityConnectSettings.asset
  34. 1 1
      ToList.txt

BIN
.vs/MyLovelyGarden/v14/.suo


+ 0 - 9
Assets/Advertisements/Editor.meta

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

+ 0 - 9
Assets/Advertisements/Editor/Resources.meta

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

+ 0 - 9
Assets/Advertisements/Editor/Resources/Android.meta

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

+ 0 - 9
Assets/Advertisements/Editor/Resources/Android/builds.meta

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

+ 0 - 8
Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Advertisements/Editor/Resources/iOS.meta

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

+ 2 - 2
Assets/Advertisements.meta → Assets/Extension.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 2f772eda1dbb58c47b256a1693b65911
+guid: b948198483a8b93419206e81215060f3
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1496150477
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 3 - 1
Assets/Plugins/Android.meta

@@ -1,6 +1,8 @@
 fileFormatVersion: 2
-guid: 9bd7c367fb0a40c4fb5b3fb99edbec3e
+guid: 3a9f7448830297d42b1500706b989fe9
 folderAsset: yes
+timeCreated: 1496738231
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

BIN
Assets/Plugins/Android/UnityAds.aar


+ 7 - 0
Assets/Plugins/Android/UnityAds.aar.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c7905556f07564410bd4fb75975e28fa
+PluginImporter:
+  serializedVersion: 1
+  platformData:
+    Android:
+      enabled: 1

+ 0 - 7
Assets/Plugins/ShareSDK/iOS.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: db9454787e4284fa9899244d3663dcd4
-folderAsset: yes
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 3 - 3
Assets/Plugins/UnityPurchasing.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 07c95e9d1deb9ae4b918385a72cb51a7
+guid: 2628f297056214eb5bfc03285c5c8e77
 folderAsset: yes
-timeCreated: 1494487010
-licenseType: Pro
+timeCreated: 1437430165
+licenseType: Store
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 1 - 1
Assets/Plugins/UnityPurchasing/Editor.meta

@@ -2,7 +2,7 @@ fileFormatVersion: 2
 guid: beabab81fac9c4cfeb330a7a850aeccc
 folderAsset: yes
 timeCreated: 1456232042
-licenseType: Pro
+licenseType: Store
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 3 - 1
Assets/Plugins/iOS.meta

@@ -1,6 +1,8 @@
 fileFormatVersion: 2
-guid: 091987eeef9232240963d4755d7ea67e
+guid: 87afa51c0c7e9cf48bfa4d4b760061ba
 folderAsset: yes
+timeCreated: 1496738232
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 1 - 1
Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="530" />
+  <Version value="540" />
 
   <ID value="Default" />
 ////  <TutorialA value="1" />

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

@@ -348,7 +348,7 @@ public class ManaData
         {
             return;
         }
-
+        
         XmlAttributeCollection attribute = PlayerNode.SelectSingleNode("PlantList").Attributes;
 
         attribute[0].Value = "";
@@ -356,8 +356,8 @@ public class ManaData
         for (int i = 0; i < ManaGarden.PlantList.Count; i++)
         {
             Slot slot = ManaGarden.PlantList[i];
-
-            attribute[0].Value = slot.ID + "," + slot.Index + " ";
+            
+            attribute[0].Value += slot.ID + "," + slot.Index + " ";
         }
 
         attribute[0].Value = attribute[0].Value.TrimEnd(' ');

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

@@ -70,15 +70,15 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     {
         if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            Advertisement.Initialize("1408492");
+            Advertisement.Initialize("1408492", true);
         }
         else if (Application.isMobilePlatform)
         {
-            Advertisement.Initialize("1408493");
+            Advertisement.Initialize("1408493", true);
         }
         else if (Application.isEditor)
         {
-            Advertisement.Initialize("1408493");
+            Advertisement.Initialize("1408493", true);
         }
     }
 

+ 2 - 23
Assets/Script/Manage/ManaServer.cs

@@ -73,30 +73,9 @@ public class ManaServer : Regist
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
 
-            if (Timer >= 27.5f)
+            if (Timer >= 2.5f)
             {
-                Complete = true;
-
-                Debug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
-                ManaDebug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
-
-                ManaCenter.LoginCallbackInitial(new JsonData());
-            }
-            else if (Timer >= 15f && Timer <= 20)
-            {
-                Timer += 10;
-
-                Debug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
-                ManaDebug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
-
-                Login(ManaCenter.LoginCallbackInitial);
-            }
-            else if (Timer >= 2.5f && Timer <= 10)
-            {
-                Timer += 10;
-
-                Debug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
-                ManaDebug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
+                Timer = 0;
 
                 Login(ManaCenter.LoginCallbackInitial);
             }

+ 36 - 42
Assets/Script/Manage/ManaUI.cs

@@ -16,48 +16,6 @@ public class ManaUI : Regist
 {
     #region 变量
 
-    public static int SkillDepth
-    {
-        get { return SkillDepth_; }
-        set
-        {
-            SkillDepth_ = value;
-
-            if (ManaTutorial.TutorialA)
-            {
-                return;
-            }
-
-            TweenOutline tween = ManaReso.Get("C_Manage").GetTweenOutline();
-
-            if (SkillDepth_ == 0)
-            {
-                tween.Target.enabled = false;
-
-                tween.Pause();
-            }
-            else if (SkillDepth_ > 0)
-            {
-                if (tween.InPause)
-                {
-                    tween.Resume();
-
-                    tween.Target.enabled = true;
-                }
-                else
-                {
-                    tween.StartForward();
-                }
-            }
-            else
-            {
-                throw new Exception();
-            }
-        }
-    }
-
-    public static int SkillDepth_;
-
     public static ManaUI Instance;
     public static Transform Canvas;
     public static Transform Camera;
@@ -1808,4 +1766,40 @@ public class ManaUI : Regist
             ManaReso.SetText("Fg_Lab", Language.GetStr("UI", "Fg_Lab3"));
         }
     }
+
+
+    public static void UpdateHint()
+    {
+        if (ManaTutorial.TutorialA)
+        {
+            return;
+        }
+
+
+        TweenOutline tween = ManaReso.Get("C_Manage").GetTweenOutline();
+
+        for (int i = 0; i < ManaCenter.SkillList.Count; i++)
+        {
+            if (ManaCenter.SkillList[i].ItemStatus == SkillStatus.UnLock)
+            {
+                if (tween.InPause)
+                {
+                    tween.Resume();
+
+                    tween.Target.enabled = true;
+                }
+                else
+                {
+                    tween.StartForward();
+                }
+                
+                return;
+            }
+        }
+
+
+        tween.Target.enabled = false;
+
+        tween.Pause();
+    }
 }

+ 9 - 10
Assets/Script/Object/Skill/Ability.cs

@@ -61,7 +61,7 @@ public class Ability : SkillRoot
     public float NewCoinPerson;
     public double NewUpgradeAmt;
 
-    public SkillStatus ItemStatus
+    public override SkillStatus ItemStatus
     {
         get { return ItemStatus_; }
         set
@@ -98,8 +98,6 @@ public class Ability : SkillRoot
         }
     }
 
-    public SkillStatus ItemStatus_;
-
     #endregion
 
     public Ability(XmlAttributeCollection attribute)
@@ -209,7 +207,7 @@ public class Ability : SkillRoot
         }
         else if (ItemStatus_ == SkillStatus.UnLock)
         {
-            ManaUI.SkillDepth++;
+            ManaUI.UpdateHint();
         }
 
 
@@ -369,7 +367,8 @@ public class Ability : SkillRoot
 
     protected void Unlock()
     {
-        ManaCenter.Pay(
+        ManaCenter.Pay
+        (
             ID,
             UnlockAmt,
             UnlockCur,
@@ -377,13 +376,13 @@ public class Ability : SkillRoot
             {
                 ManaAudio.PlayClip(Clip.SkillClip);
 
+                ItemStatus = SkillStatus.Upgrade;
+
                 if (UnlockCur != Current.Free)
                 {
-                    ManaUI.SkillDepth--;
+                    ManaUI.UpdateHint();
                 }
 
-                ItemStatus = SkillStatus.Upgrade;
-
                 Level = 1;
 
                 UseA();
@@ -583,9 +582,9 @@ public class Ability : SkillRoot
                 }
                 else
                 {
-                    ManaUI.SkillDepth++;
-
                     ItemStatus = SkillStatus.UnLock;
+
+                    ManaUI.UpdateHint();
                 }
             }
         }

+ 7 - 7
Assets/Script/Object/Skill/BigSkill.cs

@@ -255,7 +255,7 @@ public class BigSkill : Skill
 
         if (ItemStatus_ == SkillStatus.UnLock)
         {
-            ManaUI.SkillDepth++;
+            ManaUI.UpdateHint();
         }
 
         BarStatus = BarStatus;
@@ -324,9 +324,9 @@ public class BigSkill : Skill
                     }
                     else
                     {
-                        ManaUI.SkillDepth++;
-
                         ItemStatus = SkillStatus.UnLock;
+
+                        ManaUI.UpdateHint();
                     }
                 }
             }
@@ -355,14 +355,14 @@ public class BigSkill : Skill
             {
                 ManaAudio.PlayClip(Clip.SkillClip);
 
+                BarStatus = SkillStatus.Buy;
+                ItemStatus = SkillStatus.Upgrade;
+
                 if (UnlockCur != Current.Free)
                 {
-                    ManaUI.SkillDepth--;
+                    ManaUI.UpdateHint();
                 }
 
-                BarStatus = SkillStatus.Buy;
-                ItemStatus = SkillStatus.Upgrade;
-
                 Level = 1;
 
                 BarBk1.material = null;

+ 1 - 3
Assets/Script/Object/Skill/Pack.cs

@@ -57,7 +57,7 @@ public class Pack : SkillRoot
         get; set;
     }
 
-    public SkillStatus ItemStatus
+    public override SkillStatus ItemStatus
     {
         get { return ItemStatus_; }
         set
@@ -81,8 +81,6 @@ public class Pack : SkillRoot
         }
     }
 
-    public SkillStatus ItemStatus_;
-
     #endregion
 
     public Pack(XmlAttributeCollection attribute)

+ 20 - 3
Assets/Script/Object/Skill/Skill.cs

@@ -76,7 +76,7 @@ public class Skill : SkillRoot
     protected float NewCoinOnceBuff;
     protected double NewUpgradeAmt;
 
-    public virtual SkillStatus ItemStatus
+    public override SkillStatus ItemStatus
     {
         get { return ItemStatus_; }
         set
@@ -85,6 +85,8 @@ public class Skill : SkillRoot
 
             if (ItemStatus_ == SkillStatus.Buy)
             {
+                ItemBtn.interactable = true;
+
                 if (BuyCur == Current.AD)
                 {
                     ManaLan.Add(ItemBtnLab, new LanStr("Common", "AD"));
@@ -94,15 +96,23 @@ public class Skill : SkillRoot
                     ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
+            else if (ItemStatus_ == SkillStatus.Use)
+            {
+                ItemBtn.interactable = false;
+            }
             else if (ItemStatus_ == SkillStatus.Lock)
             {
+                ItemBtn.interactable = false;
+
                 ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab0"), "\n", new LanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
             }
+            else if (ItemStatus_ == SkillStatus.Cool)
+            {
+                ItemBtn.interactable = false;
+            }
         }
     }
 
-    public SkillStatus ItemStatus_;
-
     #endregion
 
     public Skill(XmlAttributeCollection attribute)
@@ -372,6 +382,13 @@ public class Skill : SkillRoot
         }
         else if (ItemStatus == SkillStatus.Lock)
         {
+            ManaReso.Get("Fe_Info").TweenForCG();
+
+            ManaReso.SetText("Fe_Tit", Name);
+
+            ManaReso.SetSprite("Fe_Icon", Icon);
+
+
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 

+ 12 - 0
Assets/Script/Object/Skill/SkillRoot.cs

@@ -124,6 +124,18 @@ public abstract class SkillRoot
     public SkillType SkillType;
     public Transform SkillItem;
 
+
+    public virtual SkillStatus ItemStatus
+    {
+        get { return ItemStatus_; }
+        set
+        {
+            ItemStatus_ = value;
+        }
+    }
+
+    public SkillStatus ItemStatus_;
+
     #endregion
 
     public static int Sort(SkillRoot skillRootA, SkillRoot skillRootB)

+ 19 - 1
Assets/Script/Object/Slot.cs

@@ -29,11 +29,29 @@ public class Slot : Regist
             }
         }
     }
+    public bool Available
+    {
+        get { return Available_; }
+        set
+        {
+            if (value)
+            {
+                if (Flower == null)
+                {
+                    Available_ = value;
+                }
+            }
+            else
+            {
+                Available_ = value;
+            }
+        }
+    }
 
     public bool Lock_;
+    public bool Available_;
 
     public int Index;
-    public bool Available;
 
     public Flower Flower;
     public TextMesh TextMesh;

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

@@ -114,8 +114,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            Debug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
-            ManaDebug.Log(Initializer.Complete + " " + ManaServer.Complete + " " + ManaCenter.Complete);
+
         }
 
         if (Input.GetKeyDown(KeyCode.Z))

+ 2 - 1
Assets/Script/Tool/UI/Bubble.cs

@@ -122,6 +122,7 @@ public class Bubble : Regist
     {
         Box.TweenBacScale();
         Background.TweenBacGra();
-                ManaAudio.PlayClip(Clip.CloseClip);
+
+        ManaAudio.PlayClip(Clip.CloseClip);
     }
 }

+ 2 - 2
Assets/UnityAds.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 4bb139d230b49304092eea66b454005c
+guid: d53d5cc8714358149b38eb2dbaf4b970
 folderAsset: yes
-timeCreated: 1494485826
+timeCreated: 1496739177
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 3 - 3
MyLovelyGarden.Editor.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
-    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
+    <UnityBuildTarget>Android:13</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

+ 3 - 3
MyLovelyGarden.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
-    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
+    <UnityBuildTarget>Android:13</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

+ 23 - 26
MyLovelyGarden.sln

@@ -1,13 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-firstpass.csproj", "{76439BDA-6081-7FA3-9C3B-368968A7EA5E}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Plugins", "MyLovelyGarden.Plugins.csproj", "{6E74E584-9DFC-C050-676F-69A7C37E7E0C}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,27 +15,24 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

BIN
ProjectSettings/UnityConnectSettings.asset


+ 1 - 1
ToList.txt

@@ -1,3 +1,3 @@
-从Hierrarchy视图中检查是否有Bug
+Unity Ads 代码和ServiceWindow 测试模式
 
 发布前把服务器中的存档清理一次