Update 5.17

Assets/Advertisements/Editor/Resources/Android/builds.meta

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

Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

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

Assets/Advertisements/Editor/Resources/iOS.meta

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

Assets/Plugins/ShareSDK/iOS.meta

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

Assets/Plugins/iOS.meta

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

Assets/Resource/XML/Config/visit_config.xml

@@ -1,17 +1,32 @@
 <data>
-  <item id="1" addtion_fml="c*1" coin_lmt="" time_lmt="43200" />
+  <item id="1" award_rate="0.5" award_min="1" award_max="l*0.5" cool_time="5" cost="5+l*0.8" create="0.75" level_min="" level_max="43200" />
   <comment>
     <id>
 id
 </id>
-    <addtion_fml>
-加成公式
-</addtion_fml>
-    <coin_lmt>
-金币上限
-</coin_lmt>
-    <time_lmt>
-时间上限
-</time_lmt>
+    <award_rate>
+出现金币的概率
+</award_rate>
+    <award_min>
+最低奖励值
+</award_min>
+    <award_max>
+最大奖励值
+</award_max>
+    <cool_time>
+冷却时间
+</cool_time>
+    <cost>
+访问消耗值
+</cost>
+    <create>
+用代码生成花园的概率
+</create>
+    <level_min>
+最小花园等级
+</level_min>
+    <level_max>
+最大花园等级
+</level_max>
   </comment>
 </data>

Assets/Resource/XML/Config/生成存档方案.txt

@@ -0,0 +1,32 @@
+»¨¶ä
+
+Player
+
+PlantList
+
+
+Ability5 10
+
+Ability6 50
+
+Ability10 50
+
+Rainbow 50
+
+Ability7 100
+
+Ability11 100
+
+Tree150
+
+Ability8 150
+
+Ability12 150
+
+Ability9 200
+
+Ability13 200
+
+Bird0 300
+
+Ability14 300 

Assets/Resource/XML/Config/生成存档方案.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1b6b77c23f3cad9439f19dd4e94a9280
+timeCreated: 1495011405
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,11 +1,13 @@
 <PlayerConfig>
-  <Version value="150" />
+  <Version value="179" />
 
   <ID value="Default" />
-  <TutorialA value="1" />
+////  <TutorialA value="0" />
   <TutorialB value="1" />
+////  <TutorialC value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
+  <TutorialIndexC value="1" />
 
   <Player value="PlayerBlond" />
   <QuitFlag value="0" />
@@ -15,7 +17,7 @@
   
   <Slot value="1" />
   <Coin value="0" />
-  <Level value="0" />
+////  <Level value="20" />
   <Diamond value="0" />
   <SignIndex value="1" />
   <SignRound value="1" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -1,6 +1,7 @@
 <lan>
   <UI>
     <C_MiniGameLab desc=""><![CDATA[快来打理花园吧！]]></C_MiniGameLab>
+    <C_GardenLab desc=""><![CDATA[等级]]></C_GardenLab>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -1,6 +1,7 @@
 <lan>
   <UI>
     <C_MiniGameLab desc=""><![CDATA[快來打理花園吧！]]></C_MiniGameLab>
+    <C_GardenLab desc=""><![CDATA[等級]]></C_GardenLab>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精靈]]></F_ElfLab>

Assets/Resource/XML/lan/English.xml

@@ -1,6 +1,7 @@
 <lan>
   <UI>
     <C_MiniGameLab desc=""><![CDATA[Come to play!]]></C_MiniGameLab>
+    <C_GardenLab desc=""><![CDATA[Level ]]></C_GardenLab>
     <F_StoreLab desc=""><![CDATA[Shop]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[Mag]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[Elf]]></F_ElfLab>

Assets/Script/Manage/Initializer.cs

@@ -28,7 +28,7 @@ public class Initializer : MonoBehaviour
         Instance = this;
         Transform = transform;
 
-        gameObject.AddComponent<ManagerIAP>();
+        gameObject.AddComponent<ManaIAP>();
 
         gameObject.AddScript<Bundle>();
         gameObject.AddScript<Auxiliary>();
@@ -58,9 +58,11 @@ public class Initializer : MonoBehaviour
     {
         ManaTutorial.TutorialA = Data.GetPlayerBool("TutorialA");
         ManaTutorial.TutorialB_ = Data.GetPlayerBool("TutorialB");
+        ManaTutorial.TutorialC_ = Data.GetPlayerBool("TutorialC");
         ManaTutorial.TutorialIndexA = Data.GetPlayerInt("TutorialIndexA");
         ManaTutorial.TutorialIndexB = Data.GetPlayerInt("TutorialIndexB");
-        
+        ManaTutorial.TutorialIndexC = Data.GetPlayerInt("TutorialIndexC");
+
         for (int i = 0; i < RegistList.Count; i++)
         {
             RegistList[i].Instantiate();
@@ -96,7 +98,8 @@ public class Initializer : MonoBehaviour
 
         ManaReso.SetActive("I_Lab", false);
 
-        ManagerIAP.Initialize();
+        ManaIAP.Initialize();
+        ManaVisit.Initialize();
     }
 
 

Assets/Script/Manage/ManaData.cs

@@ -155,13 +155,25 @@ public class ManaData : Regist
                 }
             }
 
-            //if (ManaTutorial.TutorialB_ && !ManaTutorial.TutorialB)
+            if (Level_ >= 20)
+            {
+                if (ManaTutorial.TutorialC_)
+                {
+                    ManaTutorial.PrepareStepC1();
+                }
+                else
+                {
+                    ManaReso.SetActive("C_Visit", true);
+                }
+            }
+
+            //if (Level_ >= 200)
             //{
-            //    if (Level_ >= 200)
+            //    if (ManaTutorial.TutorialB_)
             //    {
             //        ManaTutorial.TutorialB = true;
 
-            //        ManaTutorial.PrepareStep10();
+            //        ManaTutorial.PrepareStepB1();
             //    }
             //}
         }
@@ -765,7 +777,7 @@ public class ManaData : Regist
         Diamond = Diamond;
     }
 
-    public static void Pay(string id, double amt, Current current, UnityAction callback)
+    public static void Pay(string id, double amt, Current current, UnityAction callback, bool navigate = true)
     {
         if (ManaTutorial.PayExempt)
         {
@@ -782,14 +794,16 @@ public class ManaData : Regist
         }
         else if (current == Current.AD)
         {
-            ManagerIAP.PlayAd(callback);
+            ManaIAP.PlayAd(callback);
         }
         else if (current == Current.Cash)
         {
-            ManagerIAP.Purchase(id);
+            ManaIAP.Purchase(id);
         }
         else if (current == Current.Coin)
         {
+            #region MyRegion
+
             if (Coin >= amt)
             {
                 Coin -= amt;
@@ -800,40 +814,56 @@ public class ManaData : Regist
             {
                 ManaReso.Get("Fe_Info").TweenBacCG();
 
-                Bubble.Show
-                (
-                    Language.GetStr("Common", "ShortCoin"),
-                    Language.GetStr("Common", "NavigateCoin"),
-                    ManaReso.LoadSprite("金币"),
-                    () =>
-                    {
-                        Tween tween = ManaReso.Get("K_Bubble0").GetTweenScale();
-
-                        tween.AddEventOnetime
-                        (
-                            EventType.BackwardFinish,
-                            () =>
-                            {
-                                ManaReso.Get<Button>("F_Magic").onClick.Invoke();
-
-                                Auxiliary.Instance.DelayCall
-                                (
-                                    () =>
-                                    {
-                                        int index = ManaReso.Get("Fb_Grid").childCount - 1;
-
-                                        ManaReso.Get<ScrollRect>("Fb_Scrr").Locate(index, 0.25f, Curve.EaseOutQuad, LocatePos.Down);
-                                    },
-                                    1
-                                );
-                            }
-                        );
-                    }
-                );
+                if (navigate)
+                {
+                    Bubble.Show
+                    (
+                        Language.GetStr("Common", "ShortCoin"),
+                        Language.GetStr("Common", "NavigateCoin"),
+                        ManaReso.LoadSprite("金币"),
+                        () =>
+                        {
+                            Tween tween = ManaReso.Get("K_Bubble0").GetTweenScale();
+
+                            tween.AddEventOnetime
+                            (
+                                EventType.BackwardFinish,
+                                () =>
+                                {
+                                    ManaReso.Get<Button>("F_Magic").onClick.Invoke();
+
+                                    Auxiliary.Instance.DelayCall
+                                    (
+                                        () =>
+                                        {
+                                            int index = ManaReso.Get("Fb_Grid").childCount - 1;
+
+                                            ManaReso.Get<ScrollRect>("Fb_Scrr").Locate(index, 0.25f, Curve.EaseOutQuad, LocatePos.Down);
+                                        },
+                                        1
+                                    );
+                                }
+                            );
+                        }
+                    );
+                }
+                else
+                {
+                    Bubble.Show
+                    (
+                        Language.GetStr("Common", "ShortCoin"),
+                        null,
+                        ManaReso.LoadSprite("金币")
+                    );
+                }
             }
+
+            #endregion
         }
         else if (current == Current.Diamond)
         {
+            #region MyRegion
+
             if (Diamond >= amt)
             {
                 Diamond -= amt;
@@ -844,37 +874,51 @@ public class ManaData : Regist
             {
                 ManaReso.Get("Fe_Info").TweenBacCG();
 
-                Bubble.Show
-                (
-                    Language.GetStr("Common", "ShortDiamond"),
-                    Language.GetStr("Common", "NavigateDiamond"),
-                    ManaReso.LoadSprite("钻石"),
-                    () =>
-                    {
-                        Tween tween = ManaReso.Get("K_Bubble0").GetTweenScale();
-
-                        tween.AddEventOnetime
-                        (
-                            EventType.BackwardFinish,
-                            () =>
-                            {
-                                ManaReso.Get<Button>("F_Store").onClick.Invoke();
-
-                                Auxiliary.Instance.DelayCall
-                                (
-                                    () =>
-                                    {
-                                        int index = ManaReso.Get("Fc_Grid").childCount - 1;
-
-                                        ManaReso.Get<ScrollRect>("Fc_Scrr").Locate(index, 0.25f, Curve.EaseOutQuad, LocatePos.Down);
-                                    },
-                                    1
-                                );
-                            }
-                        );
-                    }
-                );
+                if (navigate)
+                {
+                    Bubble.Show
+                    (
+                        Language.GetStr("Common", "ShortDiamond"),
+                        Language.GetStr("Common", "NavigateDiamond"),
+                        ManaReso.LoadSprite("钻石"),
+                        () =>
+                        {
+                            Tween tween = ManaReso.Get("K_Bubble0").GetTweenScale();
+
+                            tween.AddEventOnetime
+                            (
+                                EventType.BackwardFinish,
+                                () =>
+                                {
+                                    ManaReso.Get<Button>("F_Store").onClick.Invoke();
+
+                                    Auxiliary.Instance.DelayCall
+                                    (
+                                        () =>
+                                        {
+                                            int index = ManaReso.Get("Fc_Grid").childCount - 1;
+
+                                            ManaReso.Get<ScrollRect>("Fc_Scrr").Locate(index, 0.25f, Curve.EaseOutQuad, LocatePos.Down);
+                                        },
+                                        1
+                                    );
+                                }
+                            );
+                        }
+                    );
+                }
+                else
+                {
+                    Bubble.Show
+                    (
+                        Language.GetStr("Common", "ShortDiamond"),
+                        null,
+                        ManaReso.LoadSprite("钻石")
+                    );
+                }
             }
+
+            #endregion
         }
         else
         {

Assets/Script/Manage/ManaGarden.cs

@@ -131,7 +131,7 @@ public class ManaGarden : Regist
 
             if (ElfList.Count > 0 && PlantList.Count > 0)
             {
-                PlantList.Random().Flower.PlayAnim(ElfList.Random());
+                PlantList.Random().Flower.GetElf(ElfList.Random());
             }
         }
     }
@@ -301,7 +301,6 @@ public class ManaGarden : Regist
 
         tra.SetLX(offset);
 
-
         Vector3 pos = ManaReso.Get("GardenPage").position;
 
         pos.x = -offset;
@@ -311,7 +310,12 @@ public class ManaGarden : Regist
 
         for (int i = 0; i < 9; i++)
         {
-            Slot slot = tra.GetChild(i).AddScript<Slot>();
+            Slot slot = tra.GetChild(i).GetComponent<Slot>();
+
+            if (slot == null)
+            {
+                slot = tra.GetChild(i).AddScript<Slot>();
+            }
 
             slot.Index = SlotList.Count;
 

Assets/Script/Manage/ManagerIAP.cs → Assets/Script/Manage/ManaIAP.cs

@@ -10,13 +10,13 @@ using UnityEngine.Events;
 using UnityEngine.Purchasing;
 using UnityEngine.UI;
 
-public class ManagerIAP : MonoBehaviour, IStoreListener
+public class ManaIAP : MonoBehaviour, IStoreListener
 {
     #region 变量
 
     public static bool LoadComplete;
     public static UnityAction AdAction;
-    public static ManagerIAP Instance;
+    public static ManaIAP Instance;
     public static IStoreController IStoreController;
     public static IExtensionProvider IExtensionProvider;
 

Assets/Script/Manage/ManagerIAP.cs.meta → Assets/Script/Manage/ManaIAP.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 43f8a26ba0c26db4c91db0c7927cfd4b
-timeCreated: 1494237456
+guid: e53efb19b2a317a4bb955bf55cb5294b
+timeCreated: 1494988462
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

Assets/Script/Manage/ManaReso.cs

@@ -587,7 +587,7 @@ public class ManaReso : Regist
     }
 
 
-    public static HudText GetHudText(string str, Color color, int size, Transform posTra, Transform parTra, bool scene)
+    public static HudText GetHudText(string str, Color color, int size, Transform posTra, Transform parTra, bool scene, float speed = 7.5f, float time = 0.5f)
     {
         Vector3 pos;
 
@@ -604,7 +604,7 @@ public class ManaReso : Regist
 
         HudText hudText = tra.GetComponent<HudText>();
 
-        hudText.Show(str, color, size);
+        hudText.Show(str, color, size, speed, time);
 
         return hudText;
     }

Assets/Script/Manage/ManaServer.cs

@@ -129,6 +129,8 @@ public class ManaServer : Regist
 
     public static void Save()
     {
+        ManaData.SaveTimer = 0;
+
         URLRequestData urlData = new URLRequestData();
         
         urlData.Add("u", ID);

Assets/Script/Manage/ManaTutorial.cs

@@ -61,10 +61,14 @@ public class ManaTutorial : Regist
     public static bool ConnectExempt_;
 
     public static bool TutorialB;
+    public static bool TutorialC;
     public static bool TutorialB_;
+    public static bool TutorialC_;
 
     public static int TutorialIndexA;
     public static int TutorialIndexB;
+    public static int TutorialIndexC;
+
     public static int PayExemptAmt;
     public static int ConnectExemptAmt;
     public static bool TutorialA;
@@ -103,13 +107,13 @@ public class ManaTutorial : Regist
 
             if (TutorialIndexA == 1)
             {
-                PrepareStep1();
+                PrepareStepA1();
             }
             else if (TutorialIndexA == 2)
             {
                 Garden.Instance.TutorialToRegular();
 
-                PrepareStep2();
+                PrepareStepA2();
             }
             else if (TutorialIndexA == 4)
             {
@@ -131,13 +135,13 @@ public class ManaTutorial : Regist
                 Garden.Instance.TutorialToRegular();
                 ManaUI.Instance.TutorialToRegular();
 
-                PrepareStep6();
+                PrepareStepA6();
             }
         }
     }
 
 
-    public static void EndStep1()
+    public static void EndStepA1()
     {
         Garden.Instance.TutorialToRegular();
 
@@ -145,59 +149,59 @@ public class ManaTutorial : Regist
         Destroy(ManaReso.Get("PlayerBk2").gameObject);
         Destroy(ManaReso.Get("PlayerBk3").gameObject);
 
-        PrepareStep2();
+        PrepareStepA2();
     }
 
-    public static void EndStep2()
+    public static void EndStepA2()
     {
         Tutorial.HightDisable();
 
-        PrepareStep3();
+        PrepareStepA3();
     }
 
-    public static void EndStep3()
+    public static void EndStepA3()
     {
         Tutorial.HightDisable();
 
         ManaReso.SetActive("D_Quit", true);
 
-        PrepareStep4();
+        PrepareStepA4();
     }
 
-    public static void EndStep4()
+    public static void EndStepA4()
     {
         Tutorial.HightDisable();
 
-        PrepareStep5();
+        PrepareStepA5();
     }
 
-    public static void EndStep5()
+    public static void EndStepA5()
     {
-        PrepareStep6();
+        PrepareStepA6();
     }
 
-    public static void EndStep6()
+    public static void EndStepA6()
     {
         Tutorial.HightDisable();
 
-        PrepareStep7();
+        PrepareStepA7();
     }
 
-    public static void EndStep7()
+    public static void EndStepA7()
     {
         Tutorial.HightDisable(0, true);
 
-        PrepareStep8();
+        PrepareStepA8();
     }
 
-    public static void EndStep8()
+    public static void EndStepA8()
     {
         Tutorial.HightDisable(0, true);
 
-        PrepareStep9();
+        PrepareStepA9();
     }
 
-    public static void EndStep9()
+    public static void EndA()
     {
         TutorialA = false;
 
@@ -213,7 +217,7 @@ public class ManaTutorial : Regist
     }
 
 
-    public static void PrepareStep1()
+    public static void PrepareStepA1()
     {
         TutorialIndexA = 1;
 
@@ -268,14 +272,14 @@ public class ManaTutorial : Regist
                     EventType.BackwardFinish,
                     () =>
                     {
-                        EndStep1();
+                        EndStepA1();
                     }
                 );
             }
         );
     }
 
-    public static void PrepareStep2()
+    public static void PrepareStepA2()
     {
         TutorialIndexA = 2;
 
@@ -307,12 +311,12 @@ public class ManaTutorial : Regist
             "C_MiniGame",
             () =>
             {
-                EndStep2();
+                EndStepA2();
             }
         );
     }
 
-    public static void PrepareStep3()
+    public static void PrepareStepA3()
     {
         ManaReso.Get("Tutorial").SetCollider(false);
 
@@ -344,12 +348,12 @@ public class ManaTutorial : Regist
             "Da_GetAward",
             () =>
             {
-                EndStep3();
+                EndStepA3();
             }
         );
     }
 
-    public static void PrepareStep4()
+    public static void PrepareStepA4()
     {
         TutorialIndexA = 4;
 
@@ -374,7 +378,7 @@ public class ManaTutorial : Regist
         );
     }
 
-    public static void PrepareStep5()
+    public static void PrepareStepA5()
     {
         Tween tween = ManaReso.Get("G_Flower").TweenForCG();
 
@@ -415,12 +419,12 @@ public class ManaTutorial : Regist
             EventType.BackwardFinish,
             () =>
             {
-                EndStep5();
+                EndStepA5();
             }
         );
     }
 
-    public static void PrepareStep6()
+    public static void PrepareStepA6()
     {
         TutorialIndexA = 6;
 
@@ -446,12 +450,12 @@ public class ManaTutorial : Regist
             "C_Manage",
             () =>
             {
-                EndStep6();
+                EndStepA6();
             }
         );
     }
 
-    public static void PrepareStep7()
+    public static void PrepareStepA7()
     {
         Tween tween = ManaReso.Get("F_Manage0").GetTweenVec();
 
@@ -496,14 +500,14 @@ public class ManaTutorial : Regist
                     () =>
                     {
                         ManaReso.Get("Fe_Info").TweenBacCG();
-                        EndStep7();
+                        EndStepA7();
                     }
                 );
             }
         );
     }
 
-    public static void PrepareStep8()
+    public static void PrepareStepA8()
     {
         Tween tween = ManaReso.Get("Fe_Info").GetTweenCG();
 
@@ -547,14 +551,14 @@ public class ManaTutorial : Regist
                     () =>
                     {
                         ManaReso.Get("Fe_Info").TweenBacCG();
-                        EndStep8();
+                        EndStepA8();
                     }
                 );
             }
         );
     }
 
-    public static void PrepareStep9()
+    public static void PrepareStepA9()
     {
         Tween tween = ManaReso.Get("Fe_Info").GetTweenCG();
 
@@ -575,25 +579,134 @@ public class ManaTutorial : Regist
             "F_SkillBk11",
             () =>
             {
-                EndStep9();
+                EndA();
+            }
+        );
+    }
+
+
+    public static void EndStepC1()
+    {
+        Tutorial.HightDisable();
+    }
+
+    public static void EndC()
+    {
+        TutorialC = false;
+
+        Tutorial.HightDisable();
+
+        ManaReso.SetActive("N_Tutorial", false);
+
+        PayExemptAmt = 0;
+        ConnectExemptAmt = 0;
+    }
+
+    public static void PrepareStepC1()
+    {
+        TutorialC = true;
+        TutorialC_ = false;
+
+        Tween tween = ManaReso.Get("Fe_Info").TweenBacCG();
+
+        tween.AddEventOnetime
+        (
+            EventType.BackwardFinish, 
+            () =>
+            {
+                ManaReso.Get("F_Manage").TweenBacGra();
+
+                tween = ManaReso.Get("C_Group").GetTweenCG();
+
+                tween.AddEventOnetime
+                (
+                    EventType.ForwardFinish,
+                    () =>
+                    {
+                        ManaReso.SetActive("N_Tutorial", true);
+
+                        tween = ManaReso.Get("N_Mask").TweenForGra();
+
+                        tween.AddEventOnetime
+                        (
+                            EventType.ForwardFinish,
+                            () =>
+                            {
+                                PayExemptAmt = 1;
+
+                                ManaReso.SetActive("C_Visit", true);
+
+                                Tutorial.HightScreen(ManaReso.Get("C_VisitArrow0"), ManaReso.Get("C_Visit"));
+
+                                ManaReso.AddButtonEventOnetime
+                                (
+                                    "C_Visit",
+                                    () =>
+                                    {
+                                        EndC();
+
+                                        //EndStepC1();
+
+                                        //PrepareStepC2();
+                                    }
+                                );
+                            }
+                        );
+                    }
+                );
+            }
+        );
+    }
+
+    public static void PrepareStepC2()
+    {
+        Tween tween = ManaReso.Get("I_BlackMask").GetTweenCG();
+
+        tween.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                Auxiliary.Instance.DelayCall
+                (
+                    () =>
+                    {
+                        ManaReso.SetActive("C_Return", true);
+
+                        Tutorial.HightScreen(ManaReso.Get("C_ReturnArrow0"), ManaReso.Get("C_Return"));
+
+                        ManaReso.AddButtonEventOnetime
+                        (
+                            "C_Return",
+                            () =>
+                            {
+                                EndC();
+                            }
+                        );
+                    },
+                    3f
+                );
             }
         );
     }
 
 
-    public static void EndStep10()
+    public static void EndStepB1()
     {
         Tutorial.HightDisable();
     }
 
-    public static void EndStep11()
+    public static void EndB()
     {
         Tutorial.HightDisable();
 
         TutorialB = false;
+
+        PayExemptAmt = 0;
+        ConnectExemptAmt = 0;
     }
 
-    public static void PrepareStep10()
+    public static void PrepareStepB1()
     {
         TutorialB = false;
         TutorialB_ = false;
@@ -609,7 +722,7 @@ public class ManaTutorial : Regist
 
         if (skill.ItemStatus == SkillStatus.Upgrade)
         {
-            PrepareStepB11();
+            PrepareStepB3();
         }
         else
         {
@@ -648,7 +761,7 @@ public class ManaTutorial : Regist
                         "Fe_Btn",
                         () =>
                         {
-                            EndStep10();
+                            EndStepB1();
 
                             move = ManaReso.Get("MainCamera").CreateZoom2D();
 
@@ -657,7 +770,7 @@ public class ManaTutorial : Regist
                                 EventType.ForwardFinish,
                                 () =>
                                 {
-                                    PrepareStepA11();
+                                    PrepareStepB2();
                                 }
                             );
                         }
@@ -667,7 +780,7 @@ public class ManaTutorial : Regist
         }
     }
 
-    public static void PrepareStepA11()
+    public static void PrepareStepB2()
     {
         ManaReso.Get("N_Mask").TweenForGra();
 
@@ -726,14 +839,14 @@ public class ManaTutorial : Regist
                     "Fe_Btn",
                     () =>
                     {
-                        EndStep11();
+                        EndB();
                     }
                 );
             }
         );
     }
 
-    public static void PrepareStepB11()
+    public static void PrepareStepB3()
     {
         Tween tween = ManaReso.Get("Fe_Info").TweenBacCG();
 
@@ -790,7 +903,7 @@ public class ManaTutorial : Regist
                     "Fe_Btn",
                     () =>
                     {
-                        EndStep11();
+                        EndB();
                     }
                 );
             }

Assets/Script/Manage/ManaUI.cs

@@ -296,29 +296,57 @@ public class ManaUI : Regist
             "C_Visit",
             () =>
             {
-                ManaVisit.TweenFinish = false;
+                ManaData.Pay
+                (
+                    "", ManaVisit.Cost, Current.Coin,
+                    () =>
+                    {
+                        ManaVisit.LoadFinish = false;
+                        ManaVisit.TweenFinish = false;
 
-                ManaVisit.GetArchive();
+                        ManaVisit.GetArchive();
 
-                ManaAudio.PlayClip(Clip.BubbleClip);
+                        ManaAudio.PlayClip(Clip.BubbleClip);
 
-                ManaReso.SetActive("C_Return", false);
+                        ManaReso.SetActive("C_Return", false);
 
+                        ManaReso.GetHudText("-" + ManaVisit.Cost, Color.white, 90, ManaReso.Get("C_VisitHud"), ManaReso.Get("Canvas"), false, 7.5f, 0.25f);
 
-                tween = ManaReso.Get("I_BlackMask").GetTweenCG();
 
-                tween.Duration = 0.5f;
-                tween.StartBackward();
+                        if (ManaVisit.CoolTime != 0)
+                        {
+                            ManaReso.Get<Button>("C_Visit").interactable = false;
 
-                tween.AddEventOnetime
-                (
-                    EventType.BackwardFinish,
-                    () =>
-                    {
-                        ManaVisit.TweenFinish = true;
+                            tween = ManaReso.Get("C_VisitLab").StreamForScale();
 
-                        ManaVisit.Enter();
-                    }
+                            tween.AddEventOnetime
+                            (
+                                EventType.ForwardFinish,
+                                () =>
+                                {
+                                    ManaReso.Get<Button>("C_Visit").interactable = true;
+                                }
+                            );
+                        }
+
+
+                        tween = ManaReso.Get("I_BlackMask").GetTweenCG();
+
+                        tween.Duration = 0.5f;
+                        tween.StartBackward();
+
+                        tween.AddEventOnetime
+                        (
+                            EventType.BackwardFinish,
+                            () =>
+                            {
+                                ManaVisit.TweenFinish = true;
+
+                                ManaVisit.Enter();
+                            }
+                        );
+                    },
+                    false
                 );
             }
         );
@@ -332,6 +360,9 @@ public class ManaUI : Regist
             "C_Return",
             () =>
             {
+                ManaReso.SetActive("C_Visit", false);
+                ManaReso.SetActive("C_Return", false);
+
                 tween = ManaReso.Get("I_BlackMask").GetTweenCG();
 
                 tween.Duration = 0.5f;
@@ -757,8 +788,6 @@ public class ManaUI : Regist
             "Ea_Send",
             () =>
             {
-                ManaData.SaveTimer = 0;
-
                 ManaServer.Save();
             }
         );
@@ -1449,7 +1478,7 @@ public class ManaUI : Regist
             "L_ShareBtn",
             () =>
             {
-                ManagerIAP.Share();
+                ManaIAP.Share();
 
                 ManaAudio.PlayClip(Clip.BtnClip);
             }

Assets/Script/Manage/ManaVisit.cs

@@ -4,6 +4,8 @@ using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
 using LitJson;
+using UnityEngine.Events;
+using UnityEngine.UI;
 
 public class ManaVisit  
 {
@@ -11,9 +13,14 @@ public class ManaVisit
 
     #region 配置
 
+    public static int Cost;
     public static int LevelMin;
     public static int LevelMax;
-    public static float CreatePosi;
+    public static int CoolTime;
+    public static int AwardMin;
+    public static int AwardMax;
+    public static float AwardRate;
+    public static float CreateRate;
 
     #endregion
 
@@ -38,9 +45,83 @@ public class ManaVisit
 
     #endregion
 
-    public void Regist()
+    public static void Initialize()
     {
-        CreatePosi = 0.75f;
+        XmlAttributeCollection attribute = Data.GetVisitConfig();
+
+        Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(attribute[5].Value, "l", ManaData.Level.ToString()));
+        AwardMin = Mathf.CeilToInt((float) Auxiliary.FmlParse(attribute[2].Value));
+        AwardMax = Mathf.CeilToInt((float)Auxiliary.FmlParse(attribute[3].Value, "l", ManaData.Level.ToString()));
+
+        CoolTime = int.Parse(attribute[4].Value);
+        AwardRate = float.Parse(attribute[1].Value);
+        
+        #region 倒计时
+
+        if (CoolTime != 0)
+        {
+            Text text = ManaReso.Get<Text>("C_VisitLab");
+
+            List<float> delayList = new List<float>();
+            List<float> durationList = new List<float>();
+            List<VecPair> pairList = new List<VecPair>();
+            List<UnityAction> actionList = new List<UnityAction>();
+
+            Vector3 v1 = new Vector3(0.75f, 0.75f, 0.75f);
+            Vector3 v2 = new Vector3(0.4f, 0.4f, 0.4f);
+            Vector3 v3 = new Vector3(0, 0, 0);
+
+            for (int i = 0; i < CoolTime - 1; i++)
+            {
+                delayList.Add(0.5f);
+                delayList.Add(0);
+            }
+
+            delayList.Add(0.5f);
+
+            for (int i = 0; i < CoolTime; i++)
+            {
+                durationList.Add(0.25f);
+                durationList.Add(0.25f);
+
+                pairList.Add(new VecPair(v1, v2));
+                pairList.Add(new VecPair(v2, v3));
+
+                var tempInt = i;
+                actionList.Add
+                (
+                    () =>
+                    {
+                        text.text = (CoolTime - tempInt).ToString();
+                        ManaAudio.PlayClip(Clip.BtnClip);
+                    }
+                );
+
+                actionList.Add(null);
+            }
+
+            actionList.Add
+            (
+                () =>
+                {
+                    ManaAudio.PlayClip(Clip.BubbleClip);
+                }
+            );
+
+            ManaReso.Get("C_VisitLab").CreateStreamScale
+            (
+                delayList,
+                durationList,
+                pairList,
+                true,
+                false,
+                Curve.EaseOutQuad,
+                false,
+                actionList
+            );
+        }
+
+        #endregion
     }
 
 
@@ -48,7 +129,15 @@ public class ManaVisit
     {
         ManaReso.Get("I_BlackMask").TweenForCG();
 
+        ManaReso.SetActive("C_Visit", true);
+        ManaReso.SetActive("C_Coin", true);
+        ManaReso.SetActive("C_Group1", true);
+        ManaReso.SetActive("C_Group2", true);
+
         ManaReso.SetActive("C_Return", false);
+        ManaReso.SetActive("C_Garden", false);
+
+        ManaGarden.AwardValid = true;
 
         #region Garden
 
@@ -59,11 +148,18 @@ public class ManaVisit
             ManaReso.Save(ManaGarden.PageList[i]);
         }
 
+        ManaGarden.PageList = new List<Transform>();
+
         Garden.CurPage = 0;
         ManaGarden.SlotList = new List<Slot>();
         ManaGarden.PageList = new List<Transform>();
 
 
+        Garden.Garden2.position = Garden.GardenPos2[0];
+        Garden.Garden3.position = Garden.GardenPos3[0];
+        Garden.Garden4.position = Garden.GardenPos4[0];
+        Garden.GardenPage.position = Garden.PagePos[0];
+
         for (int i = 0; i < ManaGarden.SlotAmt / 7 + 2; i++)
         {
             ManaGarden.CreatePage();
@@ -74,10 +170,12 @@ public class ManaVisit
             if (i < ManaGarden.SlotAmt)
             {
                 ManaGarden.SlotList[i].Valid = true;
+                ManaGarden.SlotList[i].Available = true;
             }
             else
             {
                 ManaGarden.SlotList[i].Valid = false;
+                ManaGarden.SlotList[i].Available = false;
             }
         }
 
@@ -154,7 +252,6 @@ public class ManaVisit
 
         ManaReso.Get("I_BlackMask").TweenForCG();
 
-        ManaReso.SetActive("C_Return", true);
 
         Document = new XmlDocument();
         Document.LoadXml(XmlStr);
@@ -165,11 +262,27 @@ public class ManaVisit
         Level = int.Parse(Node.SelectSingleNode("Level").Attributes[0].Value);
         Player = Node.SelectSingleNode("Player").Attributes[0].Value;
 
+
+        ManaReso.SetText("C_GardenLab", Language.GetStr("UI", "C_GardenLab") + Level);
+
+        ManaReso.SetActive("C_Coin", false);
+        ManaReso.SetActive("C_Group1", false);
+        ManaReso.SetActive("C_Group2", false);
+
+        ManaReso.SetActive("C_Garden", true);
+
+        if (!ManaTutorial.TutorialC)
+        {
+            ManaReso.SetActive("C_Return", true);
+        }
+
+        ManaGarden.AwardValid = false;
+
         #region Bird Tree Rainbow
 
         if (!Visit)
         {
-            if (ManaReso.Get("Bird").gameObject.activeSelf)
+            if (ManaReso.Get("Bird0").gameObject.activeSelf)
             {
                 Bird = true;
             }
@@ -303,6 +416,8 @@ public class ManaVisit
             ManaReso.Save(ManaGarden.PageList[i]);
         }
 
+        ManaGarden.PageList = new List<Transform>();
+
         Garden.CurPage = 0;
         ManaGarden.SlotList = new List<Slot>();
         ManaGarden.PageList = new List<Transform>();
@@ -318,17 +433,21 @@ public class ManaVisit
             if (i < Slot)
             {
                 ManaGarden.SlotList[i].Valid = true;
+                ManaGarden.SlotList[i].Available = true;
             }
             else
             {
                 ManaGarden.SlotList[i].Valid = false;
+                ManaGarden.SlotList[i].Available = false;
             }
         }
 
         List<KV<int, int>> plantList = Data.GetPlantList(Node);
         
+        Debug.Log("Count" + ManaGarden.PlantList.Count);
         for (int i = 0; i < plantList.Count; i++)
         {
+            Debug.Log("Plant : " + plantList[i].Key + " " + plantList[i].Value);
             ManaGarden.PlantFlower(plantList[i].Key, plantList[i].Value);
         }
 
@@ -350,6 +469,15 @@ public class ManaVisit
 
         #endregion
 
+        #region Award
+        
+        if (Random.Range(0f,1f) <= AwardRate)
+        {
+            ManaGarden.PlantList.Random().Flower.Award = true;
+        }
+
+        #endregion
+
         Visit = true;
     }
 

Assets/Script/Object/Flower.cs

@@ -465,7 +465,7 @@ public class Flower : Regist, IPointerClickHandler
     #endregion
 
 
-    public void PlayAnim(ObjType obj, float xMin = -0.75f, float xMax = 0.75f, float yMin = 0, float yMax = 0.75f)
+    public void GetElf(ObjType obj, float xMin = -0.75f, float xMax = 0.75f, float yMin = 0, float yMax = 0.75f)
     {
         ElfList.Add(ManaReso.GetElf(this, new Vector4(xMin, xMax, yMin, yMax), obj));
     }
@@ -482,12 +482,23 @@ public class Flower : Regist, IPointerClickHandler
 
         PlayParticle();
 
-        ManaGarden.AwardValid = true;
+        int coin;
 
-        int coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(ManaData.Level, 1, Mathf.Infinity).ToString()));
-        
-        ManaData.Coin += coin;
-        ManaData.FlowerCoin++;
+        if (ManaVisit.Visit)
+        {
+            coin = Mathf.CeilToInt(Mathf.Lerp(ManaVisit.AwardMin, ManaVisit.AwardMax, Random.Range(0f, 1f)));
+
+            ManaData.Coin += coin;
+        }
+        else
+        {
+            ManaGarden.AwardValid = true;
+
+            coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(ManaData.Level, 1, Mathf.Infinity).ToString()));
+
+            ManaData.Coin += coin;
+            ManaData.FlowerCoin++;
+        }
 
         ManaReso.GetHudText("+" + coin, Color.white, 90, ChildDic["GoldPosTra"], ManaReso.Get("A_HudParent"), true);
 

Assets/Script/Object/Garden.cs

@@ -337,6 +337,11 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         if (eventData.rawPointerPress.transform.name.Contains("Slot"))
         {
+            if (ManaVisit.Visit)
+            {
+                return;
+            }
+
             Slot slot = eventData.rawPointerPress.GetComponent<Slot>();
 
             if (slot.Valid == false)

Assets/Script/Object/Skill/Ability.cs

@@ -300,7 +300,9 @@ public class Ability : SkillRoot
 
             Flower flower = ManaGarden.PlantList.Random().Flower;
 
-            flower.PlayAnim(ManaGarden.ElfList.Last(0), 0, 0, 0, 0);
+            flower.GetElf(ManaGarden.ElfList.Last(0), 0, 0, 0, 0);
+
+            ManaReso.Get("Fe_Info").TweenBacCG();
 
             ManaReso.Get("F_Manage").TweenBacGra();
 
@@ -332,6 +334,8 @@ public class Ability : SkillRoot
             );
 
 
+            ManaReso.Get("Fe_Info").TweenBacCG();
+
             ManaReso.Get("F_Manage").TweenBacGra();
 
             tween = ManaReso.Get("F_Manage0").GetTweenVec();

Assets/Script/Object/Skill/Pack.cs

@@ -167,7 +167,7 @@ public class Pack : SkillRoot
 
         ItemStatus = ItemStatus;
 
-        ManagerIAP.ProductDic.UniqueAdd(ID, PurchaseResult);
+        ManaIAP.ProductDic.UniqueAdd(ID, PurchaseResult);
     }
 
     public override void UpdateStatus()
@@ -281,6 +281,11 @@ public class Pack : SkillRoot
         Level++;
 
         ManaAudio.PlayClip(Clip.SkillClip);
+
+        if (BuyCur == Current.Cash)
+        {
+            ManaServer.Save();
+        }
     }
 
 

Assets/Script/Object/Tutorial.cs

@@ -250,7 +250,7 @@ public class Tutorial : Regist, IPointerClickHandler
         {
             if (ManaTutorial.TutorialIndexA == 4)
             {
-                ManaTutorial.EndStep4();
+                ManaTutorial.EndStepA4();
             }
         }
     }

Assets/Script/Tool/Anim/Tween.cs

@@ -31,7 +31,7 @@ public abstract class Tween
     public UnityAction OnBackwardStart;
     public UnityAction OnBackwardFinish;
     public CanvasGroup CanvasGroup;
-    
+
     public float Duration;
 
     public float Timer;
@@ -135,7 +135,7 @@ public abstract class Tween
     public virtual void StartForward()
     {
         InForward = true;
-        
+
         Component.SetActive(true);
 
         if (InOrigin)

Assets/Script/Tool/Bundle.cs

@@ -128,6 +128,7 @@ public class Bundle : Regist
             ManaReso.AddAsyncLoad("ability_config", Folder.Config);
             ManaReso.AddAsyncLoad("achieve_config", Folder.Config);
 
+            ManaReso.AddAsyncLoad("visit_config", Folder.Config);
             ManaReso.AddAsyncLoad("award_config", Folder.Config);
             ManaReso.AddAsyncLoad("flower_config", Folder.Config);
             ManaReso.AddAsyncLoad("offline_config", Folder.Config);

Assets/Script/Tool/Data.cs

@@ -361,8 +361,18 @@ public class Data
             PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = "0";
         }
 
+        if (ManaTutorial.TutorialC_)
+        {
+            PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = "1";
+        }
+        else
+        {
+            PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = "0";
+        }
+
         PlayerNode.SelectSingleNode("TutorialIndexA").Attributes[0].Value = ManaTutorial.TutorialIndexA.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexB").Attributes[0].Value = ManaTutorial.TutorialIndexB.ToString();
+        PlayerNode.SelectSingleNode("TutorialIndexC").Attributes[0].Value = ManaTutorial.TutorialIndexC.ToString();
     }
 
     public static void SaveFlowerList()
@@ -555,8 +565,10 @@ public class Data
         PlayerNode.SelectSingleNode("Player").Attributes[0].Value = "PlayerBlond";
         PlayerNode.SelectSingleNode("TutorialA").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = "1";
+        PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialIndexA").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialIndexB").Attributes[0].Value = "1";
+        PlayerNode.SelectSingleNode("TutorialIndexC").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("ID").Attributes[0].Value = "Default";
         PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("SignTime").Attributes[0].Value = "4/22/2017 09:30:00 AM";
@@ -761,6 +773,21 @@ public class Data
     }
 
 
+    public static XmlAttributeCollection GetVisitConfig()
+    {
+        TextAsset textAsset;
+
+        XmlDocument xmlDoc = new XmlDocument();
+
+        textAsset = ManaReso.Load<TextAsset>("visit_config", Folder.Config);
+
+        xmlDoc.LoadXml(textAsset.text);
+
+        XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
+
+        return xmlNode.Attributes;
+    }
+
     public static XmlAttributeCollection GetAwardConfig()
     {
         TextAsset textAsset;

Assets/Script/Tool/UI/HudText.cs

@@ -12,17 +12,19 @@ public class HudText : Regist
     {
         get
         {
-            if (_Text == null)
+            if (Text_ == null)
             {
-                _Text = GetComponent<Text>();
+                Text_ = GetComponent<Text>();
             }
 
-            return _Text;
+            return Text_;
         }
-        set { _Text = value; }
+        set { Text_ = value; }
     }
 
-    private Text _Text;
+    public Text Text_;
+
+    public float Speed;
 
     #endregion
 
@@ -42,9 +44,7 @@ public class HudText : Regist
 
     private void FixedUpdate()
     {
-        transform.position += new Vector3(0, 7.5f*Time.fixedDeltaTime, 0);
-
-        Text.SetAlpha(Mathf.Lerp(Text.color.a, 0, Time.fixedDeltaTime*2));
+        transform.position += new Vector3(0, Speed*Time.fixedDeltaTime, 0);
 
         if (Text.color.a <= 0.05f)
         {
@@ -52,10 +52,16 @@ public class HudText : Regist
         }
     }
 
-    public void Show(string str, Color color, int size)
+    public void Show(string str, Color color, int size, float speed, float time)
     {
         Text.text = str;
         Text.color = color;
         Text.fontSize = size;
+
+        Speed = speed;
+
+        Tween tween = Text.CreateTweenGra(0, time, false, false, Curve.EaseOutQuad);
+
+        tween.StartForward();
     }
 }

MyLovelyGarden.sln

@@ -1,13 +1,13 @@
-
-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}"
+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}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,24 +15,27 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

ToList.txt

@@ -1,43 +1,27 @@
-还原之后的CurrentPage
-
-Enter之后对不对 Exit之后对不对 Exit之后存档对不对 在参观界面存档对不对
-
-返回时有存蝴蝶的Bug
+图文混排(显示多个图片 缩进后能自动换行)
 
-连续访问的情况
+Anchor Encrypt 带宽优化
 
-花园等级 Player PlantList Slot Ability2-14
 
-PagePos PlayerPos Player Bird Tree Rainbow的重新生成
+教程中解锁花园没有声音
 
-要先反转参观数据才能存档
+Hud能往左右上下走，设置自己的颜色 设置Outline的颜色 设置速度
 
-其他玩家的花园里不能种花
+返回时有存蝴蝶、花的Bug
 
+加载的时候切换后台会出现Bug
 
 注册Bug(ManaDebug并没有输出信息)
 
-Zoom的时候关闭Fe
-
-花园的PageView好像有Bug
-
-教程A不显示分享
-
-这不是我的默认值
-
-现金购买后发送一次存档
-
-图文混排(显示多个图片 缩进后能自动换行)
+从Hierrarchy视图中检查是否有Bug
 
 红色小蝴蝶和教程B冲突了 自动解锁蜜蜂和蝴蝶会冲突
 
-Font Anchor Encrypt RichText RaycastTarget 带宽优化
-
-Auxiliary中的测试按键 DisableButton的颜色 Preload()
-
 
 动画
 (
+Move的SetActive
+
 完善Stream
 
 TweenSr需要改善(alpha相乘的问题)