Update 6.2

Assets/Resource/XML/Config/ability_config.xml

@@ -4,15 +4,15 @@
   <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv]，永久有效" icon="红-樱花树" anim="Item,Tree1,Tree2" label="" />
   <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" 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="Item,Bird0" label="" />
   <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="2.07" person="" skill_cd="" unlock_lv="2" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="Elf,BeeYellow" label="" />
-  <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="2.96" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="Elf,BeePurple" label="" />
-  <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="5.34" person="" skill_cd="" unlock_lv="30" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝色蜜蜂" anim="Elf,BeeBlue" label="" />
-  <item id="8" name="红色小蜜蜂" class="2" class_id="4" coin_person="18.2" person="" skill_cd="" unlock_lv="80" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红色蜜蜂" anim="Elf,BeeRed" label="" />
-  <item id="9" name="白色小蜜蜂" class="2" class_id="5" coin_person="49.05" person="" skill_cd="" unlock_lv="120" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白色蜜蜂" anim="Elf,BeeWhite" label="" />
+  <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="2.96" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="1600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="Elf,BeePurple" label="" />
+  <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="5.34" person="" skill_cd="" unlock_lv="30" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="3200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝色蜜蜂" anim="Elf,BeeBlue" label="" />
+  <item id="8" name="红色小蜜蜂" class="2" class_id="4" coin_person="18.2" person="" skill_cd="" unlock_lv="80" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红色蜜蜂" anim="Elf,BeeRed" label="" />
+  <item id="9" name="白色小蜜蜂" class="2" class_id="5" coin_person="49.05" person="" skill_cd="" unlock_lv="120" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白色蜜蜂" anim="Elf,BeeWhite" label="" />
   <item id="10" name="黄色小蝴蝶" class="2" class_id="6" coin_person="3.68" person="" skill_cd="" unlock_lv="20" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄蝴蝶" anim="Elf,ButterflyYellow" label="" />
-  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="8.27" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫蝴蝶" anim="Elf,ButterflyPurple" label="" />
-  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="28.17" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝蝴蝶" anim="Elf,ButterflyBlue" label="" />
-  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="326.79" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="25600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红蝴蝶" anim="Elf,ButterflyRed" label="" />
-  <item id="14" name="白色小蝴蝶" class="2" class_id="10" coin_person="1387.22" person="" skill_cd="" unlock_lv="250" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="51200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="Elf,ButterflyWhite" label="" />
+  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="8.27" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫蝴蝶" anim="Elf,ButterflyPurple" label="" />
+  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="28.17" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝蝴蝶" anim="Elf,ButterflyBlue" label="" />
+  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="326.79" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="25600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="25600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红蝴蝶" anim="Elf,ButterflyRed" label="" />
+  <item id="14" name="白色小蝴蝶" class="2" class_id="10" coin_person="1387.22" person="" skill_cd="" unlock_lv="250" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="51200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="51200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="Elf,ButterflyWhite" label="" />
   <comment>
     <id>
 id

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.0001" 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.008,0.08,0.95" rate="0,300,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.5" award_min="1" 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.65" 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,10 +1,10 @@
 <PlayerConfig>
-  <Version value="484" />
+  <Version value="492" />
 
   <ID value="Default" />
-////  <TutorialA value="0" />
+////  <TutorialA value="1" />
 ////  <TutorialB value="1" />
-////  <TutorialC value="0" />
+////  <TutorialC value="1" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />

Assets/Script/Manage/ManaCenter.cs

@@ -126,6 +126,8 @@ public class ManaCenter : Regist
         {
             Level_ = value;
 
+            ManaVisit.UpdateCost();
+
             ManaAchieve.UpdateStatus(AchieveType.GardenLevel, Level_);
             
             for (int i = 0; i < SkillList.Count; i++)

Assets/Script/Manage/ManaUI.cs

@@ -16,6 +16,48 @@ public class ManaUI : Regist
 {
     #region 变量
 
+    public static int SkillDepth
+    {
+        get { return SkillDepth_; }
+        set
+        {
+            SkillDepth_ = value;
+
+            if (ManaTutorial.TutorialA)
+            {
+                return;
+            }
+
+            TweenOutline tween = ManaReso.Get("C_Manage").GetTweenOutline();
+
+            if (SkillDepth_ == 0)
+            {
+                tween.Target.enabled = false;
+
+                tween.Pause();
+            }
+            else if (SkillDepth_ > 0)
+            {
+                if (tween.InPause)
+                {
+                    tween.Resume();
+
+                    tween.Target.enabled = true;
+                }
+                else
+                {
+                    tween.StartForward();
+                }
+            }
+            else
+            {
+                throw new Exception();
+            }
+        }
+    }
+
+    public static int SkillDepth_;
+
     public static ManaUI Instance;
     public static Transform Canvas;
     public static Transform Camera;
@@ -239,6 +281,10 @@ public class ManaUI : Regist
 
         #region C_Manage
 
+        tween = ManaAnim.CreateTweenOutline(ManaReso.Get("C_Manage"), 0, 201 / 255f, 1f, true, true, Curve.EaseOutQuad);
+
+        tween.PingPong = true;
+
         ManaReso.AddButtonEvent
         (
             "C_Manage",
@@ -303,8 +349,6 @@ public class ManaUI : Regist
 
                         ManaReso.SetActive("C_Return", false);
 
-                        ManaReso.GetHudText("-" + ManaVisit.Cost, Color.white, 90, ManaReso.Get("C_VisitHud"), ManaReso.Get("Canvas"), false, 7.5f, 0.25f);
-
 
                         if (ManaVisit.CoolTime != 0)
                         {
@@ -1027,6 +1071,7 @@ public class ManaUI : Regist
             ManaReso.Get("F_Manage0").TweenBacVec();
         };
 
+
         tween = ManaReso.Get("F_Manage0").CreateTweenVec2D(ManaReso.Get("F_PosTra").position, 0.5f, false, false, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart += () =>
@@ -1044,7 +1089,7 @@ public class ManaUI : Regist
         tween.OnBackwardFinish += () =>
         {
             ManaReso.Get("C_Main").TweenForCG();
-            ManaReso.Get("C_Group").GetTweenCG().InOrigin = true;
+            //ManaReso.Get("C_Group").GetTweenCG().InOrigin = true;
 
             ManaReso.SetActive("F_Manage", false);
         };

Assets/Script/Manage/ManaVisit.cs

@@ -14,17 +14,32 @@ public class ManaVisit
 
     #region 配置
 
-    public static int Cost;
+    public static int Cost
+    {
+        get { return Cost_; }
+        set
+        {
+            Cost_ = value;
+
+            ManaReso.Get<Text>("C_CostLab").text = "<(金币)>" + Cost;
+        }
+    }
+
+    public static int Cost_;
+
+
     public static int CoolTime;
     public static int AwardMin;
     public static int AwardMax;
     public static float FancyRate;
     public static float AwardRate;
     public static float CreateRate;
+    public static string CostFml;
 
     #endregion
 
     public static bool InVisit;
+    public static bool Complete;
     public static bool LoadComplete;
     public static bool TweenComplete;
     public static string XmlStr;
@@ -49,7 +64,9 @@ public class ManaVisit
     {
         XmlAttributeCollection attribute = ManaData.GetVisitConfig();
 
-        Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(attribute[5].Value, "l", ManaCenter.Level.ToString()));
+        CostFml = attribute[5].Value;
+
+        Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(CostFml, "l", ManaCenter.Level.ToString()));
         AwardMin = Mathf.CeilToInt((float) Auxiliary.FmlParse(attribute[2].Value, "l", ManaCenter.Level.ToString()));
         AwardMax = Mathf.CeilToInt((float) Auxiliary.FmlParse(attribute[3].Value, "l", ManaCenter.Level.ToString()));
 
@@ -121,6 +138,8 @@ public class ManaVisit
         }
 
         #endregion
+
+        Complete = true;
     }
 
 
@@ -488,6 +507,14 @@ public class ManaVisit
         InVisit = true;
     }
 
+    public static void UpdateCost()
+    {
+        if (Complete)
+        {
+            Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(CostFml, "l", ManaCenter.Level.ToString()));
+        }
+    }
+
 
     public static void DataReverse()
     {

Assets/Script/Object/Skill/Ability.cs

@@ -207,6 +207,10 @@ public class Ability : SkillRoot
             UseA();
             UseC();
         }
+        else if (ItemStatus_ == SkillStatus.UnLock)
+        {
+            ManaUI.SkillDepth++;
+        }
 
 
         ItemStatus = ItemStatus;
@@ -373,6 +377,11 @@ public class Ability : SkillRoot
             {
                 ManaAudio.PlayClip(Clip.SkillClip);
 
+                if (UnlockCur != Current.Free)
+                {
+                    ManaUI.SkillDepth--;
+                }
+
                 ItemStatus = SkillStatus.Upgrade;
 
                 Level = 1;
@@ -574,6 +583,8 @@ public class Ability : SkillRoot
                 }
                 else
                 {
+                    ManaUI.SkillDepth++;
+
                     ItemStatus = SkillStatus.UnLock;
                 }
             }

Assets/Script/Object/Skill/BigSkill.cs

@@ -261,6 +261,11 @@ public class BigSkill : Skill
             BarBk1.material = null;
         }
 
+        if (ItemStatus_ == SkillStatus.UnLock)
+        {
+            ManaUI.SkillDepth++;
+        }
+
         BarStatus = BarStatus;
         ItemStatus = ItemStatus;
     }
@@ -327,6 +332,8 @@ public class BigSkill : Skill
                     }
                     else
                     {
+                        ManaUI.SkillDepth++;
+
                         ItemStatus = SkillStatus.UnLock;
                     }
                 }
@@ -356,6 +363,11 @@ public class BigSkill : Skill
             {
                 ManaAudio.PlayClip(Clip.SkillClip);
 
+                if (UnlockCur != Current.Free)
+                {
+                    ManaUI.SkillDepth--;
+                }
+
                 BarStatus = SkillStatus.Buy;
                 ItemStatus = SkillStatus.Upgrade;
 

ToList.txt

@@ -1,10 +1,3 @@
-在访问按钮上显示花费
-
-F_Manage关闭后显示侧边栏
-
-技能解锁提示
-
-
 从Hierrarchy视图中检查是否有Bug
 
 发布前把服务器中的存档清理一次