Browse Source

Temp 5.15

LiuQilin 8 years ago
parent
commit
069a90957b

BIN
.vs/MyLovelyGarden/v14/.suo


+ 0 - 1
Assets/Plugins/ShareSDK/Android/AndroidImpl.cs

@@ -104,7 +104,6 @@ namespace cn.sharesdk.unity3d
 
 		public override void ShowShareContentEditor (int reqID, PlatformType platform, ShareContent content) 
 		{
-			Debug.Log("AndroidImpl  ===>>>  OnekeyShare platform ===" + (int)platform );
 			if (ssdk != null) 
 			{
 				ssdk.Call("onekeyShare", reqID, (int)platform, content.GetShareParamsStr());

BIN
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupD.prefab


+ 2 - 1
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -55,8 +55,9 @@
     <L_AudioTit desc=""><![CDATA[音效]]></L_AudioTit>
     <L_MusicLab desc=""><![CDATA[音乐]]></L_MusicLab>
     <L_AudioLab desc=""><![CDATA[音效]]></L_AudioLab>
-    <L_ReportTit desc=""><![CDATA[支持]]></L_ReportTit>
+    <L_SupportTit desc=""><![CDATA[支持]]></L_SupportTit>
     <L_ReportLab desc=""><![CDATA[提交问题]]></L_ReportLab>
+    <L_ShareLab desc=""><![CDATA[分享]]></L_ShareLab>
     <L_ConfirmLab desc=""><![CDATA[确定]]></L_ConfirmLab>
     <L_LanguageTit desc=""><![CDATA[语言]]></L_LanguageTit>
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>

+ 2 - 1
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -55,8 +55,9 @@
     <L_AudioTit desc=""><![CDATA[音效]]></L_AudioTit>
     <L_MusicLab desc=""><![CDATA[音樂]]></L_MusicLab>
     <L_AudioLab desc=""><![CDATA[音效]]></L_AudioLab>
-    <L_ReportTit desc=""><![CDATA[支持]]></L_ReportTit>
+    <L_SupportTit desc=""><![CDATA[支持]]></L_SupportTit>
     <L_ReportLab desc=""><![CDATA[提交問題]]></L_ReportLab>
+    <L_ShareLab desc=""><![CDATA[分享]]></L_ShareLab>
     <L_ConfirmLab desc=""><![CDATA[確定]]></L_ConfirmLab>
     <L_LanguageTit desc=""><![CDATA[語言]]></L_LanguageTit>
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>

+ 2 - 1
Assets/Resource/XML/lan/English.xml

@@ -55,8 +55,9 @@
     <L_AudioTit desc=""><![CDATA[Audio]]></L_AudioTit>
     <L_MusicLab desc=""><![CDATA[Music]]></L_MusicLab>
     <L_AudioLab desc=""><![CDATA[Audio]]></L_AudioLab>
-    <L_ReportTit desc=""><![CDATA[Support]]></L_ReportTit>
+    <L_SupportTit desc=""><![CDATA[Support]]></L_SupportTit>
     <L_ReportLab desc=""><![CDATA[Report issue]]></L_ReportLab>
+    <L_ShareLab desc=""><![CDATA[Share]]></L_ShareLab>
     <L_ConfirmLab desc=""><![CDATA[Confirm]]></L_ConfirmLab>
     <L_LanguageTit desc=""><![CDATA[Language]]></L_LanguageTit>
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 14 - 1
Assets/Script/Manage/ManaData.cs

@@ -268,6 +268,7 @@ public class ManaData : Regist
     public static bool MiniValid;
     public static bool FirstFrame = true;
     public static bool TabBtnValid;
+    public static bool ReactiveRequest;
     public static bool InitiateComplete;
     public static float Elapse;
     public static float OpTimer;
@@ -512,7 +513,9 @@ public class ManaData : Regist
             if (!ManaTutorial.TutorialA && !ManaTutorial.TutorialB)
             {
                 ManaReso.Get("C_Group").TweenConBacCG();
+
                 ManaReso.Get("B_SignIn").TweenConForCG();
+                ManaReso.Get("Ba_Notice").TweenConForCG();
             }
         }
     }
@@ -872,7 +875,8 @@ public class ManaData : Regist
         {
             if (!ManaTutorial.TutorialA)
             {
-                ManaReso.Get("B_SignIn").TweenForCG();
+                ManaReso.Get("B_SignIn").TweenConForCG();
+                ManaReso.Get("Ba_Notice").TweenConForCG();
             }
         }
 
@@ -886,6 +890,8 @@ public class ManaData : Regist
 
     public static void LoginCallbackReactive(JsonData jsonData)
     {
+        ReactiveRequest = false;
+
         for (int i = 0; i < Initializer.RegistList.Count; i++)
         {
             Initializer.RegistList[i].Reactive();
@@ -980,6 +986,13 @@ public class ManaData : Regist
                     return;
                 }
 
+                if (ReactiveRequest)
+                {
+                    return;
+                }
+
+                ReactiveRequest = true;
+
                 ManaServer.Login(LoginCallbackReactive);
             }
         }

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

@@ -622,7 +622,7 @@ public class ManaMiniGame : Regist
     public static float OpTime = 1.5f;
     public static float OpTimer;
     public static float GoldTimer;
-    public static float GameTime = 5;
+    public static float GameTime = 45;
     public static float PanaltyTime = 1;
     public static float NewOpTime;
     public static float PanaltyTimer;

+ 3 - 1
Assets/Script/Manage/ManaServer.cs

@@ -68,7 +68,7 @@ public class ManaServer : Regist
 
     private void Update()
     {
-        if (!ManaData.InitiateComplete)
+        if (!ManaData.InitiateComplete && !LoginComplete)
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
 
@@ -91,6 +91,8 @@ public class ManaServer : Regist
 
     private static void LoginCallback(JsonData jsonData)
     {
+        ManaDebug.Log(jsonData.ToJson());
+
         LoginComplete = true;
 
         if (jsonData.Inst_Object.ContainsKey("c"))

+ 21 - 12
Assets/Script/Manage/ManaUI.cs

@@ -117,13 +117,15 @@ public class ManaUI : Regist
 
                 if (daySpan >= 1 || monthSpan >= 1)
                 {
-                    ManaReso.Get("Bb_SignIn").TweenForCG();
+                    ManaReso.Get("Ba_Notice").TweenBacCG();
+                    ManaReso.Get("Bb_SignIn").TweenConForCG();
 
                     ManaReso.SetActive("Ba_Notice", false);
                 }
                 else
                 {
                     ManaReso.Get("B_SignIn").TweenBacCG();
+                    ManaReso.Get("Ba_Notice").TweenBacCG();
                 }
             }
         );
@@ -307,9 +309,6 @@ public class ManaUI : Regist
             () =>
             {
                 ManaMiniGame.Operate(OpType.Rip);
-
-                ManaReso.Get("D_Rip2").TweenForScale();
-                ManaAudio.PlayClip(Clip.BtnClip);
             }
         );
 
@@ -402,9 +401,6 @@ public class ManaUI : Regist
             () =>
             {
                 ManaMiniGame.Operate(OpType.Water);
-
-                ManaReso.Get("D_Water2").TweenForScale();
-                ManaAudio.PlayClip(Clip.BtnClip);
             }
         );
 
@@ -426,9 +422,6 @@ public class ManaUI : Regist
             () =>
             {
                 ManaMiniGame.Operate(OpType.Fertilize);
-
-                ManaReso.Get("D_Fertilize2").TweenForScale();
-                ManaAudio.PlayClip(Clip.BtnClip);
             }
         );
 
@@ -1275,13 +1268,14 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("L_Tit"), new LanStr("UI", "L_Tit"));
         ManaLan.Add(ManaReso.Get<Text>("L_UserTit"), new LanStr("UI", "L_UserTit"));
         ManaLan.Add(ManaReso.Get<Text>("L_AudioTit"), new LanStr("UI", "L_AudioTit"));
-        ManaLan.Add(ManaReso.Get<Text>("L_ReportTit"), new LanStr("UI", "L_ReportTit"));
+        ManaLan.Add(ManaReso.Get<Text>("L_SupportTit"), new LanStr("UI", "L_SupportTit"));
         ManaLan.Add(ManaReso.Get<Text>("L_LanguageTit"), new LanStr("UI", "L_LanguageTit"));
-
+        
         ManaLan.Add(ManaReso.Get<Text>("L_AudioLab"), new LanStr("UI", "L_AudioLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_MusicLab"), new LanStr("UI", "L_MusicLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ReportLab"), new LanStr("UI", "L_ReportLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ChangeLab"), new LanStr("UI", "L_ChangeLab"));
+        ManaLan.Add(ManaReso.Get<Text>("L_ShareLab"), new LanStr("UI", "L_ShareLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ConfirmLab"), new LanStr("UI", "L_ConfirmLab"));
 
         ManaLan.Add(ManaReso.Get<Text>("L_TraChiLab"), new LanStr("UI", "L_TraChiLab"));
@@ -1347,6 +1341,21 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region L_ShareBtn
+
+        ManaReso.SetButtonEvent
+        (
+            "L_ShareBtn",
+            () =>
+            {
+                ManagerIAP.Share();
+
+                ManaAudio.PlayClip(Clip.BtnClip);
+            }
+        );
+
+        #endregion
+
         #region L_MusicBtn
 
         ManaReso.SetButtonEvent

+ 52 - 2
Assets/Script/Manage/ManagerIAP.cs

@@ -45,9 +45,9 @@ public class ManagerIAP : MonoBehaviour, IStoreListener
 
         UnityPurchasing.Initialize(Instance, cb);
 
-        //ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
+        ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
 
-        //ShareSdk.Initialize();
+        ShareSdk.Initialize();
     }
 
     public static void InitializeAd()
@@ -157,4 +157,54 @@ public class ManagerIAP : MonoBehaviour, IStoreListener
     {
         Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
     }
+
+
+    public static void Share()
+    {
+        ShareContent shareContent = new ShareContent();
+
+        shareContent.SetText("Text");
+        shareContent.SetTitle("Title");
+        shareContent.SetUrl("http://www.baidu.com");
+        shareContent.SetShareType(ContentType.App);
+
+        ShareSdk.ShowPlatformList(null, shareContent, 100, 100);
+    }
+
+    public static void Authorize()
+    {
+        ShareSdk.Authorize(PlatformType.QQ);
+    }
+
+    public static void ShareCallback(int reqID, ResponseState state, PlatformType type, Hashtable result)
+    {
+        if (state == ResponseState.Success)
+        {
+            print("Success");
+        }
+        else if (state == ResponseState.Fail)
+        {
+            print("Fail");
+        }
+        else if (state == ResponseState.Cancel)
+        {
+            print("Cancel");
+        }
+    }
+
+    public static void AuthorizeCallback(int reqID, ResponseState state, PlatformType type, Hashtable result)
+    {
+        if (state == ResponseState.Success)
+        {
+            print("Success");
+        }
+        else if (state == ResponseState.Fail)
+        {
+            print("Fail");
+        }
+        else if (state == ResponseState.Cancel)
+        {
+            print("Cancel");
+        }
+    }
 }

+ 17 - 0
Assets/Script/Object/Flower.cs

@@ -415,6 +415,19 @@ public class Flower : Regist, IPointerClickHandler
 
     public bool Operate(OpType opType)
     {
+        if (opType == OpType.Rip)
+        {
+            ManaReso.Get("D_Rip2").TweenForScale();
+        }
+        else if (opType == OpType.Water)
+        {
+            ManaReso.Get("D_Water2").TweenForScale();
+        }
+        else if (opType == OpType.Fertilize)
+        {
+            ManaReso.Get("D_Fertilize2").TweenForScale();
+        }
+
         if (opType != OpType) //操作错误
         {
             OperateBk.TweenForSr();
@@ -423,6 +436,8 @@ public class Flower : Regist, IPointerClickHandler
 
             OperateIcon.Shake(0.5f, 3, new Vector3(0.2f, 0, 0), Curve.EaseOutQuad);
 
+            ManaAudio.PlayClip(Clip.ErrorClip);
+
             return false;
         }
         else //操作正确
@@ -441,6 +456,8 @@ public class Flower : Regist, IPointerClickHandler
             OperateIcon.SetActive(false);
             OperateOutline.SetActive(false);
 
+            ManaAudio.PlayClip(Clip.BtnClip);
+
             return true;
         }
     }

+ 1 - 1
Assets/Script/Tool/Anim/TweenCG.cs

@@ -130,7 +130,7 @@ public class TweenCG : Tween
         else
         {
             Target.alpha = Func(Timer, Duration, Origin, Delta);
-
+            
             return false;
         }
     }

+ 0 - 75
Assets/Share.cs

@@ -1,75 +0,0 @@
-using UnityEngine;
-
-using System.Collections;
-using System.Collections.Generic;
-using cn.sharesdk.unity3d;
-
-public class Share : MonoBehaviour
-{
-	#region 变量
-
-    public ShareSDK ShareSdk;
-
-    #endregion
-
-	private void Awake()
-	{
-	    ShareSdk.shareHandler = ShareCallback;
-	    ShareSdk.showUserHandler = AuthorizeCallback;
-    }
-
-    private void FixedUpdate()
-    {
-		
-	}
-
-    public void ShareTest()
-    {
-        ShareContent shareContent = new ShareContent();
-
-        shareContent.SetText("SetText");
-        shareContent.SetTitle("SetTitle");
-        shareContent.SetSite("SetSite");
-        shareContent.SetComment("SetComment");
-        shareContent.SetShareType(ContentType.App);
-
-        ShareSdk.ShowPlatformList(null, shareContent, 100, 100);
-    }
-
-    public void AuthorizeTest()
-    {
-        ShareSdk.Authorize(PlatformType.QQ);
-    }
-
-    public void ShareCallback(int reqID, ResponseState state, PlatformType type, Hashtable result)
-    {
-        if (state == ResponseState.Success)
-        {
-            print("Success");
-        }
-        else if (state == ResponseState.Fail)
-        {
-            print("Fail");
-        }
-        else if (state == ResponseState.Cancel)
-        {
-            print("Cancel");
-        }
-    }
-
-    public void AuthorizeCallback(int reqID, ResponseState state, PlatformType type, Hashtable result)
-    {
-        if (state == ResponseState.Success)
-        {
-            print("Success");
-        }
-        else if (state == ResponseState.Fail)
-        {
-            print("Fail");
-        }
-        else if (state == ResponseState.Cancel)
-        {
-            print("Cancel");
-        }
-    }
-}

+ 0 - 12
Assets/Share.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: f0be4b12904073b42aea41f653a8f6be
-timeCreated: 1494578710
-licenseType: Pro
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 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 - 4
MyLovelyGarden.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Subset 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>
@@ -253,7 +253,6 @@
     <Compile Include="Assets\Script\Utils\MD5Util.cs" />
     <Compile Include="Assets\Script\Utils\NumberUtil.cs" />
     <Compile Include="Assets\Script\Utils\StringUtil.cs" />
-    <Compile Include="Assets\Share.cs" />
     <Compile Include="Assets\ShareSDKiOSAutoPackage\ManagePlatforms.cs" />
   </ItemGroup>
   <ItemGroup>

BIN
ProjectSettings/GraphicsSettings.asset


+ 0 - 5
ToList.txt

@@ -1,12 +1,7 @@
 图文混排(显示多个图片 缩进后能自动换行)
 
-小游戏错误的时候使用Error音效
-
-
 注册Bug
 
-加载的时候切换后台会出现Bug
-
 红色小蝴蝶和教程B冲突了
 
 分享