LiuQilin 8 years ago
parent
commit
71b70384f6

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resource/Logo.unity


BIN
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupB.prefab


+ 4 - 4
Assets/Resource/XML/PlayerConfig.xml

@@ -1,16 +1,16 @@
 <PlayerConfig>
 <PlayerConfig>
-  <Version value="440" />
+  <Version value="484" />
 
 
   <ID value="Default" />
   <ID value="Default" />
-////  <TutorialA value="1" />
+////  <TutorialA value="0" />
 ////  <TutorialB value="1" />
 ////  <TutorialB value="1" />
-////  <TutorialC value="1" />
+////  <TutorialC value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
   <TutorialIndexC value="1" />
 
 
   <Player value="PlayerBlond" />
   <Player value="PlayerBlond" />
-  <QuitFlag value="0" />
+////  <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />
   <QuitTime value="4/23/2017 09:30:00 AM" />
   <SignTime value="4/23/2017 09:30:00 AM" />
   <SignTime value="4/23/2017 09:30:00 AM" />
   <Language value="ChineseSimplified" />
   <Language value="ChineseSimplified" />

+ 24 - 3
Assets/Script/Manage/ManaCenter.cs

@@ -724,7 +724,6 @@ public class ManaCenter : Regist
             coin += (NewPerson*NewCoinPerson*CircleTime)*(1 + SkillPlus);
             coin += (NewPerson*NewCoinPerson*CircleTime)*(1 + SkillPlus);
         }
         }
 
 
-
         CircleTimer = (Elapse - CircleTimer)%CircleTime;
         CircleTimer = (Elapse - CircleTimer)%CircleTime;
 
 
         for (int j = 0; j < TempCoolList.Count; j++)
         for (int j = 0; j < TempCoolList.Count; j++)
@@ -1026,7 +1025,7 @@ public class ManaCenter : Regist
 
 
     public void OnApplicationQuit()
     public void OnApplicationQuit()
     {
     {
-        if (Initializer.Complete && !SaveLock)
+        if (!SaveLock)
         {
         {
             ManaVisit.DataReverse();
             ManaVisit.DataReverse();
 
 
@@ -1076,4 +1075,26 @@ public class ManaCenter : Regist
             }
             }
         }
         }
     }
     }
-}
+}
+
+#region DebugList
+
+//离线期间、Reactive、Reload等效
+
+//离线期间的收入
+//{
+//  技能等级大于1时
+//  有单个临时加成时
+//  有单个永久加成时
+//  有多个临时加成时
+//  有多个永久加成时
+//}
+
+//离线期间的使用时间
+//离线期间的冷却时间
+//离线期间从使用变为冷却
+
+//技能冷却时间Buff
+//多次Reload、Reactive后的技能冷却时间Buff
+
+#endregion

+ 3 - 3
Assets/Script/Manage/ManaMiniGame.cs

@@ -126,7 +126,7 @@ public class Award
         }
         }
         else
         else
         {
         {
-            float flowerRate = (float)Auxiliary.FmlParse(DiamondFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+            float flowerRate = (float)Auxiliary.FmlParse(FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
 
 
             if (Random.Range(0, 1f) <= flowerRate)
             if (Random.Range(0, 1f) <= flowerRate)
             {
             {
@@ -628,7 +628,7 @@ public class ManaMiniGame : Regist
     public static float DiamondTimer;
     public static float DiamondTimer;
 
 
     public static float OpTime = 1.5f;
     public static float OpTime = 1.5f;
-    public static float GameTime = 15;
+    public static float GameTime = 45;
     public static float PanaltyTime = 1;
     public static float PanaltyTime = 1;
     public static float NewOpTime;
     public static float NewOpTime;
 
 
@@ -824,7 +824,7 @@ public class ManaMiniGame : Regist
         {
         {
             ManaCenter.MiniLock = false;
             ManaCenter.MiniLock = false;
 
 
-            ManaCenter.MiniTimer = Mathf.Lerp(10, 12, Random.Range(0, 1f));
+            ManaCenter.MiniTimer = Mathf.Lerp(180, 300, Random.Range(0, 1f));
         }
         }
 
 
         if (ManaCenter.MiniTimer <= 0)
         if (ManaCenter.MiniTimer <= 0)

+ 1 - 1
Assets/Script/Manage/ManaUI.cs

@@ -1060,7 +1060,7 @@ public class ManaUI : Regist
             {
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
                 ManaAudio.PlayClip(Clip.BtnClip);
 
 
-                Bubble.Show(Language.GetStr("UI", "F_PersonBtn0"), Language.GetStr("UI", "F_PersonBtn1"), ManaReso.LoadSprite("绿-免费金币", Folder.UI));
+                Bubble.Show(Language.GetStr("UI", "F_PersonBtn0"), Language.GetStr("UI", "F_PersonBtn1"), ManaReso.LoadSprite("4大技能1", Folder.UI));
             }
             }
         );
         );
 
 

+ 2 - 2
Assets/Script/Manage/ManaVisit.cs

@@ -50,8 +50,8 @@ public class ManaVisit
         XmlAttributeCollection attribute = ManaData.GetVisitConfig();
         XmlAttributeCollection attribute = ManaData.GetVisitConfig();
 
 
         Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(attribute[5].Value, "l", ManaCenter.Level.ToString()));
         Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(attribute[5].Value, "l", ManaCenter.Level.ToString()));
-        AwardMin = Mathf.CeilToInt((float) Auxiliary.FmlParse(attribute[2].Value));
-        AwardMax = Mathf.CeilToInt((float)Auxiliary.FmlParse(attribute[3].Value, "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()));
 
 
         CoolTime = int.Parse(attribute[4].Value);
         CoolTime = int.Parse(attribute[4].Value);
         FancyRate = float.Parse(attribute[7].Value);
         FancyRate = float.Parse(attribute[7].Value);

+ 2 - 2
Assets/Script/Object/Skill/Ability.cs

@@ -483,7 +483,7 @@ public class Ability : SkillRoot
                 AnnulA();
                 AnnulA();
 
 
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString("0.00"));
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString("0.00"));
-
+                
                 UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
                 UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
                 UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
                 UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
                 UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, 1);
                 UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, 1);
@@ -491,7 +491,7 @@ public class Ability : SkillRoot
                 UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
                 UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
                 UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, 1);
                 UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, 1);
                 UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
                 UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
-
+                
                 UseA();
                 UseA();
                 UseB();
                 UseB();
 
 

+ 8 - 1
Assets/Script/Tool/Auxiliary.cs

@@ -492,7 +492,14 @@ public class Auxiliary : Regist
     {
     {
         for (int i = 0; i < strings.Length; i += 2)
         for (int i = 0; i < strings.Length; i += 2)
         {
         {
-            str = str.Replace(strings[i], strings[i + 1]);
+            if (str.Contains(strings[i]))
+            {
+                str = str.Replace(strings[i], strings[i + 1]);
+            }
+            else
+            {
+                //Debug.Log("No such var " + strings[i + 1]);
+            }
         }
         }
         
         
         int openIndex = 0;
         int openIndex = 0;

+ 4 - 2
ToList.txt

@@ -1,6 +1,8 @@
-小游戏时间(45)
+在访问按钮上显示花费
 
 
-小游戏冷却时间(180,300)
+F_Manage关闭后显示侧边栏
+
+技能解锁提示
 
 
 
 
 从Hierrarchy视图中检查是否有Bug
 从Hierrarchy视图中检查是否有Bug