Temp

Assets/Advertisements/Editor/Resources/Android.meta

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

Assets/Script/Manage/ManaMiniGame.cs

@@ -137,6 +137,10 @@ public class Award
 
                 sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(钻石)>", Diamond);
             }
+            else
+            {
+                Diamond = 0;
+            }
         }
 
         #endregion
@@ -272,7 +276,7 @@ public class Award
         float timeDiamond = Mathf.Lerp(0, 1.5f, Mathf.Clamp01(Diamond / 15f));
 
         float time = Mathf.Max(timeCoin, timeDiamond);
-
+        
         ManaReso.Get("Da_CoinLab").CreateTweenNumber(0, Coin, time, false, true, Curve.EaseOutQuad);
         ManaReso.Get("Da_ScoreLab").CreateTweenNumber(0, Score, timeScore, false, true, Curve.EaseOutQuad);
         ManaReso.Get("Da_DiamondLab").CreateTweenNumber(0, Diamond, time, false, true, Curve.EaseOutQuad);

Assets/Script/Manage/ManaReso.cs

@@ -792,7 +792,7 @@ public class ManaReso : Regist
 
         return tra;
     }
-
+    
 
     public static ParticleSystem GetFirework(Vector3 pos)
     {

Assets/Script/Object/Garden.cs

@@ -68,7 +68,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         Transform tra = ManaReso.Get("Cloud1");
 
-        TweenRoot tween = tra.CreateTweenVec2D(new Vector3(-12, tra.position.y, tra.position.z), 50f, false, false, true, Curve.Linear);
+        TweenRoot tween = tra.CreateTweenVec2D(new Vector3(-12, tra.position.y, tra.position.z), 85f, false, false, true, Curve.Linear);
 
         tween.Repeat = true;
 
@@ -80,7 +80,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         tra = ManaReso.Get("Cloud2");
 
-        tween = tra.CreateTweenVec2D(new Vector3(-12, tra.position.y, tra.position.z), 75f, false, false, true, Curve.Linear);
+        tween = tra.CreateTweenVec2D(new Vector3(-12, tra.position.y, tra.position.z), 127.5f, false, false, true, Curve.Linear);
 
         tween.Repeat = true;
 
@@ -92,7 +92,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         tra = ManaReso.Get("Cloud3");
 
-        tween = tra.CreateTweenVec2D(new Vector3(-12, tra.position.y, tra.position.z), 100, false, false, true, Curve.Linear);
+        tween = tra.CreateTweenVec2D(new Vector3(-12, tra.position.y, tra.position.z), 170, false, false, true, Curve.Linear);
 
         tween.Repeat = true;
 

Assets/Script/Tool/Auxiliary.cs

@@ -128,6 +128,19 @@ public class Auxiliary : Regist
 
         }
 
+        if (Input.GetKeyDown(KeyCode.B))
+        {
+            for (int i = 0; i < ManaCenter.UseList.Count; i++)
+            {
+                ManaCenter.UseList[i].UseTimer = 0;
+            }
+
+            for (int i = 0; i < ManaCenter.CoolList.Count; i++)
+            {
+                ManaCenter.CoolList[i].CoolTimer = 0;
+            }
+        }
+
         if (Input.GetKeyDown(KeyCode.Z))
         {
             ManaCenter.MiniTimer = 0;

ToList.txt

@@ -10,6 +10,10 @@
 
 测试进游戏的概率
 
+新花特效
+
+测试访问时的新精灵
+
 解锁精灵时只在当前页的花上缩进
 
 试衣间的收起和关闭
@@ -34,27 +38,4 @@
 //更新版本号
 
 
-分享appid申请
-
-监督补上循环特效
-
-
-小任务 
-{
-  VerticalBestfit计算次数太多时性能低
-
-  Unity是如何实现不同图片也Batch的(看DragonBones源代码)
-}
-
-动画
-{
-  增加一个Return功能(分为ForwardReturn和BackwardReturn 当ForwardFinish后自动开始Backward 或者 当BackwardFinish后自动开始Forward 把Pingpong改为由ForwardReturn和BackwardReturn组成)
-  Triplet结构(True Flase Null)
-}
-
-Extension
-{
-  将Extension放在同一个命名空间下
-
-  ExArray
-}
+分享appid申请