Update 6.5

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

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

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/Android/ShareSDK/AndroidManifest.xml

@@ -10,11 +10,11 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+    <!--<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>-->
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <!-- 蓝牙分享所需的权限 -->
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <!--<uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
     
     <uses-sdk
         android:minSdkVersion="8"

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/achieve_config.xml

@@ -12,10 +12,10 @@
   <item id="25" index="2" name="鼓鼓的钱包-5" desc="拥有8000金币" type="2" value="150000" parent="24" del="1" diamond_once="30" coin_person="" person="" icon="绿-免费金币" />
   <item id="26" index="2" name="鼓鼓的钱包-6" desc="拥有10000金币" type="2" value="450000" parent="25" del="0" diamond_once="40" coin_person="" person="" icon="绿-免费金币" />
   <item id="41" index="3" name="精明的商人-1" desc="总共获取3000金币" type="3" value="10000" parent="" del="1" diamond_once="5" coin_person="" person="" icon="4大技能2" />
-  <item id="42" index="3" name="精明的商人-2" desc="总共获取8000金币" type="3" value="50000" parent="41" del="1" diamond_once="10" coin_person="" person="" icon="4大技能2" />
-  <item id="43" index="3" name="精明的商人-3" desc="总共获取15000金币" type="3" value="100000" parent="42" del="1" diamond_once="15" coin_person="" person="" icon="4大技能2" />
-  <item id="44" index="3" name="精明的商人-4" desc="总共获取30000金币" type="3" value="500000" parent="43" del="1" diamond_once="20" coin_person="" person="" icon="4大技能2" />
-  <item id="45" index="3" name="精明的商人-5" desc="总共获取50000金币" type="3" value="1000000" parent="44" del="1" diamond_once="30" coin_person="" person="" icon="4大技能2" />
+  <item id="42" index="3" name="精明的商人-2" desc="总共获取8000金币" type="3" value="100000" parent="41" del="1" diamond_once="10" coin_person="" person="" icon="4大技能2" />
+  <item id="43" index="3" name="精明的商人-3" desc="总共获取15000金币" type="3" value="250000" parent="42" del="1" diamond_once="15" coin_person="" person="" icon="4大技能2" />
+  <item id="44" index="3" name="精明的商人-4" desc="总共获取30000金币" type="3" value="800000" parent="43" del="1" diamond_once="20" coin_person="" person="" icon="4大技能2" />
+  <item id="45" index="3" name="精明的商人-5" desc="总共获取50000金币" type="3" value="2000000" parent="44" del="1" diamond_once="30" coin_person="" person="" icon="4大技能2" />
   <item id="46" index="3" name="精明的商人-6" desc="总共获取80000金币" type="3" value="5000000" parent="45" del="0" diamond_once="40" coin_person="" person="" icon="4大技能2" />
   <item id="61" index="4" name="花仙子-1" desc="所有精灵等级总和达到10级" type="4" value="10" parent="" del="1" diamond_once="10" coin_person="" person="" icon="蓝-高级包" />
   <item id="62" index="4" name="花仙子-2" desc="所有精灵等级总和达到50级" type="4" value="30" parent="61" del="1" diamond_once="15" coin_person="" person="" icon="蓝-高级包" />
@@ -30,11 +30,11 @@
   <item id="85" index="5" name="百花争艳-5" desc="花朵数量达到20" type="5" value="20" parent="84" del="1" diamond_once="30" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="86" index="5" name="百花争艳-6" desc="花朵数量达到40" type="5" value="40" parent="85" del="0" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="101" index="6" name="人山人海-1" desc="参观人次总数达到500" type="6" value="1000" parent="" del="1" diamond_once="5" coin_person="" person="" icon="4大技能1" />
-  <item id="102" index="6" name="人山人海-2" desc="参观人次总数达到2000" type="6" value="5000" parent="101" del="1" diamond_once="10" coin_person="" person="" icon="4大技能1" />
-  <item id="103" index="6" name="人山人海-3" desc="参观人次总数达到10000" type="6" value="10000" parent="102" del="1" diamond_once="15" coin_person="" person="" icon="4大技能1" />
-  <item id="104" index="6" name="人山人海-4" desc="参观人次总数达到50000" type="6" value="50000" parent="103" del="1" diamond_once="20" coin_person="" person="" icon="4大技能1" />
-  <item id="105" index="6" name="人山人海-5" desc="参观人次总数达到150000" type="6" value="150000" parent="104" del="1" diamond_once="30" coin_person="" person="" icon="4大技能1" />
-  <item id="106" index="6" name="人山人海-6" desc="参观人次总数达到300000" type="6" value="300000" parent="105" del="0" diamond_once="40" coin_person="" person="" icon="4大技能1" />
+  <item id="102" index="6" name="人山人海-2" desc="参观人次总数达到2000" type="6" value="10000" parent="101" del="1" diamond_once="10" coin_person="" person="" icon="4大技能1" />
+  <item id="103" index="6" name="人山人海-3" desc="参观人次总数达到10000" type="6" value="50000" parent="102" del="1" diamond_once="15" coin_person="" person="" icon="4大技能1" />
+  <item id="104" index="6" name="人山人海-4" desc="参观人次总数达到50000" type="6" value="150000" parent="103" del="1" diamond_once="20" coin_person="" person="" icon="4大技能1" />
+  <item id="105" index="6" name="人山人海-5" desc="参观人次总数达到150000" type="6" value="300000" parent="104" del="1" diamond_once="30" coin_person="" person="" icon="4大技能1" />
+  <item id="106" index="6" name="人山人海-6" desc="参观人次总数达到300000" type="6" value="800000" parent="105" del="0" diamond_once="40" coin_person="" person="" icon="4大技能1" />
   <item id="121" index="7" name="技能大师-1" desc="使用技能5次" type="7" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="红-黄鹂鸟" />
   <item id="122" index="7" name="技能大师-2" desc="使用技能10次" type="7" value="30" parent="121" del="1" diamond_once="15" coin_person="" person="" icon="红-黄鹂鸟" />
   <item id="123" index="7" name="技能大师-3" desc="使用技能20次" type="7" value="80" parent="122" del="1" diamond_once="20" coin_person="" person="" icon="红-黄鹂鸟" />

Assets/Resource/XML/Config/award_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.001)*0.95" flower_rate_based="0.008,0.08,0.95" rate="0,300,650" coin_drop="r*l*0.65" flower_coin="l*0.65" />
+  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.001)*0.95" flower_rate_based="0.05,0.65,0.95" rate="0,400,650" coin_drop="r*l*0.65" flower_coin="l*0.65" />
   <comment>
     <id>
 

Assets/Resource/XML/Config/visit_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" award_rate="0.75" award_min="l*0.65" award_max="l*1.5" cool_time="5" cost="5+l*0.8" create="0.75" fancy="0.25" />
+  <item id="1" award_rate="0.75" award_min="l*0.8" award_max="l*1.5" cool_time="5" cost="5+l*0.8" create="0.75" fancy="0.25" />
   <comment>
     <id>
 id

Assets/Resource/XML/PlayerConfig.xml

@@ -1,8 +1,8 @@
 <PlayerConfig>
-  <Version value="502" />
+  <Version value="530" />
 
   <ID value="Default" />
-////  <TutorialA value="0" />
+////  <TutorialA value="1" />
 ////  <TutorialB value="1" />
 ////  <TutorialC value="1" />
   <TutorialIndexA value="1" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -40,6 +40,7 @@
     <Da_QuitLab desc=""><![CDATA[退出游戏]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[领取奖励]]></Da_GetAwardLab>
+    <Da_HigherScore desc=""><![CDATA[需要更高的分数来解锁花朵]]></Da_HigherScore>
     <G_Tit desc=""><![CDATA[花朵管理]]></G_Tit>
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
@@ -364,5 +365,6 @@
     <PurchaseSuccess desc=""><![CDATA[购买成功]]></PurchaseSuccess>
     <PurchaseFail desc=""><![CDATA[购买失败]]></PurchaseFail>
     <PurchaseUnvalid desc=""><![CDATA[没有找到该商品]]></PurchaseUnvalid>
+    <TemporarilyUnavailible desc=""><![CDATA[暂时无法使用]]></TemporarilyUnavailible>
   </IAP>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -40,6 +40,7 @@
     <Da_QuitLab desc=""><![CDATA[退出遊戲]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[領取獎勵]]></Da_GetAwardLab>
+    <Da_HigherScore desc=""><![CDATA[需要更高的分數來解鎖花朵]]></Da_HigherScore>
     <G_Tit desc=""><![CDATA[花朵管理]]></G_Tit>
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
@@ -364,5 +365,6 @@
     <PurchaseSuccess desc=""><![CDATA[購買成功]]></PurchaseSuccess>
     <PurchaseFail desc=""><![CDATA[購買失敗]]></PurchaseFail>
     <PurchaseUnvalid desc=""><![CDATA[沒有找到該商品]]></PurchaseUnvalid>
+    <TemporarilyUnavailible desc=""><![CDATA[暫時無法使用]]></TemporarilyUnavailible>
   </IAP>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -40,6 +40,7 @@
     <Da_QuitLab desc=""><![CDATA[Quit]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[Cancel]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[Get Reward]]></Da_GetAwardLab>
+    <Da_HigherScore desc=""><![CDATA[Need higher score to unlock a flower]]></Da_HigherScore>
     <G_Tit desc=""><![CDATA[Flowers]]></G_Tit>
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
@@ -364,5 +365,6 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <PurchaseSuccess desc=""><![CDATA[Purchase success]]></PurchaseSuccess>
     <PurchaseFail desc=""><![CDATA[Purchase failed]]></PurchaseFail>
     <PurchaseUnvalid desc=""><![CDATA[No such product]]></PurchaseUnvalid>
+    <TemporarilyUnavailible desc=""><![CDATA[Temporarily unavailible]]></TemporarilyUnavailible>
   </IAP>
 </lan>

Assets/Script/Extension/ExtensionImage.cs

@@ -14,4 +14,9 @@ public static class ExtensionImage
 
         image.rectTransform.sizeDelta = newSize;
     }
+
+    public static void Resize(this Image image, Vector2 newSize)
+    {
+        image.rectTransform.sizeDelta = newSize;
+    }
 }

Assets/Script/Manage/ManaAchieve.cs

@@ -173,6 +173,10 @@ public class Achieve
     public void GetAward()
     {
         Lock = false;
+        Complete = false;
+
+        ManaAchieve.UpdateHint();
+
 
         ManaCenter.Diamond += DiamondOnce;
         ManaCenter.SkillPerson += Person;
@@ -180,8 +184,6 @@ public class Achieve
 
         ManaAudio.PlayClip(Clip.CurrentClip);
 
-        ManaAchieve.AchieveDepth--;
-
         ManaAchieve.DeleDic.Remove(AchieveType);
 
         if (Delete)
@@ -320,16 +322,14 @@ public class Achieve
             return;
         }
 
-
-        ManaAchieve.AchieveDepth++;
-
-
         Complete = true;
 
         Button.interactable = true;
 
         Button.image.material = null;
 
+        ManaAchieve.UpdateHint();
+
 
         List<object> objList = new List<object>();
 
@@ -427,54 +427,6 @@ public class ManaAchieve : Regist
 {
     #region 变量
 
-    public static int AchieveDepth
-    {
-        get { return AchieveDepth_; }
-        set
-        {
-            AchieveDepth_ = value;
-
-            if (ManaTutorial.TutorialA)
-            {
-                return;
-            }
-
-
-            TweenOutline tween = ManaReso.Get<Outline>("C_Achieve").GetTweenOutline();
-
-            if (tween == null)
-            {
-                return;
-            }
-
-            if (AchieveDepth_ == 0)
-            {
-                tween.Target.enabled = false;
-
-                tween.Pause();
-            }
-            else if (AchieveDepth_ > 0)
-            {
-                if (tween.InPause)
-                {
-                    tween.Resume();
-
-                    tween.Target.enabled = true;
-                }
-                else
-                {
-                    tween.StartForward();
-                }
-            }
-            else
-            {
-                throw new Exception();
-            }
-        }
-    }
-
-    public static int AchieveDepth_;
-
     public static Dictionary<int, Achieve> AchieveDic = new Dictionary<int, Achieve>();
     public static Dictionary<AchieveType, UnityAction<double>> DeleDic = new Dictionary<AchieveType, UnityAction<double>>();
 
@@ -524,10 +476,45 @@ public class ManaAchieve : Regist
 
     public override void RegistValueB()
     {
-        AchieveDepth = AchieveDepth;
+        UpdateHint();
     }
 
 
+    public static void UpdateHint()
+    {
+        if (ManaTutorial.TutorialA)
+        {
+            return;
+        }
+
+
+        TweenOutline tween = ManaReso.Get<Outline>("C_Achieve").GetTweenOutline();
+
+        foreach (var kv in AchieveDic)
+        {
+            if (kv.Value.Complete)
+            {
+                if (tween.InPause)
+                {
+                    tween.Resume();
+
+                    tween.Target.enabled = true;
+                }
+                else
+                {
+                    tween.StartForward();
+                }
+
+                return;
+            }
+        }
+
+
+        tween.Target.enabled = false;
+
+        tween.Pause();
+    }
+
     public static void UpdateStatus(AchieveType type, double value)
     {
         UnityAction<double> action;

Assets/Script/Manage/ManaCenter.cs

@@ -135,7 +135,7 @@ public class ManaCenter : Regist
                 SkillList[i].UpdateStatus();
             }
 
-            if (Level_ >= 18)
+            if (Level_ >= 8)
             {
                 if (ManaTutorial.TutorialC_)
                 {
@@ -655,7 +655,7 @@ public class ManaCenter : Regist
             Elapse = (float)ManaServer.Time.Subtract(QuitTime).TotalSeconds;
 
             ManaDebug.Log(string.Format("离线时间<color=red>{0}</color>", Elapse));
-
+            
             if (Elapse <= 120)
             {
                 Elapse = 0;
@@ -1069,8 +1069,6 @@ public class ManaCenter : Regist
                     return;
                 }
 
-                Auxiliary.DecryptXml(ManaData.PlayerDoc);
-
                 LoginLock = true;
 
                 ManaServer.Login(LoginCallbackReactive);

Assets/Script/Manage/ManaData.cs

@@ -49,7 +49,7 @@ public class ManaData
                     nativeDoc.LoadXml(sr.ReadToEnd());
 
                     sr.Close();
-
+                    
                     Auxiliary.DecryptXml(nativeDoc);
 
                     
@@ -77,12 +77,6 @@ public class ManaData
                         
                         if (nativeVersion < version)
                         {
-                            StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
-
-                            sw.Write(DefaultDoc.OuterXml);
-
-                            sw.Close();
-
                             PlayerDoc_ = DefaultDoc;
                         }
                         else
@@ -102,7 +96,7 @@ public class ManaData
 
                                 return null;
                             }
-
+                            
                             PlayerDoc_ = nativeDoc;
                         }
                     }
@@ -156,11 +150,15 @@ public class ManaData
             PlayerPrefs.SetString("config", Auxiliary.ToString(md5.ComputeHash(bytes)));
 
 
-            Auxiliary.EncryptXml(PlayerDoc);
+            XmlDocument doc = new XmlDocument();
+
+            doc.LoadXml(PlayerDoc.OuterXml);
+
+            Auxiliary.EncryptXml(doc);
             
             StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
             
-            sw.Write(PlayerDoc.OuterXml);
+            sw.Write(doc.OuterXml);
 
             sw.Close();
         }
@@ -369,11 +367,11 @@ public class ManaData
     {
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = ManaCenter.Coin.ToString("0");
         PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = ManaCenter.Diamond.ToString("0");
-
+        
         PlayerNode.SelectSingleNode("SignTime").Attributes[0].Value = ManaSign.SignTime.ToString();
         PlayerNode.SelectSingleNode("SignIndex").Attributes[0].Value = ManaSign.SignIndex.ToString();
         PlayerNode.SelectSingleNode("SignRound").Attributes[0].Value = ManaSign.SignRound.ToString();
-
+        
         PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = ManaServer.Connect.ToInt().ToString();
         PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = ManaServer.Time.ToString();
 

Assets/Script/Manage/ManaIAP.cs

@@ -149,6 +149,15 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
     public static void Purchase(string id)
     {
+        bool freeze = true;
+
+        if (freeze)
+        {
+            Bubble.Show(null, Language.GetStr("IAP", "TemporarilyUnavailible"));
+
+            return;
+        }
+
         if (!Complete)
         {
             Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));

Assets/Script/Manage/ManaMiniGame.cs

@@ -18,6 +18,9 @@ public class Award
     public static int BonusDiamond;
     public static string Info;
 
+    public static int FlowerID;
+    public static bool FlowerLock;
+
     public int DiamondMin;
     public int DiamondMax;
 
@@ -117,6 +120,8 @@ public class Award
 
             FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[1];
 
+            ManaReso.SetActive("Da_FlowerIcon", true);
+
             ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
             ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
 
@@ -126,17 +131,19 @@ public class Award
         }
         else
         {       
-            if (!ManaMiniGame.FlowerLock)
+            if (!FlowerLock)
             {
+                flowerFlag = true;
+
                 if (Random.Range(0, 1f) <= Odds[rate])
                 {
-                    flowerFlag = true;
-
-                    FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[ManaMiniGame.Flower];
+                    FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[FlowerID];
 
                     flowerInfo.Unlock = true;
 
 
+                    ManaReso.SetActive("Da_Flower", true);
+
                     ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
                     ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
 
@@ -144,6 +151,12 @@ public class Award
 
                     sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(花朵)>", flowerInfo.Name);
                 }
+                else
+                {
+                    ManaReso.SetActive("Da_Flower", false);
+
+                    ManaReso.SetText("Da_FlowerLab", Language.GetStr("UI", "Da_HigherScore"));
+                }
             }
         }
 
@@ -606,7 +619,6 @@ public class ManaMiniGame : Regist
     public static List<Flower> OpList = new List<Flower>();
     public static List<Flower> IdleList = new List<Flower>();
 
-    public static int Flower;
     public static int MiniGameIndex;
     public static string ScoreLab;
 
@@ -809,6 +821,37 @@ public class ManaMiniGame : Regist
         }
     }
 
+    public static void InitializeFlower()
+    {
+        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+
+        if (Random.Range(0, 1f) <= flowerRate)
+        {
+            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
+            {
+                foreach (var kv in ManaGarden.FlowerInfoDic)
+                {
+                    if (kv.Value.Unlock == false)
+                    {
+                        Award.FlowerID = kv.Value.ID_;
+
+                        Award.FlowerLock = false;
+
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                Award.FlowerLock = true;
+            }
+        }
+        else
+        {
+            Award.FlowerLock = true;
+        }
+    }
+
 
     public static void GameEnd()
     {
@@ -859,48 +902,45 @@ public class ManaMiniGame : Regist
 
         ManaCenter.MiniGameAmt++;
 
+        FlowerLock = false;
+
         GameEnd();
     }
 
     public static void GameEnter()
     {
-        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+        if (ManaTutorial.TutorialA)
+        {
+            Award.FlowerID = 1;
+            Award.FlowerLock = true;
+        }
+        else
+        {
+            if (!FlowerLock)
+            {
+                InitializeFlower();
 
-        if (Random.Range(0, 1f) <= flowerRate)
+                FlowerLock = true;
+            }
+        }
+
+
+        if (Award.FlowerLock)
         {
-            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
+            for (int i = 1; i < 10; i++)
             {
                 while (true)
                 {
                     FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random();
 
-                    if (!flowerInfo.Unlock)
+                    if (flowerInfo.Unlock)
                     {
-                        Flower = flowerInfo.ID_;
-
-                        FlowerLock = false;
+                        IdleList.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + i)));
 
                         break;
                     }
                 }
             }
-            else
-            {
-                FlowerLock = true;
-            }
-        }
-        else
-        {
-            FlowerLock = true;
-        }
-
-
-        if (FlowerLock)
-        {
-            for (int i = 1; i < 10; i++)
-            {
-                IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[1], ManaReso.Get("SlotMini" + i)));
-            }
         }
         else
         {
@@ -908,11 +948,21 @@ public class ManaMiniGame : Regist
 
             int special = idList.Random(true);
 
-            IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[Flower], ManaReso.Get("SlotMini" + special)));
+            IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[Award.FlowerID], ManaReso.Get("SlotMini" + special)));
 
             for (int i = 0; i < idList.Count; i++)
             {
-                IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[1], ManaReso.Get("SlotMini" + idList[i])));
+                while (true)
+                {
+                    FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random();
+
+                    if (flowerInfo.Unlock)
+                    {
+                        IdleList.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + idList[i])));
+
+                        break;
+                    }
+                }
             }
         }
         
@@ -935,6 +985,8 @@ public class ManaMiniGame : Regist
         Game = true;
         MiniGameIndex++;
 
+        Score = 0;
+
         OpTimer = OpTime;
         GoldTimer = Random.Range(3f, 6f);
         GameTimer = 0;

Assets/Script/Manage/ManaSign.cs

@@ -50,6 +50,7 @@ public class Sign
     public Text Lab2;
     public Image Icon;
     public Image Mark;
+    public Vector2 OriginSize;
 
     public List<int> FlowerList = new List<int>();
 
@@ -67,6 +68,9 @@ public class Sign
         Icon = dic["Icon1"].GetComponent<Image>();
         Mark = dic["Icon2"].GetComponent<Image>();
 
+        OriginSize = Icon.rectTransform.sizeDelta;
+
+
         Lab2.text = index.ToString();
 
         Coin = Auxiliary.IntParse(attribute[3].Value, 0);
@@ -90,6 +94,20 @@ public class Sign
         {
             ManaSign.SignIndex = 1;
             ManaSign.SignRound++;
+
+            ManaReso.Get("B_SignIn").GetTweenCG().AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    foreach (var kv in ManaSign.SignDic)
+                    {
+                        kv.Value.SetUI();
+
+                        kv.Value.Mark.SetActive(false);
+                    }
+                }
+            );
         }
 
         if (FlowerList.Valid())
@@ -162,13 +180,15 @@ public class Sign
         if (Diamond > 0)
         {
             Icon.sprite = ManaReso.LoadSprite("钻石", Folder.UI);
-            
+            Icon.Resize(OriginSize);
+
             Lab1.text = Diamond.ToString();
         }
         else if (Coin > 0)
         {
             Icon.sprite = ManaReso.LoadSprite("金币", Folder.UI);
-            
+            Icon.Resize(OriginSize);
+
             Lab1.text = Coin.ToString();
         }
     }
@@ -220,7 +240,7 @@ public class ManaSign : Regist
 
         SignIndex = ManaData.GetPlayerInt("SignIndex");
         SignRound = ManaData.GetPlayerInt("SignRound");
-
+        
         Transform par = ManaReso.Get("Bb_Grid");
 
         List<XmlAttributeCollection> attributeList = ManaData.GetSignConfig();
@@ -237,4 +257,10 @@ public class ManaSign : Regist
             SignDic[i].Mark.SetActive(true);
         }
     }
-}
+}
+
+#region DebugList
+
+//签到的循环与存档
+
+#endregion

Assets/Script/Manage/ManaTutorial.cs

@@ -197,7 +197,7 @@ public class ManaTutorial : Regist
     {
         TutorialA = false;
 
-        ManaAchieve.AchieveDepth = ManaAchieve.AchieveDepth;
+        ManaAchieve.UpdateHint();
 
         Tutorial.HightDisable();
 
@@ -648,18 +648,18 @@ public class ManaTutorial : Regist
 
                                 Tutorial.HightScreen(ManaReso.Get("C_VisitArrow0"), ManaReso.Get("C_Visit"));
 
-                                ManaReso.AddButtonEventOnetime
-                                (
-                                    "C_Visit",
-                                    () =>
-                                    {
-                                        EndC();
+                                //ManaReso.AddButtonEventOnetime
+                                //(
+                                //    "C_Visit",
+                                //    () =>
+                                //    {
+                                //        EndC();
 
-                                        //EndC1();
+                                //        //EndC1();
 
-                                        //EnterC2();
-                                    }
-                                );
+                                //        //EnterC2();
+                                //    }
+                                //);
                             }
                         );
                     }

Assets/Script/Manage/ManaUI.cs

@@ -131,10 +131,6 @@ public class ManaUI : Regist
         {
             ManaReso.Get("C_Group0").TweenForCG();
             ManaReso.Get("C_Group").GetTweenCG().InOrigin = true;
-
-            ManaReso.Get("Bb_SignIn").TweenBacCG();
-
-            ManaReso.SetActive("Ba_Notice", true);
         };
 
         #endregion
@@ -218,6 +214,8 @@ public class ManaUI : Regist
             () =>
             {
                 ManaReso.Get("B_SignIn").TweenBacCG();
+                ManaReso.Get("Ba_Notice").TweenBacCG();
+                ManaReso.Get("Bb_SignIn").TweenBacCG();
 
                 ManaAudio.PlayClip(Clip.BtnClip);
             }
@@ -468,7 +466,6 @@ public class ManaUI : Regist
                 ManaReso.Get("Da_Info").TweenForCG();
 
                 ManaReso.Get("Da_CoinGroup").GetTweenScale().InDestination = true;
-                ManaReso.Get("Da_FlowerGroup").GetTweenScale().InDestination = true;
                 ManaReso.Get("Da_DiamondGroup").GetTweenScale().InDestination = true;
 
                 ManaReso.SetText("Da_Tit", Language.GetStr("UI", "Da_Tit0"));
@@ -484,24 +481,32 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Da_HGroup", false);
                 ManaReso.SetActive("Da_ScoreTit", false);
                 ManaReso.SetActive("Da_GetAward", false);
+                ManaReso.SetActive("Da_FlowerGroup", false);
                 ManaReso.SetActive("Da_DiamondGroup", true);
 
 
-                FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[ManaMiniGame.Flower];
+                if (!Award.FlowerLock)
+                {
+                    ManaReso.Get("Da_FlowerGroup").GetTweenScale().InDestination = true;
 
-                ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
+                    FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[Award.FlowerID];
 
-                ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID_));
+                    ManaReso.SetActive("Da_Flower", true);
 
-                Auxiliary.Instance.DelayCall
-                (
-                    () =>
-                    {
-                        ManaReso.Get<Text>("Da_FlowerLab").SetLayoutDirty();
-                    },
-                    2
-                );
+                    ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
+
+                    ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID_));
+
+                    Auxiliary.Instance.DelayCall
+                    (
+                        () =>
+                        {
+                            ManaReso.Get<Text>("Da_FlowerLab").SetLayoutDirty();
+                        },
+                        2
+                    );
+                }
             }
         );
 
@@ -1089,7 +1094,6 @@ public class ManaUI : Regist
         tween.OnBackwardFinish += () =>
         {
             ManaReso.Get("C_Main").TweenForCG();
-            //ManaReso.Get("C_Group").GetTweenCG().InOrigin = true;
 
             ManaReso.SetActive("F_Manage", false);
         };
@@ -1439,7 +1443,6 @@ public class ManaUI : Regist
         tween.OnBackwardFinish += () =>
         {
             ManaReso.Get("C_Main").TweenForCG();
-            ManaReso.Get("C_Group").GetTweenCG().InOrigin = true;
         };
 
         #endregion
@@ -1747,7 +1750,6 @@ public class ManaUI : Regist
         tween.OnBackwardFinish += () =>
         {
             ManaReso.Get("C_Main").TweenForCG();
-            ManaReso.Get("C_Group").GetTweenCG().InOrigin = true;
 
             ManaReso.SetActive("M_Achieve", false);
             ManaReso.SetActive("M_Achieve0", false);

Assets/Script/Manage/ManaVisit.cs

@@ -494,8 +494,13 @@ public class ManaVisit
 
         #region Award
         
-        if (Random.Range(0f,1f) <= AwardRate)
+        if (ManaTutorial.TutorialC || Random.Range(0f,1f) <= AwardRate)
         {
+            if (ManaTutorial.TutorialC)
+            {
+                ManaTutorial.EndC();
+            }
+
             if (ManaGarden.PlantList.Count > 0)
             {
                 ManaGarden.PlantList.Random().Flower.Award = true;
@@ -537,19 +542,6 @@ public class ManaVisit
 
     public static void GetArchive()
     {
-        //ManaServer.Download
-        //(
-        //    "ytcy9g",
-        //    (jsonData) =>
-        //    {
-        //        LoadComplete = true;
-
-        //        XmlStr = jsonData["l"].ToString();
-
-        //        Enter();
-        //    }
-        //);
-
         if (Random.Range(0f, 1f) <= CreateRate)
         {
             LoadComplete = true;
@@ -645,25 +637,13 @@ public class ManaVisit
         }
 
         int slotIndex = 0;
-        bool pinkLock = false;
         string plantList = "";
 
         for (int i = 0; i < slot; i++)
         {
             if (fancy || Random.Range(0f, 1f) >= 0.35f)
             {
-                int flowerID;
-
-                if (!pinkLock)
-                {
-                    flowerID = 1;
-
-                    pinkLock = true;
-                }
-                else
-                {
-                    flowerID = flowerList.Random(true);
-                }
+                int flowerID = slotIndex + 1;
 
                 plantList += string.Format("{0},{1} ", flowerID, slotIndex);
 

Assets/Script/Object/DropDiamond.cs

@@ -14,6 +14,6 @@ public class DropDiamond : Drop
 
         Award.BonusDiamond += diamond;
 
-        ManaReso.GetHudText("+" + diamond, Color.white, 90, transform, ManaReso.Get("D_Status"), true);
+        ManaReso.GetHudText("<(钻石)>+" + diamond, Color.white, 90, transform, ManaReso.Get("D_Status"), true);
     }
 }

Assets/Script/Object/DropGold.cs

@@ -20,6 +20,6 @@ public class DropGold : Drop
 
         Award.BonusCoin += coin;
 
-        ManaReso.GetHudText("+" + coin, Color.white, 90, transform, ManaReso.Get("D_Status"), true);
+        ManaReso.GetHudText("<(金币)>+" + coin, Color.white, 90, transform, ManaReso.Get("D_Status"), true);
     }
 }

Assets/Script/Object/Flower.cs

@@ -472,6 +472,9 @@ public class Flower : Regist, IPointerClickHandler
 
     public void Retrieve()
     {
+        ChildDic["Flash"].SetActive(false);
+        ChildDic["Particle System"].SetActive(false);
+        
         ManaReso.Save(this);
 
         for (int i = 0; i < ElfList.Count; i++)
@@ -514,7 +517,7 @@ public class Flower : Regist, IPointerClickHandler
             ManaCenter.FlowerCoin++;
         }
 
-        ManaReso.GetHudText("+" + coin, Color.white, 90, ChildDic["GoldPosTra"], ManaReso.Get("A_HudParent"), true);
+        ManaReso.GetHudText("<(金币)>+" + coin, Color.white, 90, ChildDic["GoldPosTra"], ManaReso.Get("A_HudParent"), true);
 
         ResetAward();
     }

Assets/Script/Object/Garden.cs

@@ -325,7 +325,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
                 return;
             }
 
-            Slot slot = eventData.rawPointerPress.GetComponent<Slot>();
+            Slot slot = eventData.rawPointerPress.GetComponentInParent<Slot>();
 
             if (slot.Lock == false)
             {

Assets/Script/Tool/Anim/TweenRoot.cs

@@ -49,14 +49,16 @@ public abstract class TweenRoot : MoveRoot
     {
         if (!InPause)
         {
-            InPause = true;
-
             if (InForward)
             {
+                InPause = true;
+
                 ManaAnim.MoveForList.Remove(this);
             }
             else if (InBackward)
             {
+                InPause = true;
+
                 ManaAnim.MoveBacList.Remove(this);
             }
         }

Assets/Script/Tool/Auxiliary.cs

@@ -120,7 +120,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            Debug.Log(ManaReso.Load<UnityEngine.Object>("音符1", Folder.Scene));
+            
         }
 
         if (Input.GetKeyDown(KeyCode.X))

Assets/Script/Tool/UI/HudText.cs

@@ -58,7 +58,8 @@ public class HudText : Regist
 
         Speed = speed;
 
-        TweenRoot tween = Text.CreateTweenGra(0, time, false, false, Curve.EaseOutQuad);
+
+        TweenRoot tween = Text.CreateTweenCG(1, 0, time, false, false, Curve.EaseOutQuad);
 
         tween.StartForward();
     }

Assets/Script/Tool/UI/HudTextPlus.cs

@@ -70,6 +70,19 @@ public class HudTextPlus : MonoBehaviour
         {
             ManaReso.Save(gameObject);
         };
+
+
+        TextPlus textPlus = Text.GetComponent<TextPlus>();
+
+        if (textPlus != null)
+        {
+            if (textPlus.ImagePlus.Draw)
+            {
+                Color color = textPlus.ImagePlus.color;
+
+                textPlus.ImagePlus.CreateTweenGra(color*origin, color*dest, time, true, true, Curve.EaseOutQuad);
+            }
+        }
     }
 
     public void SetOutline(Color color, Vector2 size)

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