Temp 5.24

Assets/Resource/Sprite/Garden/技能树1.png.meta

@@ -37,8 +37,8 @@ TextureImporter:
   spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
-  alignment: 7
-  spritePivot: {x: 0.5, y: 0.5}
+  alignment: 9
+  spritePivot: {x: 0.5, y: -0.1}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaUsage: 1

Assets/Resource/Sprite/Garden/技能添加彩虹.png.meta

@@ -37,8 +37,8 @@ TextureImporter:
   spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
-  alignment: 7
-  spritePivot: {x: 0.5, y: 0.5}
+  alignment: 9
+  spritePivot: {x: 0.5, y: -0.1}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaUsage: 1

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="280" />
+  <Version value="281" />
 
   <ID value="Default" />
 ////  <TutorialA value="0" />

Assets/Script/Manage/ManaAchieve.cs

@@ -321,19 +321,19 @@ public class Achieve
         objList.Add(new LanStr("Object", "AchieveItem_BtnLab0"));
         objList.Add("\n");
 
-        if (Math.Abs(DiamondOnce) > 0.0005f)
+        if (!DiamondOnce.Equal(0))
         {
             objList.Add("<(钻石)>" + DiamondOnce.ToString("0"));
         }
 
-        if (Math.Abs(CoinPerson) > 0.0005f)
+        if (!CoinPerson.Equal(0))
         {
             objList.Add(new LanStr("Common", "CoinPerson"));
             objList.Add("+");
             objList.Add(CoinPerson.ToString("0") + " ");
         }
 
-        if (Math.Abs(Person) > 0.0005f)
+        if (!Person.Equal(0))
         {
             objList.Add(new LanStr("Common", "Person"));
             objList.Add("+");
@@ -360,19 +360,19 @@ public class Achieve
         objList.Add(new LanStr("Object", "AchieveItem_BtnLab1"));
         objList.Add("\n");
 
-        if (Math.Abs(DiamondOnce) > 0.0005f)
+        if (!DiamondOnce.Equal(0))
         {
             objList.Add("<(钻石)>" + DiamondOnce.ToString("0"));
         }
 
-        if (Math.Abs(CoinPerson) > 0.0005f)
+        if (!CoinPerson.Equal(0))
         {
             objList.Add(new LanStr("Common", "CoinPerson"));
             objList.Add("+");
             objList.Add(CoinPerson.ToString("0") + " ");
         }
 
-        if (Math.Abs(Person) > 0.0005f)
+        if (!Person.Equal(0))
         {
             objList.Add(new LanStr("Common", "Person"));
             objList.Add("+");

Assets/Script/Manage/ManaAnim.cs

@@ -369,7 +369,7 @@ public class ManaAnim : Regist
             return start + delta;
         }
 
-        if (Math.Abs(duration) < 0.0005f)
+        if (duration.Equal(0))
         {
             return delta + start;
         }
@@ -397,7 +397,7 @@ public class ManaAnim : Regist
             return start + delta;
         }
 
-        if (Math.Abs(duration) < 0.0005f)
+        if (duration.Equal(0))
         {
             return delta + start;
         }
@@ -1680,19 +1680,19 @@ public class ManaAnim : Regist
 
     public static float GetTimerColor(Color value, float duration, Color start, Color delta, Curve curve)
     {
-        if (Math.Abs(delta.r) > 0.0005f)
+        if (!delta.r.Equal(0))
         {
             return TimerFunctionDic[curve](value.r, duration, start.r, delta.r);
         }
-        else if (Math.Abs(delta.g) > 0.0005f)
+        else if (!delta.g.Equal(0))
         {
             return TimerFunctionDic[curve](value.g, duration, start.g, delta.g);
         }
-        else if (Math.Abs(delta.b) > 0.0005f)
+        else if (!delta.b.Equal(0))
         {
             return TimerFunctionDic[curve](value.b, duration, start.b, delta.b);
         }
-        else if (Math.Abs(delta.a) > 0.0005f)
+        else if (!delta.a.Equal(0))
         {
             return TimerFunctionDic[curve](value.a, duration, start.a, delta.a);
         }

Assets/Script/Object/Skill/Ability.cs

@@ -256,7 +256,7 @@ public class Ability : SkillRoot
         ManaData.SkillPlus += NewPlus;
         ManaData.SkillPersonBuff += NewPersonBuff;
 
-        if (Math.Abs(NewSkillCD) > 0.0005f)
+        if (!NewSkillCD.Equal(0))
         {
             for (int i = 0; i < ManaData.SkillList.Count; i++)
             {
@@ -264,7 +264,7 @@ public class Ability : SkillRoot
             }
         }
 
-        if (Math.Abs(NewSkillCdBuff) > 0.0005f)
+        if (!NewSkillCdBuff.Equal(0))
         {
             for (int i = 0; i < ManaData.SkillList.Count; i++)
             {

Assets/Script/Tool/UI/HudTextPlus.cs

@@ -0,0 +1,113 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class HudTextPlus : MonoBehaviour
+{
+    #region 变量
+
+    public Text Text
+    {
+        get
+        {
+            if (Text_ == null)
+            {
+                Text_ = GetComponent<Text>();
+            }
+
+            return Text_;
+        }
+        set { Text_ = value; }
+    }
+    public Outline Outline
+    {
+        get
+        {
+            if (Outline_ == null)
+            {
+                Outline_ = GetComponent<Outline>();
+            }
+
+            return Outline_;
+        }
+        set { Outline_ = value; }
+    }
+
+    public Text Text_;
+    public Outline Outline_;
+
+    public float Speed;
+    public Vector3 Direction;
+
+    #endregion
+
+    private void FixedUpdate()
+    {
+        transform.position += new Vector3(0, Speed*Time.fixedDeltaTime, 0);
+
+        if (Text.color.a <= 0.05f)
+        {
+            ManaReso.Save(gameObject);
+        }
+    }
+
+
+    public void SetOutline(Color color)
+    {
+        Outline.effectColor = color;
+    }
+
+    public void SetOutline(Color color, Vector2 size)
+    {
+        Outline.effectColor = color;
+        Outline.effectDistance = size;
+    }
+
+    public void SetDirection(Vector3 direction)
+    {
+        Direction = direction;
+    }
+
+
+    public void Show(string str, int size, float time, float speed)
+    {
+        Text.text = str;
+        Text.fontSize = size;
+
+        Speed = speed;
+
+        Tween tween = Text.CreateTweenGra(0, time, false, false, Curve.EaseOutQuad);
+
+        tween.StartForward();
+    }
+
+    public void Show(string str, int size, float time, float speed, Color originColor)
+    {
+        Text.text = str;
+        Text.fontSize = size;
+
+        Speed = speed;
+
+        Text.color = originColor;
+
+        Tween tween = Text.CreateTweenGra(0, time, false, false, Curve.EaseOutQuad);
+
+        tween.StartForward();
+    }
+
+    public void Show(string str, int size, float time, float speed, Color originColor, Color destColor)
+    {
+        Text.text = str;
+        Text.fontSize = size;
+
+        Speed = speed;
+
+        Text.color = originColor;
+
+        Tween tween = Text.CreateTweenGra(destColor, time, false, false, Curve.EaseOutQuad);
+
+        tween.StartForward();
+    }
+}

Assets/Script/Tool/UI/HudTextPlus.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: d234fefce2a53b047b608c19e5da6cc6
+timeCreated: 1495618406
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ToList.txt

@@ -1,17 +1,10 @@
 编存档 下载随机存档失败时就编一个存档
 
 
-拉进时上边都蓝线
-
-镜头拉近冲突的情况
-
 注册Bug
 
 Reactive的Bug
 
-检查各个技能的效果
-
-
 
 分享图片报错
 
@@ -29,7 +22,7 @@ Reactive
 
 
 
-Hud能往左右上下走，设置自己的颜色 设置Outline的颜色 设置速度
+Hud能往左右上下走，设置自己的颜色 设置Outline的颜色、宽度 设置速度 未设置时的默认值
 
 动画
 (