Update 4.4

Assets/Resource/Animations.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c141004c12bbd4d4dbab1f7f280d59e3
+guid: 3e13daedc11a3c74ea3e7b04ae6ab28a
 folderAsset: yes
 timeCreated: 1489136422
 licenseType: Pro

Assets/Resource/Animations/ElfFly.anim.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1d59bb6e5f588094fbe0a5ec773d3fc6
+guid: 363f7c2e0f53a7441b79f739e0724561
 timeCreated: 1491022339
 licenseType: Pro
 NativeFormatImporter:

Assets/Resource/Animations/UIFlashLight.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fb372b7e1f7d8e8418dfbd552cfebde5
-timeCreated: 1491127140
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/Sprite/Garden/未开垦图标.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 88be3e8d551e0594d9af93bc7427db20
+timeCreated: 1491092883
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/Initializer.cs

@@ -35,6 +35,7 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<ManaAudio>();
 
         gameObject.AddScript<ManaUI>();
+        gameObject.AddScript<ManaSign>();
         gameObject.AddScript<ManaGarden>();
 
         gameObject.AddScript<ManaData>();
@@ -73,14 +74,6 @@ public class Initializer : MonoBehaviour
         {
             RegistList[i].RegistValueC();
         }
-
-        //Bundle.UI.Unload(true);
-        //Bundle.Skill.Unload(true);
-        //Bundle.Config.Unload(true);
-        //Bundle.Object.Unload(true);
-        //Bundle.Shader.Unload(true);
-        //Bundle.Garden.Unload(true);
-        //Bundle.Character.Unload(true);
     }
 
     public IEnumerator IInitialize()

Assets/Script/Manage/ManaAudio.cs

@@ -8,6 +8,8 @@ public class ManaAudio : Regist
 
     public static bool Music;
     public static bool Audio;
+    public static Transform AudioParent;
+    public static Transform MusicParent;
 
     public Coroutine CoroTheme;
     public Coroutine CoroMiniGame;
@@ -18,10 +20,10 @@ public class ManaAudio : Regist
 
     public override void Instantiate()
     {
-        Transform tra = new GameObject("Audio").transform;
+        MusicParent = new GameObject("Music").transform;
 
-        ManaReso.Get("MusicMini", Folder.Object, true, tra, true);
-        ManaReso.Get("MusicTheme", Folder.Object, true, tra, true);
+        ManaReso.Get("MusicMini", Folder.Object, true, MusicParent, true);
+        ManaReso.Get("MusicTheme", Folder.Object, true, MusicParent, true);
     }
 
 
@@ -86,6 +88,8 @@ public class ManaAudio : Regist
 
             ManaReso.SetActive("L_MusicOn", false);
             ManaReso.SetActive("L_MusicOff", true);
+
+            MusicParent.SetActive(false);
         }
         else
         {
@@ -93,6 +97,8 @@ public class ManaAudio : Regist
 
             ManaReso.SetActive("L_MusicOn", true);
             ManaReso.SetActive("L_MusicOff", false);
+
+            MusicParent.SetActive(true);
         }
     }
 

Assets/Script/Manage/ManaColor.cs

@@ -7,4 +7,6 @@ public class ManaColor : MonoBehaviour
 {
 	public static Color Orange = new Color(233/255f, 63/255f, 20/255f, 1);
 	public static Color LightGray = new Color(165/255f, 192/255f, 200/255f, 1);
+
+    public static Color HudText = new Color(1f, 1f, 1f, 1f);
 }

Assets/Script/Manage/ManaData.cs

@@ -283,7 +283,7 @@ public class ManaData : Regist
 
             if (Main == -1)
             {
-                ManaReso.GetHudText("+" + temp.ToString("0"), Color.red, 25, ManaReso.Get("C_HudTra"), ManaReso.Get("C_Main"), false);
+                ManaReso.GetHudText("+" + temp.ToString("0"), ManaColor.HudText, 25, ManaReso.Get("C_HudTra"), ManaReso.Get("C_Main"), false);
             }
 
             ManaDebug.Log(string.Format("参观收益<color=red>{0:0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", temp, NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));

Assets/Script/Manage/ManaMiniGame.cs

@@ -540,6 +540,8 @@ public class ManaMiniGame : Regist
 
     public static void GameAbort()
     {
+        PrepareLab.SetActive(false);
+
         ManaGarden.AwardLock = false;
 
         for (int i = 0; i < GoldList.Count; i++)
@@ -556,7 +558,7 @@ public class ManaMiniGame : Regist
         {
             ManaData.Mini = false;
 
-            ManaData.MiniTimer = Mathf.Lerp(1.8f, 3, Random.Range(0, 1f));
+            ManaData.MiniTimer = Mathf.Lerp(180, 300, Random.Range(0, 1f));
 
             ManaReso.Get("C_MiniGame").TweenBacCG();
 

Assets/Script/Manage/ManaSign.cs

@@ -0,0 +1,179 @@
+using System;
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Xml;
+using UnityEngine.UI;
+
+public class Sign
+{
+    public int Coin;
+    public int Diamond;
+    public Text Lab1;
+    public Text Lab2;
+    public Image Icon;
+    public Image Mark;
+    public List<int> FlowerList;
+
+    public Sign(int index, Transform tra, XmlAttributeCollection attribute)
+    {
+        Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
+
+        Auxiliary.CompileDic(tra, dic);
+
+        Lab1 = dic["Lab1"].GetComponent<Text>();
+        Lab2 = dic["Lab2"].GetComponent<Text>();
+        Icon = dic["Icon1"].GetComponent<Image>();
+        Mark = dic["Icon2"].GetComponent<Image>();
+
+        Lab2.text = index.ToString();
+
+        if (!string.IsNullOrEmpty(attribute[1].Value))
+        {
+            FlowerList = new List<int>();
+
+            string[] strings = attribute[1].Value.Split(',');
+
+            for (int i = 0; i < strings.Length; i++)
+            {
+                FlowerList.Add(int.Parse(strings[i]));
+            }
+
+            Icon.sprite = ManaReso.Load<Sprite>("管理花园按钮", Folder.UI);
+        }
+
+        if (!string.IsNullOrEmpty(attribute[2].Value))
+        {
+            Diamond = int.Parse(attribute[2].Value);
+
+            if (FlowerList == null)
+            {
+                Lab1.text = Diamond.ToString("0");
+
+                Icon.sprite = ManaReso.Load<Sprite>("钻石", Folder.UI);
+            }
+        }
+
+        if (!string.IsNullOrEmpty(attribute[3].Value))
+        {
+            Coin = int.Parse(attribute[3].Value);
+
+            Lab1.text = Coin.ToString("0");
+
+            Icon.sprite = ManaReso.Load<Sprite>("金币", Folder.UI);
+        }
+    }
+
+    public void Get()
+    {
+        Mark.SetActive(true);
+
+        if (FlowerList != null)
+        {
+            for (int i = 0; i < FlowerList.Count; i++)
+            {
+                if (ManaGarden.FlowerInfoList[FlowerList[i] - 1].Unlock == false)
+                {
+                    ManaGarden.FlowerInfoList[FlowerList[i] - 1].Unlock = true;
+
+                    ManaData.Sign++;
+                    ManaData.Sign %= 21;
+
+                    ManaReso.SetText("Bb_InfoLab", Language.GetStr("FlowerName", "Flower" + FlowerList[i]));
+
+                    ManaReso.SetSprite("Bb_Info", ManaReso.Load<Sprite>("管理花园按钮", Folder.UI));
+
+                    Icon.sprite = ManaReso.Load<Sprite>("管理花园按钮", Folder.UI);
+                    Icon.SetActive(true);
+
+                    return;
+                }
+            }
+        }
+
+        if (Diamond > 0)
+        {
+            ManaData.Sign++;
+            ManaData.Sign %= 21;
+
+            ManaData.Diamond += Diamond;
+
+            ManaReso.SetText("Bb_InfoLab", Diamond.ToString());
+
+            ManaReso.SetSprite("Bb_Info", ManaReso.Load<Sprite>("钻石", Folder.UI));
+
+            Icon.sprite = ManaReso.Load<Sprite>("钻石", Folder.UI);
+            Icon.SetActive(true);
+        }
+        else if (Coin > 0)
+        {
+            ManaData.Sign++;
+            ManaData.Sign %= 21;
+
+            ManaData.Coin += Coin;
+
+            ManaReso.SetText("Bb_InfoLab", Coin.ToString());
+
+            ManaReso.SetSprite("Bb_Info", ManaReso.Load<Sprite>("金币", Folder.UI));
+
+            Icon.sprite = ManaReso.Load<Sprite>("金币", Folder.UI);
+            Icon.SetActive(true);
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+}
+
+public class ManaSign : Regist 
+{
+    #region 变量
+
+    public static Dictionary<int, Sign> SignDic;
+
+    #endregion
+
+    public static void Get()
+    {
+        SignDic[ManaData.Sign].Get();
+    }
+
+
+    public override void Instantiate()
+    {
+
+    }
+
+    public override void RegistValueB()
+    {
+        SignDic = new Dictionary<int, Sign>();
+
+        List<XmlAttributeCollection> attributeList = Data.GetSignConfig();
+
+        Transform tra = ManaReso.Get("Bb_Grid");
+
+        for (int i = 0; i < attributeList.Count; i++)
+        {
+            Transform tra1 = ManaReso.Get("SignInItem", Folder.UI, false, tra, false);
+
+            SignDic.Add(i, new Sign(i + 1, tra1, attributeList[i]));
+        }
+
+        for (int i = 0; i < ManaData.Sign + 1; i++)
+        {
+            SignDic[i].Mark.SetActive(true);
+
+            if (i != ManaData.Sign)
+            {
+                SignDic[i].Icon.SetActive(true);
+            }
+        }
+    }
+
+    public override void RegistReference()
+    {
+        
+    }
+}

Assets/Script/Manage/ManaSign.cs.meta

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

Assets/Script/Manage/ManaUI.cs

@@ -9,130 +9,11 @@ using System.Collections.Generic;
 
 using Random = UnityEngine.Random;
 
-public class Sign
-{
-    public int Coin;
-    public int Diamond;
-    public Text Lab1;
-    public Text Lab2;
-    public Image Icon;
-    public Image Mark;
-    public List<int> FlowerList;
-
-    public Sign(int index, Transform tra, XmlAttributeCollection attribute)
-    {
-        Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
-
-        Auxiliary.CompileDic(tra, dic);
-
-        Lab1 = dic["Lab1"].GetComponent<Text>();
-        Lab2 = dic["Lab2"].GetComponent<Text>();
-        Icon = dic["Icon1"].GetComponent<Image>();
-        Mark = dic["Icon2"].GetComponent<Image>();
-
-        Lab2.text = index.ToString();
-
-        if (!string.IsNullOrEmpty(attribute[1].Value))
-        {
-            FlowerList = new List<int>();
-
-            string[] strings = attribute[1].Value.Split(',');
-
-            for (int i = 0; i < strings.Length; i++)
-            {
-                FlowerList.Add(int.Parse(strings[i]));
-            }
-
-            Icon.sprite = ManaReso.Load<Sprite>("管理花园按钮", Folder.UI);
-        }
-
-        if (!string.IsNullOrEmpty(attribute[2].Value))
-        {
-            Diamond = int.Parse(attribute[2].Value);
-
-            if (FlowerList == null)
-            {
-                Lab1.text = Diamond.ToString("0");
-
-                Icon.sprite = ManaReso.Load<Sprite>("钻石", Folder.UI);
-            }
-        }
-
-        if (!string.IsNullOrEmpty(attribute[3].Value))
-        {
-            Coin = int.Parse(attribute[3].Value);
-            
-            Lab1.text = Coin.ToString("0");
-
-            Icon.sprite = ManaReso.Load<Sprite>("金币", Folder.UI);
-        }
-    }
-
-    public void Get()
-    {
-        Mark.SetActive(true);
-
-        if (FlowerList != null)
-        {
-            for (int i = 0; i < FlowerList.Count; i++)
-            {
-                if (ManaGarden.FlowerInfoList[FlowerList[i]].Unlock == false)
-                {
-                    ManaGarden.FlowerInfoList[FlowerList[i]].Unlock = true;
-
-                    if (ManaData.Sign < 20)
-                    {
-                        ManaData.Sign++;
-                    }
-
-                    ManaReso.SetText("Bb_InfoLab", Language.GetStr("FlowerName", "Flower" + FlowerList[i]));
-
-                    ManaReso.SetSprite("Bb_Info", ManaReso.Load<Sprite>("管理花园按钮", Folder.UI)); 
-
-                    return;
-                }
-            }
-        }
-
-        if (Diamond > 0)
-        {
-            if (ManaData.Sign < 27)
-            {
-                ManaData.Sign++;
-            }
-
-            ManaData.Diamond += Diamond;
-
-            ManaReso.SetText("Bb_InfoLab", Diamond.ToString());
-
-            ManaReso.SetSprite("Bb_Info", ManaReso.Load<Sprite>("钻石", Folder.UI));
-        }
-        else if (Coin > 0)
-        {
-            if (ManaData.Sign < 27)
-            {
-                ManaData.Sign++;
-            }
-
-            ManaData.Coin += Coin;
-
-            ManaReso.SetText("Bb_InfoLab", Coin.ToString());
-
-            ManaReso.SetSprite("Bb_Info", ManaReso.Load<Sprite>("金币", Folder.UI));
-        }
-        else
-        {
-            throw new Exception();
-        }
-    }
-}
-
-
 public class ManaUI : Regist
 {
 	#region 变量
 
-    public static List<Sign> SignList;
+    
 
     #endregion
 
@@ -194,7 +75,7 @@ public class ManaUI : Regist
             "Bb_Get",
             () =>
             {
-                SignList[ManaData.Sign].Get();
+                ManaSign.Get();
 
                 ManaReso.SetActive("Bb_Get", false);
                 ManaReso.SetActive("Bb_Info", true);
@@ -209,24 +90,6 @@ public class ManaUI : Regist
 
         ManaReso.Get("Bb_SignIn").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
 
-        Transform tra = ManaReso.Get("Bb_Grid");
-
-        List<XmlAttributeCollection> attributeList = Data.GetSignConfig();
-
-        SignList = new List<Sign>();
-
-        for (int i = 0; i < attributeList.Count; i++)
-        {
-            Transform tra1 = ManaReso.Get("SignInItem", Folder.UI, false, tra, false);
-
-            SignList.Add(new Sign(i + 1, tra1, attributeList[i]));
-        }
-        
-        for (int i = 0; i < ManaData.Sign; i++)
-        {
-            tra.GetChild(i).GetChild(1).SetActive(true);
-        }
-
         #endregion
 
         #region Bb_Confirm

Assets/Script/Object/DropDiamond.cs

@@ -26,6 +26,6 @@ public class DropDiamond : Drop
         int diamond = Random.Range(1, 6);
         Award.BonusDiamond += diamond;
 
-        ManaReso.GetHudText("+" + diamond, Color.red, 18, transform, ManaReso.Get("D_Status"), true);
+        ManaReso.GetHudText("+" + diamond, ManaColor.HudText, 25, transform, ManaReso.Get("D_Status"), true);
     }
 }

Assets/Script/Object/DropGold.cs

@@ -26,6 +26,6 @@ public class DropGold : Drop
         int coin = Random.Range(5, 16);
         Award.BonusCoin += coin;
 
-        ManaReso.GetHudText("+" + coin, Color.red, 18, transform, ManaReso.Get("D_Status"), true);
+        ManaReso.GetHudText("+" + coin, ManaColor.HudText, 25, transform, ManaReso.Get("D_Status"), true);
     }
 }

Assets/Script/Object/Flower.cs

@@ -31,7 +31,7 @@ public class FlowerInfo
             if (_Plant)
             {
                 Text.text = "已放置";
-
+                
                 UIPartical.Begin();
             }
             else
@@ -151,7 +151,7 @@ public class Flower : ObjRoot, IPointerClickHandler
                 OperateIcon.SetActive(false);
                 OperateOutline.SetActive(false);
 
-                ManaReso.GetHudText("得分+15", Color.red, 18, ChildDic["ScoreTra"], ManaReso.Get("D_Status"), true);
+                ManaReso.GetHudText("得分+15", ManaColor.HudText, 25, ChildDic["ScoreTra"], ManaReso.Get("D_Status"), true);
 
                 ManaMiniGame.Score += 15;
             }
@@ -403,7 +403,7 @@ public class Flower : ObjRoot, IPointerClickHandler
 
         ManaData.Coin += coin;
 
-        ManaReso.GetHudText("+" + coin, Color.red, 18, ChildDic["GoldTra"], ManaReso.Get("A_HudParent"), true);
+        ManaReso.GetHudText("+" + coin, ManaColor.HudText, 25, ChildDic["GoldTra"], ManaReso.Get("A_HudParent"), true);
 
         GoldBk.SetActive(false);
     }

Assets/Script/Tool/Bundle.cs

@@ -2,6 +2,8 @@
 using UnityEngine.Events;
 
 using System.Collections;
+using System.Diagnostics;
+using Debug = UnityEngine.Debug;
 
 public class Bundle : MonoBehaviour
 {

MyLovelyGarden.csproj

@@ -108,6 +108,7 @@
     <Compile Include="Assets\Script\Manage\ManaMiniGame.cs" />
     <Compile Include="Assets\Script\Manage\ManaPlayer.cs" />
     <Compile Include="Assets\Script\Manage\ManaReso.cs" />
+    <Compile Include="Assets\Script\Manage\ManaSign.cs" />
     <Compile Include="Assets\Script\Manage\ManaUI.cs" />
     <Compile Include="Assets\Script\Object\Drop.cs" />
     <Compile Include="Assets\Script\Object\DropDiamond.cs" />

MyLovelyGarden.txt

@@ -1,5 +1,3 @@
-FlowerG的tab放大与泡泡
-
 切换后台后功能(音效 收入 技能)
 
 改变PageView效果
@@ -8,9 +6,7 @@ FlowerG
 
 Shake脚本
 
-在Logo场景中创建对象(以Deactive物体做Parent)
-
-音乐关闭
+分段生成场景
 
 语言切换功能