6.15

Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/iOS/builds.meta

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

Assets/Advertisements/Editor/Resources/iOS/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: deca0ba656ca01b40a6bc5a68c0561b1
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/Android/builds.meta → Assets/Extension.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 8d2d384f78b29a44a9c70c3daf45d1cb
+guid: b948198483a8b93419206e81215060f3
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1496150477
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,10 +1,10 @@
 <PlayerConfig>
-  <Version value="652" />
+  <Version value="655" />
 
   <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" />
@@ -49,7 +49,7 @@
     <Skill ID="Pack10" SkillType="Pack" ItemStatus="Lock" Level="0" />
     <Skill ID="Pack11" SkillType="Pack" ItemStatus="Lock" Level="0" />
     
-    <Skill ID="Ability1" SkillType="Ability" ItemStatus="Upgrade" Level="18" />
+    <Skill ID="Ability1" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability2" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability3" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability4" SkillType="Ability" ItemStatus="Lock" Level="0" />

Assets/Script/Manage/ManaCenter.cs

@@ -148,13 +148,13 @@ public class ManaCenter : Regist
                 }
             }
 
-            if (Level_ >= 18)
-            {
-                if (ManaTutorial.TutorialB_)
-                {
-                    ManaTutorial.TutorialB = true;
-                }
-            }
+            //if (Level_ >= 18)
+            //{
+            //    if (ManaTutorial.TutorialB_)
+            //    {
+            //        ManaTutorial.TutorialB = true;
+            //    }
+            //}
         }
     }
     public static float Person

Assets/Script/Manage/ManaMiniGame.cs

@@ -98,7 +98,7 @@ public class Award
         #region Diamond
 
         float diamondRate = (float)Auxiliary.FmlParse(DiamondFml, "l", Mathf.Clamp(ManaCenter.Level, 1, 1000).ToString());
-
+        
         if (Random.Range(0, 1f) <= diamondRate)
         {
             DiamondFlag = true;
@@ -198,16 +198,7 @@ public class Award
 
         #endregion
 
-        ManaReso.Get("Da_Info").TweenForCG();
-
-        //Auxiliary.Instance.DelayCall
-        //    (
-        //        () =>
-        //        {
-        //            Debug.LogError("");
-        //        },
-        //        1
-        //    );
+        ManaReso.SetActive("Da_Info", true);
 
         Auxiliary.Instance.DelayCall
             (
@@ -231,6 +222,8 @@ public class Award
 
         #region Reset
 
+        ManaReso.Get("Da_Info").TweenForCG();
+
         ManaReso.SetText("Da_Tit", Language.GetStr("UI", "Da_Tit1"));
         ManaReso.SetText("Da_CoinLab", "0");
         ManaReso.SetText("Da_DiamondLab", "0");
@@ -918,7 +911,7 @@ public class ManaMiniGame : Regist
 
             Flower flower = FlowerDic[index];
 
-            ManaReso.GetHudText("+45", Color.white, 90, flower.ChildDic["ScorePosTra"], ManaReso.Get("D_MiniGame"), true);
+            ManaReso.GetHudText("+45", Color.white, 90, flower.ChildDic["ScorePosTra"], ManaReso.Get("D_HudParent"), true);
 
             Score += 45;
 
@@ -1086,28 +1079,29 @@ public class ManaMiniGame : Regist
         D_Operate1.SetActive(false);
         D_Operate2.SetActive(false);
 
-        if (ManaCenter.Level >= 18)
-        {
-            if (ManaTutorial.TutorialB)
-            {
-                GameB = true;
-            }
-            else
-            {
-                if (Random.Range(0f, 1f) <= 0.5f)
-                {
-                    GameB = true;
-                }
-                else
-                {
-                    GameA = true;
-                }
-            }
-        }
-        else
-        {
-            GameA = true;
-        }
+        GameA = true;
+        //if (ManaCenter.Level >= 18)
+        //{
+        //    if (ManaTutorial.TutorialB)
+        //    {
+        //        GameB = true;
+        //    }
+        //    else
+        //    {
+        //        if (Random.Range(0f, 1f) <= 0.5f)
+        //        {
+        //            GameB = true;
+        //        }
+        //        else
+        //        {
+        //            GameA = true;
+        //        }
+        //    }
+        //}
+        //else
+        //{
+        //    GameA = true;
+        //}
     }
 
     public static void InitializeAward()

Assets/Script/Manage/ManaUI.cs

@@ -442,6 +442,11 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Da_FlowerGroup", false);
                 ManaReso.SetActive("Da_DiamondGroup", true);
 
+                ManaReso.Get<Text>("Da_CoinLab").Resize(true, false);
+                ManaReso.Get<Text>("Da_DiamondLab").Resize(true, false);
+
+                ManaReso.Get<ContentSizeFitter>("Da_CoinGroup").enabled = true;
+                ManaReso.Get<ContentSizeFitter>("Da_DiamondGroup").enabled = true;
 
                 if (!Award.FlowerLock)
                 {

Assets/Script/Object/DropDiamond.cs

@@ -14,6 +14,6 @@ public class DropDiamond : Drop
 
         Award.BonusDiamond += diamond;
 
-        ManaReso.GetHudText("<(钻石)>+" + diamond, Color.white, 90, transform, ManaReso.Get("D_MiniGame"), true);
+        ManaReso.GetHudText("<(钻石)>+" + diamond, Color.white, 90, transform, ManaReso.Get("D_HudParent"), true);
     }
 }

Assets/Script/Object/DropGold.cs

@@ -20,6 +20,6 @@ public class DropGold : Drop
 
         Award.BonusCoin += coin;
 
-        ManaReso.GetHudText("<(金币)>+" + coin, Color.white, 90, transform, ManaReso.Get("D_MiniGame"), true);
+        ManaReso.GetHudText("<(金币)>+" + coin, Color.white, 90, transform, ManaReso.Get("D_HudParent"), true);
     }
 }

Assets/Script/Object/Flower.cs

@@ -442,7 +442,7 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            ManaReso.GetHudText("+15", Color.white, 90, ChildDic["ScorePosTra"], ManaReso.Get("D_MiniGame"), true);
+            ManaReso.GetHudText("+15", Color.white, 90, ChildDic["ScorePosTra"], ManaReso.Get("D_HudParent"), true);
 
             ManaMiniGame.Score += 15;
 

Assets/Script/Tool/Auxiliary.cs

@@ -124,17 +124,17 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            ManaCenter.MiniTimer = 0;
+            //ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            ManaMiniGame.GameTimer = 45;
+            //ManaMiniGame.GameTimer = 45;
         }
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            ManaMiniGame.Score = 2000;
+            //ManaMiniGame.Score = 2000;
         }
 
         if (Input.GetKeyDown(KeyCode.V))

Assets/Script/Tool/DashGame/Logo.cs

@@ -1,4 +1,4 @@
- using UnityEngine;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 using System;

Assets/Script/Tool/UI/HudText.cs

@@ -57,11 +57,6 @@ public class HudText : Regist
             }
 
             transform.position += new Vector3(0, Speed * Time.fixedDeltaTime, 0);
-
-            if (Text.color.a <= 0.05f)
-            {
-                ManaReso.Save(gameObject);
-            }
         }
     }
 
@@ -77,6 +72,17 @@ public class HudText : Regist
         StayTimer = stay;
 
 
-        Text.CreateTweenCG(1, 0, time, false, false, Curve.EaseOutQuad);
+        TweenCG tween = Text.CreateTweenCG(1, 0, time, true, true, Curve.EaseOutQuad);
+
+        tween.CanvasGroup.alpha = 1;
+
+        tween.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                ManaReso.Save(gameObject);
+            }
+        );
     }
 }

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.2f1
+m_EditorVersion: 5.5.0f3

ToList.txt

@@ -1,25 +1,20 @@
-还原PlayerConfig
+//还原PlayerConfig
 
-关闭调试界面
+//关闭调试界面
 
-关闭调试按键
+//关闭调试按键
 
-注意存档覆盖情况
-
-
-监督补上循环特效
+//注意存档覆盖情况
 
 
 装个WPS
 
-Hud的重用
+监督补上循环特效
 
-小游戏Hud的层级
 
 切换材质时的颜色
 
-Da_Info的VerticalLayout
+开启小游戏B和其教程
 
-弹出退出小游戏界面时也要刷新金币和钻石的Layout和宽度
 
 TweenNumber加一个Prefix和Epilogue功能