备份

Assets/Resource/Sprite/Garden/FlowerAtlas2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 4d94f1705aa0577458695d3bcf244e65
-timeCreated: 1500617839
+timeCreated: 1500620192
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -69,6 +69,22 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -218,5 +234,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: atlas2
   assetBundleVariant: 

Assets/Script/Manage/Initializer.cs

@@ -60,9 +60,9 @@ public class Initializer : MonoBehaviour
 
         gameObject.AddScript<ManaUI>();
         gameObject.AddScript<ManaSign>();
+        gameObject.AddScript<ManaCenter>();
         gameObject.AddScript<ManaGarden>();
 
-        gameObject.AddScript<ManaCenter>();
         gameObject.AddScript<ManaPlayer>();
         gameObject.AddScript<ManaServer>();
         gameObject.AddScript<ManaMiniGame>();

Assets/Script/Manage/ManaCenter.cs

@@ -127,6 +127,11 @@ public class ManaCenter : Regist
         {
             Level_ = value;
 
+            if (!Complete)
+            {
+                return;
+            }
+
             ManaVisit.UpdateCost();
 
             ManaAchieve.UpdateStatus(AchieveType.GardenLevel, Level_);
@@ -575,11 +580,8 @@ public class ManaCenter : Regist
         #endregion
     }
 
-    public override void RegistValueB()
+    public override void RegistValueA()
     {
-        Instance = this;
-
-
         ManaReso.Get<Graphic>("F_Elf").material = ManaReso.Load<Material>("GrayMat", Folder.UI);
         ManaReso.Get<Graphic>("F_Store").material = ManaReso.Load<Material>("GrayMat", Folder.UI);
         ManaReso.Get<Graphic>("F_Magic").material = ManaReso.Load<Material>("GrayMat", Folder.UI);
@@ -593,6 +595,25 @@ public class ManaCenter : Regist
         ManaReso.Get<Button>("F_Magic").interactable = false;
 
 
+        List<XmlAttributeCollection> attributeList = ManaData.GetSkillList();
+
+        for (int i = 0; i < attributeList.Count; i++)
+        {
+            SkillRoot skillRoot = SkillDic[attributeList[i][0].Value];
+
+            if (!(skillRoot is Skill))
+            {
+                skillRoot.RegistReference();
+
+                skillRoot.RegistValue(true, Elapse, TempUseList, attributeList[i]);
+            }
+        }
+    }
+
+    public override void RegistValueB()
+    {
+        Instance = this;
+
         Coin = ManaData.GetPlayerDouble("Coin");
         Diamond = ManaData.GetPlayerDouble("Diamond");
         MiniTimer = ManaData.GetPlayerFloat("MiniTimer");
@@ -688,9 +709,12 @@ public class ManaCenter : Regist
         {
             SkillRoot skillRoot = SkillDic[attributeList[i][0].Value];
 
-            skillRoot.RegistReference();
+            if (skillRoot is Skill)
+            {
+                skillRoot.RegistReference();
 
-            skillRoot.RegistValue(firstRegist, Elapse, TempUseList, attributeList[i]);
+                skillRoot.RegistValue(firstRegist, Elapse, TempUseList, attributeList[i]);
+            }
         }
     }
 

Assets/Script/Manage/ManaGarden.cs

@@ -222,7 +222,7 @@ public class ManaGarden : Regist
     public override void Instantiate()
     {
         ManaReso.Get("Garden", Folder.Discard, true, transform, true, ObjType.Garden).AddScript<Garden>();
-
+        
         CreatePage();
         CreatePage();
 
@@ -370,7 +370,7 @@ public class ManaGarden : Regist
 
         image.sprite = flowerInfo.Icon;
 
-        image.Resize(true, 0.75f, 0.75f);
+        image.Resize(true, 0.65f, 0.65f);
 
 
         ManaReso.SetText("H_BtnLab", Language.GetStr("UI", "H_BtnLab1"));
@@ -406,7 +406,7 @@ public class ManaGarden : Regist
 
         image.sprite = flowerInfo.Icon;
 
-        image.Resize(true, 0.75f, 0.75f);
+        image.Resize(true, 0.65f, 0.65f);
 
 
         if (flowerInfo.UnlockCur == Current.Free)

Assets/Script/Manage/ManaMiniGame.cs

@@ -156,7 +156,7 @@ public class Award
             ManaReso.SetActive("Da_FlowerIcon", true);
 
             ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-            ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.25f, 0.25f);
+            ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
 
             ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
 
@@ -178,7 +178,7 @@ public class Award
                     ManaReso.SetActive("Da_Flower", true);
 
                     ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.25f, 0.25f);
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
 
                     ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
 
@@ -1639,12 +1639,12 @@ public class ManaMiniGame : Regist
             ManaReso.SetActive("D_FlowerBtn5", true);
             ManaReso.SetActive("D_FlowerBtn6", true);
 
-            ManaReso.SetSprite("D_FlowerIcon1", FlowerDic[1].FlowerInfo.Icon).Resize(true, 1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon2", FlowerDic[2].FlowerInfo.Icon).Resize(true, 1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon3", FlowerDic[4].FlowerInfo.Icon).Resize(true, 1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon4", FlowerDic[5].FlowerInfo.Icon).Resize(true, 1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon5", FlowerDic[7].FlowerInfo.Icon).Resize(true, 1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon6", FlowerDic[8].FlowerInfo.Icon).Resize(true, 1f, 1f);
+            ManaReso.SetSprite("D_FlowerIcon1", FlowerDic[1].FlowerInfo.Icon).Resize(true, 0.85f, 0.85f);
+            ManaReso.SetSprite("D_FlowerIcon2", FlowerDic[2].FlowerInfo.Icon).Resize(true, 0.85f, 0.85f);
+            ManaReso.SetSprite("D_FlowerIcon3", FlowerDic[4].FlowerInfo.Icon).Resize(true, 0.85f, 0.85f);
+            ManaReso.SetSprite("D_FlowerIcon4", FlowerDic[5].FlowerInfo.Icon).Resize(true, 0.85f, 0.85f);
+            ManaReso.SetSprite("D_FlowerIcon5", FlowerDic[7].FlowerInfo.Icon).Resize(true, 0.85f, 0.85f);
+            ManaReso.SetSprite("D_FlowerIcon6", FlowerDic[8].FlowerInfo.Icon).Resize(true, 0.85f, 0.85f);
         }
 
         PrepareLab.StreamForScale();
@@ -1808,9 +1808,9 @@ public class ManaMiniGame : Regist
         idList = idList.Disturb();
 
 
-        ManaReso.SetSprite("D_FlowerIcon7", ManaGarden.FlowerInfoDic[idList[0]].Icon).Resize(true, 1f, 1f);
-        ManaReso.SetSprite("D_FlowerIcon8", ManaGarden.FlowerInfoDic[idList[1]].Icon).Resize(true, 1f, 1f);
-        ManaReso.SetSprite("D_FlowerIcon9", ManaGarden.FlowerInfoDic[idList[2]].Icon).Resize(true, 1f, 1f);
+        ManaReso.SetSprite("D_FlowerIcon7", ManaGarden.FlowerInfoDic[idList[0]].Icon).Resize(true, 0.85f, 0.85f);
+        ManaReso.SetSprite("D_FlowerIcon8", ManaGarden.FlowerInfoDic[idList[1]].Icon).Resize(true, 0.85f, 0.85f);
+        ManaReso.SetSprite("D_FlowerIcon9", ManaGarden.FlowerInfoDic[idList[2]].Icon).Resize(true, 0.85f, 0.85f);
 
         for (int i = 0; i < idList.Count; i++)
         {

Assets/Script/Manage/ManaSign.cs

@@ -124,7 +124,7 @@ public class Sign
 
                     ManaReso.SetSprite("Bb_IconA0", flowerInfo.Icon);
                     
-                    ManaReso.Get<Image>("Bb_IconA0").Resize(true, 0.75f, 0.75f);
+                    ManaReso.Get<Image>("Bb_IconA0").Resize(true, 0.65f, 0.65f);
 
                     flowerInfo.Unlock = true;
 

Assets/Script/Manage/ManaUI.cs

@@ -546,7 +546,7 @@ public class ManaUI : Regist
                     ManaReso.SetActive("Da_Flower", true);
 
                     ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.25f, 0.25f);
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
 
                     ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID_));
 

Assets/Script/Object/Flower.cs

@@ -139,7 +139,7 @@ public class FlowerInfo
 
         Image.sprite = Icon;
 
-        Image.Resize(true, 0.25f, 0.25f);
+        Image.Resize(true, 0.2f, 0.2f);
 
         Button.onClick.AddListener
         (

Assets/Script/Object/Garden.cs

@@ -51,10 +51,16 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     #endregion
 
-    public override void RegistValueA()
+    public override bool RegistImmed()
     {
+        if (base.RegistImmed())
+        {
+            return true;
+        }
+
         Instance = this;
 
+
         #region Item
 
         ManaReso.Get("Bird0").CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad, false, true);
@@ -122,6 +128,8 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #region GardenPage
 
+        GardenPage = ManaReso.Get("GardenPage");
+
         Move2D move2D = GardenPage.CreateMove2D();
 
         move2D.OnForwardStart += () =>
@@ -135,6 +143,8 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         };
 
         #endregion
+
+        return false;
     }
 
     public override void RegistReference()
@@ -143,8 +153,6 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         Garden3 = ManaReso.Get("Garden3");
         Garden4 = ManaReso.Get("Garden4");
 
-        GardenPage = ManaReso.Get("GardenPage");
-
         GardenPos2.Add(ManaReso.Get("Pos21").position);
         GardenPos2.Add(ManaReso.Get("Pos22").position);
 

Assets/Script/Tool/Auxiliary.cs

@@ -130,13 +130,15 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.N))
         {
-            foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
-            {
-                if (!VARIABLE.Value.Unlock)
-                {
-                    VARIABLE.Value.Unlock = true;
-                }
-            }
+            ManaData.PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 670.ToString();
+
+            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
+            //{
+            //    if (!VARIABLE.Value.Unlock)
+            //    {
+            //        VARIABLE.Value.Unlock = true;
+            //    }
+            //}
         }
 
         if (Input.GetKeyDown(KeyCode.B))

ToList.txt

@@ -1,7 +1,3 @@
-新花(语言文档 配置 DebugMode FlowerAtlas的Bundle)
-
-广告的投放对象
-
 DebugInfo要收集Unity版本信息
 
 36朵花2048打包时卡死过一次