Update 3.27

Assets/Resources/Sprite/SpriteUI/Square.png.meta

@@ -0,0 +1,72 @@
+fileFormatVersion: 2
+guid: e4b9c6a4105e96345a144d5439198512
+timeCreated: 1490620322
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 3
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 4
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: 4
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline:
+    - - {x: -2, y: -2}
+      - {x: -2, y: 2}
+      - {x: 2, y: 2}
+      - {x: 2, y: -2}
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Temp.meta

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

Assets/Resources/XML/Config/ability_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" name="花园" class="1" class_id="1" coin_person="1" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="200" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="0.1" upgrade_cd="" desc="每人次收入 金币[&amp;coin_person&amp;][lv]，每分钟来访[&amp;person&amp;*60][lv]人" icon="红-公园" anim="" label="" />
+  <item id="1" name="花园" class="1" class_id="1" coin_person="1" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="200" upgrade_fml="a*1.07" upgrade_plus="10%" upgrade_person="10%" upgrade_cd="" desc="每人次收入 金币[&amp;coin_person&amp;][lv]，每分钟来访[&amp;person&amp;*60][lv]人" icon="红-公园" anim="" label="" />
   <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="50%" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="" unlock_amnt="100" unlock_pos="" upgrade_cur="2" upgrade_amnt="" upgrade_fml="a" upgrade_plus="" upgrade_person="50%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="" label="" />
   <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="50%" person="" skill_cd="" unlock_lv="500" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="50%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv]，永久有效" icon="红-樱花树" anim="" label="" />
   <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="" unlock_ahead_cur="2" unlock_ahead_amt="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv]，永久有效" icon="红-黄鹂鸟" anim="Bird,GardenBk4" label="" />

Assets/Resources/XML/lan/ChineseSimplified.xml

@@ -135,7 +135,7 @@
     <Ability12 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability12>
     <Ability13 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability13>
     <Ability14 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability14>
-    <Skill1 desc=""><![CDATA[每分钟增加[&person&*60]，持续[&duration&/60][lv]分钟]]></Skill1>
+    <Skill1 desc=""><![CDATA[每分钟增加来访[&person&*60]人，持续[&duration&/60][lv]分钟]]></Skill1>
     <Skill2 desc=""><![CDATA[立即获得每人次收入的[&coin_once&][lv]倍]]></Skill2>
     <Skill3 desc=""><![CDATA[所有收入提升[&coin_person&]，持续[&duration&/60][lv]分钟]]></Skill3>
     <Skill4 desc=""><![CDATA[所有金币产出提升[&coin_person&]，持续[&duration&/60]分钟]]></Skill4>

Assets/Script/Manage/Initializer.cs

@@ -1,9 +1,9 @@
-using System;
-using LitJson;
+using LitJson;
 
 using UnityEngine;
 using UnityEngine.EventSystems;
 
+using System;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;

Assets/Script/Manage/ManaData.cs

@@ -72,7 +72,7 @@ public class ManaData : Regist
         {
             _Person = value;
 
-            ManaReso.SetText("F_PersonLab", _Person.ToString("0"));
+            ManaReso.SetText("F_PersonLab", _Person.ToString("0.0"));
         }
     }
     public static float CoinPerson
@@ -82,7 +82,7 @@ public class ManaData : Regist
         {
             _CoinPerson = value;
 
-            ManaReso.SetText("F_CoinPersonLab", _CoinPerson.ToString("0"));
+            ManaReso.SetText("F_CoinPersonLab", _CoinPerson.ToString("0.0"));
         }
     }
     public static double Coin

Assets/Script/Manage/ManaUI.cs

@@ -19,7 +19,7 @@ public class Sign
     public Image Mark;
     public List<int> FlowerList;
 
-    public Sign(Transform tra, XmlAttributeCollection attribute)
+    public Sign(int index, Transform tra, XmlAttributeCollection attribute)
     {
         Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
 
@@ -30,6 +30,8 @@ public class Sign
         Icon = dic["Icon1"].GetComponent<Image>();
         Mark = dic["Icon2"].GetComponent<Image>();
 
+        Lab2.text = index.ToString();
+
         if (!string.IsNullOrEmpty(attribute[1].Value))
         {
             FlowerList = new List<int>();
@@ -216,7 +218,7 @@ public class ManaUI : Regist
         {
             Transform tra1 = ManaReso.Get("SignInItem", Folder.PrefabUI, false, tra, false);
 
-            SignList.Add(new Sign(tra1, attributeList[i]));
+            SignList.Add(new Sign(i + 1, tra1, attributeList[i]));
         }
         
         for (int i = 0; i < ManaData.Sign; i++)

Assets/Script/Object/Skill/Ability.cs

@@ -67,6 +67,7 @@ public class Ability : SkillRoot
             }
             else if (_ItemStatus == SkillStatus.Upgrade)
             {
+                ItemTit.text = Name + " " + (Level + 1);
                 ItemBtnLab.text = string.Format(Language.GetStr("UI", "Fe_BtnLab2"));
             }
             else
@@ -124,6 +125,39 @@ public class Ability : SkillRoot
     }
 
 
+    public override void Annul()
+    {
+        if (Name == "花园")
+        {
+            ManaData.Person -= NewPerson;
+            ManaData.CoinPerson -= NewCoinPerson;
+        }
+        else
+        {
+            ManaData.SkillPerson -= NewPerson;
+            ManaData.SkillCoinPerson -= NewCoinPerson;
+        }
+
+        ManaData.SkillPlus -= NewPlus;
+        ManaData.SkillPersonBuff -= NewPersonBuff;
+
+        if (Math.Abs(NewSkillCD) > 0.0005f)
+        {
+            for (int i = 0; i < ManaData.SkillList.Count; i++)
+            {
+                ManaData.SkillList[i].ReceiveCool(-NewSkillCD, false, false);
+            }
+        }
+
+        if (Math.Abs(NewSkillCdBuff) > 0.0005f)
+        {
+            for (int i = 0; i < ManaData.SkillList.Count; i++)
+            {
+                ManaData.SkillList[i].ReceiveCool(-NewSkillCdBuff, false, true);
+            }
+        }
+    }
+
     public override void RegistValue(float elapse, List<List<SkillRoot>> ffList)
     {
         NewPlus = Plus;
@@ -156,7 +190,7 @@ public class Ability : SkillRoot
             UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, Level);
             UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, Level);
             
-            UsePerma();
+            UseConti();
         }
 
         ItemStatus = ItemStatus;
@@ -187,7 +221,7 @@ public class Ability : SkillRoot
         {
             ManaDebug.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
 
-            UsePerma();
+            UseConti();
 
             if (UpgradeCur != Current.Free)
             {
@@ -216,7 +250,7 @@ public class Ability : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", Description(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -232,7 +266,7 @@ public class Ability : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", Description(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab1"), ImageParse(UnlockCur), UnlockAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), ImageParse(UnlockCur), UnlockAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -271,15 +305,18 @@ public class Ability : SkillRoot
         {
             Level++;
 
+            Annul();
+
             NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
             UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
             UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, 1);
             UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
-
+            
             UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
             UpgradeValue(ref NewSkillCdBuff, UpgradeCD, 1);
             UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
 
+            ItemTit.text = Name + " " + (Level + 1);
             ItemLab.text = Description(0);
             ManaReso.SetText("Fe_Lab0", Description(0));
             ManaReso.SetText("Fe_Lab1", Description(1));
@@ -287,15 +324,11 @@ public class Ability : SkillRoot
 
             ManaDebug.Log(string.Format("<color=red>{0}</color> 升级 : {1}", Name, Level));
 
-            if (ItemStatus == SkillStatus.Use)
-            {
-                Annul();
-                UsePerma();
-            }
+            UseConti();
         }
     }
 
-    protected void UsePerma()
+    protected void UseConti()
     {
         if (Article == false)
         {
@@ -311,13 +344,13 @@ public class Ability : SkillRoot
 
         if (Name == "花园")
         {
-            ManaData.Person += Person;
-            ManaData.CoinPerson += CoinPerson;
+            ManaData.Person += NewPerson;
+            ManaData.CoinPerson += NewCoinPerson;
         }
         else
         {
-            ManaData.SkillPerson += Person;
-            ManaData.SkillCoinPerson += CoinPerson;
+            ManaData.SkillPerson += NewPerson;
+            ManaData.SkillCoinPerson += NewCoinPerson;
         }
 
         ManaData.SkillPlus += NewPlus;
@@ -393,7 +426,7 @@ public class Ability : SkillRoot
 
         if (ManaData.Pay(UnlockAheadAmt, UnlockAheadCur))
         {
-            UsePerma();
+            UseConti();
 
             if (UpgradeCur != Current.Free)
             {
@@ -429,21 +462,21 @@ public class Ability : SkillRoot
 
                 if (Math.Abs(Person) > 0.0005f)
                 {
-                    temp = Person + NewPerson * (Level + offset);
+                    temp = NewPerson;
+
+                    UpgradeValue(ref temp, Person, UpgradePerson, offset);
 
                     UpgradeUnit(ref temp, strings[i]);
 
-                    stringBuilder.Append(temp);
+                    stringBuilder.Append(temp.ToString("0"));
                 }
                 else if (Math.Abs(PersonBuff) > 0.0005f)
                 {
-                    temp = PersonBuff + NewPersonBuff * (Level + offset);
+                    temp = NewPersonBuff;
 
-                    stringBuilder.Append(string.Format("{0}%", temp * 100));
-                }
-                else
-                {
+                    UpgradeValue(ref temp, PersonBuff, UpgradePerson, offset);
 
+                    stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }
 
                 #endregion
@@ -454,21 +487,21 @@ public class Ability : SkillRoot
 
                 if (Math.Abs(SkillCD) > 0.0005f)
                 {
-                    temp = SkillCD + NewSkillCD * (Level + offset);
+                    temp = NewSkillCD;
+
+                    UpgradeValue(ref temp, SkillCD, UpgradeCD, offset);
 
                     UpgradeUnit(ref temp, strings[i]);
 
-                    stringBuilder.Append(temp);
+                    stringBuilder.Append(temp.ToString("0"));
                 }
                 else if (Math.Abs(SkillCdBuff) > 0.0005f)
                 {
-                    temp = SkillCdBuff + NewSkillCdBuff * (Level + offset);
+                    temp = NewSkillCdBuff;
 
-                    stringBuilder.Append(string.Format("{0}%", temp * 100));
-                }
-                else
-                {
+                    UpgradeValue(ref temp, UpgradeCD, offset);
 
+                    stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }
 
                 #endregion
@@ -479,21 +512,21 @@ public class Ability : SkillRoot
 
                 if (Math.Abs(CoinPerson) > 0.0005f)
                 {
-                    temp = CoinPerson + NewCoinPerson * (Level+offset);
+                    temp = NewCoinPerson;
+
+                    UpgradeValue(ref temp, CoinPerson, UpgradePlus, offset);
 
                     UpgradeUnit(ref temp, strings[i]);
 
-                    stringBuilder.Append(temp);
+                    stringBuilder.Append(temp.ToString("0.0"));
                 }
                 else if (Math.Abs(Plus) > 0.0005f)
                 {
-                    temp = Plus + NewPlus * (Level + offset);
+                    temp = NewPlus;
 
-                    stringBuilder.Append(string.Format("{0}%", temp * 100));
-                }
-                else
-                {
+                    UpgradeValue(ref temp, Plus, UpgradePlus, offset);
 
+                    stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }
 
                 #endregion
@@ -511,7 +544,7 @@ public class Ability : SkillRoot
     {
         if (string.IsNullOrEmpty(str))
         {
-            return UnlockAmt; //Sa
+            return UnlockAmt;
         }
         else
         {

Assets/Script/Object/Skill/BigSkill.cs

@@ -88,6 +88,7 @@ public class BigSkill : Skill
             }
             else if (_ItemStatus == SkillStatus.Upgrade)
             {
+                ItemTit.text = Name + " " + (Level + 1);
                 ItemBtnLab.text = string.Format(Language.GetStr("UI", "Fe_BtnLab2"));
             }
             else
@@ -240,7 +241,7 @@ public class BigSkill : Skill
 
             if (_BarStatus == SkillStatus.Use)
             {
-                UsePerma();
+                UseConti();
 
                 if (UseTimer < elapse)
                 {
@@ -361,7 +362,7 @@ public class BigSkill : Skill
                 BarLab.color = Color.blue;
             }
 
-            UsePerma();
+            UseConti();
             UseImmed();
 
             #region 调试输出
@@ -456,6 +457,11 @@ public class BigSkill : Skill
         {
             Level++;
 
+            if (BarStatus == SkillStatus.Use)
+            {
+                Annul();
+            }
+
             NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
 
             UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
@@ -469,6 +475,7 @@ public class BigSkill : Skill
             UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, 1);
             UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
 
+            ItemTit.text = Name + " " + (Level+1);
             ItemLab.text = Description(0);
             ManaReso.SetText("Fe_Lab0", Description(0));
             ManaReso.SetText("Fe_Lab1", Description(1));
@@ -478,8 +485,7 @@ public class BigSkill : Skill
 
             if (BarStatus == SkillStatus.Use)
             {
-                Annul();
-                UsePerma();
+                UseConti();
             }
         }
     }
@@ -495,9 +501,12 @@ public class BigSkill : Skill
 
         if (ManaData.Pay(UnlockAheadAmt, UnlockAheadCur))
         {
-            BarStatus = SkillStatus.Buy;
+            ShowSkillBar();
+
+            BarBk1.material = null;
 
             ItemStatus = SkillStatus.Upgrade;
+            BarStatus = SkillStatus.Buy;
 
             ManaReso.Get("Fe_Info").TweenBacCG();
 

Assets/Script/Object/Skill/Pack.cs

@@ -47,7 +47,7 @@ public class Pack : SkillRoot
             {
                 ItemBtn.interactable = true;
 
-                ItemBtnLab.text = string.Format("{0}{1}\n{2}", ImageParse(BuyCur), UseAmt, Language.GetStr("UI", "Fe_BtnLab3"));
+                ItemBtnLab.text = string.Format("{0}{1:0}\n{2}", ImageParse(BuyCur), UseAmt, Language.GetStr("UI", "Fe_BtnLab3"));
             }
             else if (_ItemStatus == SkillStatus.Lock)
             {
@@ -106,7 +106,7 @@ public class Pack : SkillRoot
         {
             ManaDebug.Log(string.Format("技能<color=red>{0}</color>已解锁 等级 : {1}", Name, Level));
 
-            UsePerma();
+            UseConti();
         }
     }
 
@@ -155,7 +155,7 @@ public class Pack : SkillRoot
         if (ItemStatus == SkillStatus.Buy)
         {
             ManaReso.SetText("Fe_Lab1", Description(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab3"), ImageParse(BuyCur), UseAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), ImageParse(BuyCur), UseAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -239,7 +239,7 @@ public class Pack : SkillRoot
 
             #endregion
 
-            UsePerma();
+            UseConti();
             UseImmed();
 
             Level++;
@@ -247,7 +247,7 @@ public class Pack : SkillRoot
     }
 
 
-    protected void UsePerma()
+    protected void UseConti()
     {
         if (!string.IsNullOrEmpty(Flower))
         {
@@ -336,7 +336,7 @@ public class Pack : SkillRoot
 
                 if (Math.Abs(CoinOnce) > 0.0005f)
                 {
-                    stringBuilder.Append(CoinOnce);
+                    stringBuilder.Append(CoinOnce.ToString("0"));
                 }
 
                 #endregion
@@ -368,7 +368,7 @@ public class Pack : SkillRoot
 
                 if (Math.Abs(DiamondOnce) > 0.0005f)
                 {
-                    stringBuilder.Append(DiamondOnce);
+                    stringBuilder.Append(DiamondOnce.ToString("0"));
                 }
 
                 #endregion
@@ -379,11 +379,11 @@ public class Pack : SkillRoot
 
                 if (Math.Abs(Plus) > 0.0005f)
                 {
-                    stringBuilder.Append(string.Format("{0}%", Plus*100));
+                    stringBuilder.Append(string.Format("{0:0}%", Plus*100));
                 }
                 else if (Math.Abs(CoinPerson) > 0.0005f)
                 {
-                    stringBuilder.Append(CoinPerson);
+                    stringBuilder.Append(CoinPerson.ToString("0.0"));
                 }
 
                 #endregion

Assets/Script/Object/Skill/Skill.cs

@@ -86,7 +86,7 @@ public class Skill : SkillRoot
             }
             else if (_ItemStatus == SkillStatus.Buy)
             {
-                ItemBtnLab.text = string.Format("{0}{1}\n{2}", ImageParse(BuyCur), UseAmt, Language.GetStr("UI", "Fe_BtnLab3"));
+                ItemBtnLab.text = string.Format("{0}{1:0}\n{2}", ImageParse(BuyCur), UseAmt, Language.GetStr("UI", "Fe_BtnLab3"));
             }
             else if (_ItemStatus == SkillStatus.Use)
             {
@@ -280,7 +280,7 @@ public class Skill : SkillRoot
         }
         else if (_ItemStatus == SkillStatus.Use)
         {
-            UsePerma();
+            UseConti();
 
             if (UseTimer < elapse)
             {
@@ -366,7 +366,7 @@ public class Skill : SkillRoot
         if (ItemStatus == SkillStatus.Buy)
         {
             ManaReso.SetText("Fe_Lab1", Description(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab3"), ImageParse(BuyCur), UseAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), ImageParse(BuyCur), UseAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -383,7 +383,7 @@ public class Skill : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", Description(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -400,7 +400,7 @@ public class Skill : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", Description(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab1"), ImageParse(UnlockCur), UnlockAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), ImageParse(UnlockCur), UnlockAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -438,7 +438,7 @@ public class Skill : SkillRoot
         }
     }
 
-    protected void UsePerma()
+    protected void UseConti()
     {
         ManaData.SkillPlus += NewPlus;
         ManaData.SkillPerson += NewPerson;
@@ -487,7 +487,7 @@ public class Skill : SkillRoot
                 ItemBtnLab.color = Color.blue;
             }
 
-            UsePerma();
+            UseConti();
             UseImmed();
 
             #region 调试
@@ -583,6 +583,11 @@ public class Skill : SkillRoot
         {
             Level++;
 
+            if (ItemStatus == SkillStatus.Use)
+            {
+                Annul();
+            }
+
             NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
 
             UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
@@ -605,9 +610,7 @@ public class Skill : SkillRoot
 
             if (ItemStatus == SkillStatus.Use)
             {
-                Annul();
-
-                UsePerma();
+                UseConti();
             }
         }
     }
@@ -666,7 +669,7 @@ public class Skill : SkillRoot
                     UpgradeValue(ref temp, Person, UpgradePerson, offset);
                     UpgradeUnit(ref temp, strings[i]);
 
-                    stringBuilder.Append(temp);
+                    stringBuilder.Append(temp.ToString("0"));
                 }
                 else if (Math.Abs(PersonBuff) > 0.0005f)
                 {
@@ -674,11 +677,7 @@ public class Skill : SkillRoot
 
                     UpgradeValue(ref temp, PersonBuff, UpgradePerson, offset);
 
-                    stringBuilder.Append(string.Format("{0}%", temp * 100));
-                }
-                else
-                {
-
+                    stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }
 
                 #endregion
@@ -693,7 +692,7 @@ public class Skill : SkillRoot
 
                 UpgradeUnit(ref temp, strings[i]);
 
-                stringBuilder.Append(temp.ToString("0.0"));
+                stringBuilder.Append(temp.ToString("0"));
 
                 #endregion
             }
@@ -707,7 +706,7 @@ public class Skill : SkillRoot
 
                     UpgradeValue(ref temp, CoinOnce, UpgradeCoinOnce, offset);
 
-                    stringBuilder.Append(temp);
+                    stringBuilder.Append(temp.ToString("0"));
                 }
                 else if (Math.Abs(CoinOnceBuff) > 0.0005f)
                 {
@@ -715,11 +714,7 @@ public class Skill : SkillRoot
                     
                     UpgradeValue(ref temp, CoinOnceBuff, UpgradeCoinOnce, offset);
 
-                    stringBuilder.Append(temp);
-                }
-                else
-                {
-                    throw new Exception();
+                    stringBuilder.Append(temp.ToString("0"));
                 }
 
                 #endregion
@@ -728,7 +723,7 @@ public class Skill : SkillRoot
             {
                 #region MyRegion
 
-                stringBuilder.Append(DiamondOnce);
+                stringBuilder.Append(DiamondOnce.ToString("0"));
 
                 #endregion
             }
@@ -742,7 +737,7 @@ public class Skill : SkillRoot
 
                     UpgradeValue(ref temp, CoinPerson, UpgradePlus, offset);
 
-                    stringBuilder.Append(temp);
+                    stringBuilder.Append(temp.ToString("0.0"));
                 }
                 else if (Math.Abs(Plus) > 0.0005f)
                 {
@@ -750,7 +745,7 @@ public class Skill : SkillRoot
 
                     UpgradeValue(ref temp, Plus, UpgradePlus, offset);
 
-                    stringBuilder.Append(string.Format("{0}%", temp * 100));
+                    stringBuilder.Append(string.Format("{0:0}%", temp * 100));
                 }
                 else
                 {

MyLovelyGarden.Editor.csproj

@@ -158,6 +158,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\Resources\Shader\Gray.shader" />
+    <None Include="Assets\Resources\Shader\HighLight.shader" />
     <None Include="Assets\Resources\XML\Config\PlayerConfig.xml" />
     <None Include="Assets\Resources\XML\Config\ability_config.xml" />
     <None Include="Assets\Resources\XML\Config\award_config.xml" />

MyLovelyGarden.csproj

@@ -117,6 +117,7 @@
     <Compile Include="Assets\Script\Object\Skill\Pack.cs" />
     <Compile Include="Assets\Script\Object\Skill\Skill.cs" />
     <Compile Include="Assets\Script\Object\Skill\SkillRoot.cs" />
+    <Compile Include="Assets\Script\Object\Slot.cs" />
     <Compile Include="Assets\Script\Tool\Anim\Move.cs" />
     <Compile Include="Assets\Script\Tool\Anim\MoveVec.cs" />
     <Compile Include="Assets\Script\Tool\Anim\Tween.cs" />
@@ -127,6 +128,7 @@
     <Compile Include="Assets\Script\Tool\Anim\TweenScale.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenVec.cs" />
     <Compile Include="Assets\Script\Tool\Auxiliary.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\CallBackUtil.cs" />
     <Compile Include="Assets\Script\Tool\DashGame\DateUtil.cs" />
     <Compile Include="Assets\Script\Tool\DashGame\DecryptionUtil.cs" />
     <Compile Include="Assets\Script\Tool\DashGame\DelayCall.cs" />
@@ -152,6 +154,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\Resources\Shader\Gray.shader" />
+    <None Include="Assets\Resources\Shader\HighLight.shader" />
     <None Include="Assets\Resources\XML\Config\PlayerConfig.xml" />
     <None Include="Assets\Resources\XML\Config\ability_config.xml" />
     <None Include="Assets\Resources\XML\Config\award_config.xml" />

MyLovelyGarden.sln

@@ -1,9 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,19 +11,16 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
-		{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
+		{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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

MyLovelyGarden.txt

@@ -1,4 +1,4 @@
-签到改用强关系
+Person和CoinPerson显示基数还是当前值 以秒为单位还是分钟
 
 小游戏奖励加成