update

Assets/Resources/Prefab/Object/FlowerAnimContainer.prefab.meta → Assets/Resources/Prefab/Object/MusicMini.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: a028263d25a4f814aba859c33d77e598
-timeCreated: 1489472725
+guid: 036d110bdcdeaa0469e801ad23e098c0
+timeCreated: 1489836991
 licenseType: Pro
 NativeFormatImporter:
   userData: 

Assets/Resources/Prefab/Object/MusicTheme.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c4bb1b3de98b71d40bbd8a0c1353ac90
+timeCreated: 1489836990
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Object/Hud.meta → Assets/Resources/Shader.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 3d54bc43d13b52244af8c6c72adc8697
+guid: 8e8f30832b5b0074590e90dcdc78740d
 folderAsset: yes
-timeCreated: 1488422938
+timeCreated: 1489889703
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Resources/Shader/Gray.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9afe516b3d7c64a4f9c1f4f2b9419129
+timeCreated: 1489889916
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Shader/Gray.shader

@@ -0,0 +1,58 @@
+Shader "DashGame/Gray"
+{
+	Properties
+	{
+		_MainTex ("Texture", 2D) = "white" {}
+	}
+
+	SubShader
+	{
+		Tags { "Queue"="Overlay" }
+
+		Pass
+		{
+			Blend SrcAlpha OneMinusSrcAlpha
+
+			CGPROGRAM
+
+			#pragma vertex vert
+			#pragma fragment frag
+			
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float4 vertex : POSITION;
+				float2 uv : TEXCOORD0;
+			};
+
+			struct v2f
+			{
+				float2 uv : TEXCOORD0;
+				float4 vertex : SV_POSITION;
+			};
+
+			sampler2D _MainTex;
+			float4 _MainTex_ST;
+			
+			v2f vert (appdata v)
+			{
+				v2f o;
+				o.vertex = UnityObjectToClipPos(v.vertex);
+				o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+				return o;
+			}
+			
+			fixed4 frag (v2f i) : SV_Target
+			{
+				fixed4 col = tex2D(_MainTex, i.uv);
+
+				fixed gray = dot(col.rgb, fixed3(0.299, 0.587, 0.114));
+
+				col.rgb = fixed3(gray, gray, gray);
+				return col;
+			}
+			ENDCG
+		}
+	}
+}

Assets/Resources/Shader/Gray.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ac390d8200b91bd419e2d7b9e580d07d
+timeCreated: 1489889722
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/XML/Config/PlayerConfig.xml

@@ -1,45 +1,45 @@
 <PlayerConfig>
-  <Coin value="114" />
+  <Coin value="1368" />
   <Level value="10" />
   <Person value="1" />
   <Diamond value="0" />
-  <QuitTime value="3/17/2017 6:23:20 PM" />
+  <QuitTime value="3/19/2017 7:33:36 PM" />
   <CoinPerson value="1" />
-  <CircleTimer value="9.6021184772253" />
+  <CircleTimer value="7.439955" />
   <PlantList FlowerTraA1="1" FlowerTraA2="2" FlowerTraA3="3" FlowerTraA4="4" FlowerTraA5="5" FlowerTraA6="6" FlowerTraA7="7" FlowerTraA8="8" FlowerTraA9="9" />
   <FlowerList ID="1 2 3 4 5 6 7 8 9 " />
   <SkillList>
-    <免费获取金币 SkillCato="Skill" ItemStatus="Buy" Level="0" CdTimer="-2" EffectTimer="-2" />
-    <免费获取钻石 SkillCato="Skill" ItemStatus="Buy" Level="0" CdTimer="-2" EffectTimer="-2" />
-    <技能冷却 SkillCato="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="-2" EffectTimer="-2" />
-    <花园 SkillCato="Ability" ItemStatus="Upgrade" Level="0" />
-    <繁花似锦 SkillCato="Skill" ItemStatus="Lock" Level="0" CdTimer="-2" EffectTimer="-2" />
-    <黄色小蜜蜂 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <人潮涌动 SkillCato="BigSkill" ItemStatus="Upgrade" BarStatus="Use" Level="0" CdTimer="1800" EffectTimer="290.662469377741" />
-    <紫色小蜜蜂 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillCato="Pack" Name="金币大礼包" ItemStatus="Buy" Level="0" />
-    <礼包 SkillCato="Pack" Name="新手礼包" ItemStatus="Lock" Level="0" />
-    <大亨光临 SkillCato="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="-2" EffectTimer="-2" />
-    <礼包 SkillCato="Pack" Name="天赐大礼包" ItemStatus="Buy" Level="0" />
-    <礼包 SkillCato="Pack" Name="中级礼包" ItemStatus="Buy" Level="0" />
-    <蓝色小蜜蜂 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillCato="Pack" Name="高级礼包" ItemStatus="Buy" Level="0" />
-    <礼包 SkillCato="Pack" Name="花神大礼包" ItemStatus="Buy" Level="0" />
-    <红色小蜜蜂 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <花之祝福 SkillCato="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="-2" EffectTimer="-2" />
-    <白色小蜜蜂 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <炼金石 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillCato="Pack" Name="钻石100" ItemStatus="Buy" Level="0" />
-    <黄色小蝴蝶 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillCato="Pack" Name="钻石500 赠送50" ItemStatus="Buy" Level="0" />
-    <神秘灌木 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <紫色小蝴蝶 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillCato="Pack" Name="钻石2000 赠送500" ItemStatus="Buy" Level="0" />
-    <滴哩哩的小黄鹂 SkillCato="Ability" ItemStatus="Upgrade" Level="0" />
-    <蓝色小蝴蝶 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillCato="Pack" Name="钻石6000 赠送600" ItemStatus="Buy" Level="0" />
-    <红色小蝴蝶 SkillCato="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillCato="Pack" Name="钻石10000 赠送2000" ItemStatus="Buy" Level="0" />
-    <白色小蝴蝶 SkillCato="Ability" ItemStatus="Lock" Level="0" />
+    <免费获取金币 SkillType="Skill" ItemStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
+    <免费获取钻石 SkillType="Skill" ItemStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
+    <技能冷却 SkillType="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
+    <花园 SkillType="Ability" ItemStatus="Upgrade" Level="0" />
+    <繁花似锦 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
+    <黄色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <人潮涌动 SkillType="BigSkill" ItemStatus="Upgrade" BarStatus="Use" Level="0" CdTimer="1800" EffectTimer="294.340000126511" />
+    <紫色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="金币大礼包" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="新手礼包" ItemStatus="Lock" Level="0" />
+    <大亨光临 SkillType="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
+    <礼包 SkillType="Pack" Name="天赐大礼包" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="中级礼包" ItemStatus="Buy" Level="0" />
+    <蓝色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="高级礼包" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="花神大礼包" ItemStatus="Buy" Level="0" />
+    <红色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <花之祝福 SkillType="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
+    <白色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <炼金石 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石100" ItemStatus="Buy" Level="0" />
+    <黄色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石500 赠送50" ItemStatus="Buy" Level="0" />
+    <神秘灌木 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <紫色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石2000 赠送500" ItemStatus="Buy" Level="0" />
+    <滴哩哩的小黄鹂 SkillType="Ability" ItemStatus="Upgrade" Level="0" />
+    <蓝色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石6000 赠送600" ItemStatus="Buy" Level="0" />
+    <红色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石10000 赠送2000" ItemStatus="Buy" Level="0" />
+    <白色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
   </SkillList>
 </PlayerConfig>

Assets/Script/Editor/EditorConfigExporter.cs

@@ -57,7 +57,7 @@ public class EditorConfigExporter : EditorWindow
     /// <returns>File name in array</returns>
     /// <param name="path">Assets sublevel path</param>
     /// <param name="pattern">File type filter</param>
-    /// <typeparam name="T">Class name</typeparam>
+    /// <typeparam name="T">Tab name</typeparam>
     void GetObjectNameToArray<T>(string path, string pattern, string subDirectory = "")
     {
         try

Assets/Script/Manage/Initializer.cs

@@ -1,8 +1,9 @@
-using UnityEngine;
+using LitJson;
+
+using UnityEngine;
 using UnityEngine.EventSystems;
 
 using System.Collections;
-using LitJson;
 
 public delegate void Regist();
 
@@ -10,8 +11,8 @@ public class Initializer : MonoBehaviour
 {
     #region
 
-    public static Regist RegistValue; //赋值
-    public static Regist RegistReference; //建立引用
+    public static Regist RegistValue;
+    public static Regist RegistReference;
 
     #endregion
 
@@ -19,6 +20,7 @@ public class Initializer : MonoBehaviour
     {
         gameObject.AddComponent<ManaReso>();
         gameObject.AddComponent<ManaAnim>();
+        gameObject.AddComponent<ManaAudio>();
 
         gameObject.AddComponent<ManaUI>();
         gameObject.AddComponent<ManaData>();
@@ -28,12 +30,11 @@ public class Initializer : MonoBehaviour
         gameObject.AddComponent<ManaMiniGame>();
 
         gameObject.AddComponent<ManaLog>();
-        gameObject.AddComponent<ManaMessage>();
 
         RegistReference();
         RegistValue();
 
-        ManaLog.Log(string.Format("开始调试 每<color=red>{0}</color>秒计算一次收入", ManaData.Circle));
+        ManaLog.Log(string.Format("开始调试 每<color=red>{0}</color>秒计算一次收入", ManaData.CircleTime));
         ManaLog.Log(string.Format("开始调试 按<color=red>{0}</color>键-升级花园 <color=red>{1}</color>键-冷却技能 <color=red>{2}</color>键-获取游戏币", "P", "O", "I"));
     }
 }

Assets/Script/Manage/ManaAnim.cs

@@ -31,12 +31,11 @@ public class ManaAnim : MonoBehaviour
     public static Dictionary<Curve, CurveFunctionV> FunctionDicV;
 
     public static Dictionary<Transform, MoveVec> MoveVecDic;
-    public static Dictionary<Transform, MoveScrr> MoveScrrDic;
-
     public static Dictionary<Transform, TweenCG> TweenCgDic;
-    public static Dictionary<Transform, TweenVec> TweenVecDic;
     public static Dictionary<Transform, TweenGra> TweenGraDic;
+    public static Dictionary<Transform, TweenVec> TweenVecDic;
     public static Dictionary<Transform, TweenScale> TweenScaleDic;
+    public static Dictionary<Transform, TweenAudio> TweenAudioDic;
 
     #endregion
 
@@ -84,12 +83,11 @@ public class ManaAnim : MonoBehaviour
         FunctionDicV = new Dictionary<Curve, CurveFunctionV>();
 
         MoveVecDic = new Dictionary<Transform, MoveVec>();
-        MoveScrrDic = new Dictionary<Transform, MoveScrr>();
-
         TweenCgDic = new Dictionary<Transform, TweenCG>();
-        TweenVecDic = new Dictionary<Transform, TweenVec>();
         TweenGraDic = new Dictionary<Transform, TweenGra>();
+        TweenVecDic = new Dictionary<Transform, TweenVec>();
         TweenScaleDic = new Dictionary<Transform, TweenScale>();
+        TweenAudioDic = new Dictionary<Transform, TweenAudio>();
 
         FunctionDicF.Add(Curve.Linear, Linear);
         FunctionDicF.Add(Curve.EaseOutQuad, EaseOutQuad);
@@ -102,11 +100,18 @@ public class ManaAnim : MonoBehaviour
     }
 
 
-    #region 动画函数
+    #region 曲线
 
     public static float Linear(float timer, float duration, float start, float delta)
     {
-        return delta*timer/duration + start;
+        if (Math.Abs(duration) < 0.0005f)
+        {
+            return delta + start;
+        }
+        else
+        {
+            return delta * timer / duration + start;
+        }
     }
 
     public static Color Linear(float timer, float duration, Color start, Color delta)
@@ -122,9 +127,16 @@ public class ManaAnim : MonoBehaviour
 
     public static float EaseOutQuad(float timer, float duration, float start, float delta)
     {
-        timer /= duration;
+        if (Math.Abs(duration) < 0.0005f)
+        {
+            return delta + start;
+        }
+        else
+        {
+            timer /= duration;
 
-        return -delta*timer*(timer - 2) + start;
+            return -delta * timer * (timer - 2) + start;
+        }
     }
 
     public static Color EaseOutQuad(float timer, float duration, Color start, Color delta)
@@ -139,7 +151,6 @@ public class ManaAnim : MonoBehaviour
 
     #endregion
 
-
     #region 播放动画
 
     public static void MoveVec(Transform target, Vector3 destination, float duration, Curve curve)
@@ -158,30 +169,28 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static void MoveScrr(Transform target, float destination, float duration, Curve curve)
+
+    public static void TweenForCG(Transform target)
     {
-        MoveScrr moveScrr;
+        TweenCG tweenCG;
 
-        if (MoveScrrDic.TryGetValue(target, out moveScrr))
+        if (TweenCgDic.TryGetValue(target, out tweenCG))
         {
-            moveScrr.StartMove(destination, duration, curve);
+            tweenCG.StartForward();
         }
         else
         {
-            moveScrr = CreateMoveScrr(target);
-
-            moveScrr.StartMove(destination, duration, curve);
+            throw new Exception();
         }
     }
 
-
-    public static void TweenForCG(Transform target)
+    public static void TweenForGra(Transform target)
     {
-        TweenCG tweenCG;
+        TweenGra tweenGra;
 
-        if (TweenCgDic.TryGetValue(target, out tweenCG))
+        if (TweenGraDic.TryGetValue(target, out tweenGra))
         {
-            tweenCG.StartForward();
+            tweenGra.StartForward();
         }
         else
         {
@@ -203,13 +212,13 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static void TweenForGra(Transform target)
+    public static void TweenForScale(Transform target)
     {
-        TweenGra tweenGra;
+        TweenScale tweenScale;
 
-        if (TweenGraDic.TryGetValue(target, out tweenGra))
+        if (TweenScaleDic.TryGetValue(target, out tweenScale))
         {
-            tweenGra.StartForward();
+            tweenScale.StartForward();
         }
         else
         {
@@ -217,13 +226,13 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static void TweenForScale(Transform target)
+    public static void TweenForAudio(Transform target)
     {
-        TweenScale tweenScale;
+        TweenAudio tween;
 
-        if (TweenScaleDic.TryGetValue(target, out tweenScale))
+        if (TweenAudioDic.TryGetValue(target, out tween))
         {
-            tweenScale.StartForward();
+            tween.StartForward();
         }
         else
         {
@@ -246,13 +255,13 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static void TweenBacVec(Transform target)
+    public static void TweenBacGra(Transform target)
     {
-        TweenVec tweenVec;
+        TweenGra tweenGra;
 
-        if (TweenVecDic.TryGetValue(target, out tweenVec))
+        if (TweenGraDic.TryGetValue(target, out tweenGra))
         {
-            tweenVec.StartBackward();
+            tweenGra.StartBackward();
         }
         else
         {
@@ -260,13 +269,13 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static void TweenBacGra(Transform target)
+    public static void TweenBacVec(Transform target)
     {
-        TweenGra tweenGra;
+        TweenVec tweenVec;
 
-        if (TweenGraDic.TryGetValue(target, out tweenGra))
+        if (TweenVecDic.TryGetValue(target, out tweenVec))
         {
-            tweenGra.StartBackward();
+            tweenVec.StartBackward();
         }
         else
         {
@@ -288,8 +297,21 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    #endregion
+    public static void TweenBacAudio(Transform target)
+    {
+        TweenAudio tween;
+
+        if (TweenAudioDic.TryGetValue(target, out tween))
+        {
+            tween.StartBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
 
+    #endregion
 
     #region 得到动画
 
@@ -307,13 +329,14 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static MoveScrr GetMoveScrr(Transform target)
+
+    public static TweenCG GetTweenCG(Transform target)
     {
-        MoveScrr moveScrr;
+        TweenCG tweenCG;
 
-        if (MoveScrrDic.TryGetValue(target, out moveScrr))
+        if (TweenCgDic.TryGetValue(target, out tweenCG))
         {
-            return moveScrr;
+            return tweenCG;
         }
         else
         {
@@ -321,14 +344,13 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-
-    public static TweenCG GetTweenCG(Transform target)
+    public static TweenGra GetTweenGra(Transform target)
     {
-        TweenCG tweenCG;
+        TweenGra tweenGra;
 
-        if (TweenCgDic.TryGetValue(target, out tweenCG))
+        if (TweenGraDic.TryGetValue(target, out tweenGra))
         {
-            return tweenCG;
+            return tweenGra;
         }
         else
         {
@@ -350,13 +372,13 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static TweenGra GetTweenGra(Transform target)
+    public static TweenScale GetTweenScale(Transform target)
     {
-        TweenGra tweenGra;
+        TweenScale tweenScale;
 
-        if (TweenGraDic.TryGetValue(target, out tweenGra))
+        if (TweenScaleDic.TryGetValue(target, out tweenScale))
         {
-            return tweenGra;
+            return tweenScale;
         }
         else
         {
@@ -364,13 +386,13 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static TweenScale GetTweenScale(Transform target)
+    public static TweenAudio GetTweenAudio(Transform target)
     {
-        TweenScale tweenScale;
+        TweenAudio tween;
 
-        if (TweenScaleDic.TryGetValue(target, out tweenScale))
+        if (TweenAudioDic.TryGetValue(target, out tween))
         {
-            return tweenScale;
+            return tween;
         }
         else
         {
@@ -380,48 +402,28 @@ public class ManaAnim : MonoBehaviour
 
     #endregion
 
-
     #region 创建动画
 
     public static MoveVec CreateMoveVec(Transform target)
     {
         if (MoveVecDic.ContainsKey(target))
         {
-            MoveVec moveVec = MoveVecDic[target];
+            MoveVec move = MoveVecDic[target];
 
-            moveVec = new MoveVec(target);
+            move = new MoveVec(target);
 
-            return moveVec;
+            return move;
         }
         else
         {
-            MoveVec moveVec = new MoveVec(target);
+            MoveVec move = new MoveVec(target);
 
-            MoveVecDic.Add(target, moveVec);
+            MoveVecDic.Add(target, move);
 
-            return moveVec;
+            return move;
         }
     }
 
-    public static MoveScrr CreateMoveScrr(Transform target)
-    {
-        if (MoveScrrDic.ContainsKey(target))
-        {
-            MoveScrr moveScrr = MoveScrrDic[target];
-
-            moveScrr = new MoveScrr(target.GetComponent<ScrollRect>());
-
-            return moveScrr;
-        }
-        else
-        {
-            MoveScrr moveScrr = new MoveScrr(target.GetComponent<ScrollRect>());
-
-            MoveScrrDic.Add(target, moveScrr);
-
-            return moveScrr;
-        }
-    }
 
     public static TweenCG CreateTweenCG(Transform target, float origin, float destination,  float duration, bool originActive, bool destActive, Curve curve)
     {
@@ -471,6 +473,54 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
+    public static TweenGra CreateTweenGra(Transform target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        if (TweenGraDic.ContainsKey(target))
+        {
+            Graphic graphic = target.GetComponent<Graphic>();
+
+            TweenGra tween = TweenGraDic[target];
+
+            tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve);
+
+            return tween;
+        }
+        else
+        {
+            Graphic graphic = target.GetComponent<Graphic>();
+
+            TweenGra tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve);
+
+            TweenGraDic.Add(target, tween);
+
+            return tween;
+        }
+    }
+
+    public static TweenGra CreateTweenGra(Transform target, Color destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        if (TweenGraDic.ContainsKey(target))
+        {
+            Graphic graphic = target.GetComponent<Graphic>();
+
+            TweenGra tween = TweenGraDic[target];
+
+            tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve);
+
+            return tween;
+        }
+        else
+        {
+            Graphic graphic = target.GetComponent<Graphic>();
+
+            TweenGra tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve);
+
+            TweenGraDic.Add(target, tween);
+
+            return tween;
+        }
+    }
+
     public static TweenVec CreateTweenVec(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
     {
         origin.z = target.position.z;
@@ -516,89 +566,85 @@ public class ManaAnim : MonoBehaviour
         }
     }
 
-    public static TweenGra CreateTweenGra(Transform target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve)
+    public static TweenScale CreateTweenScale(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (TweenGraDic.ContainsKey(target))
+        if (TweenScaleDic.ContainsKey(target))
         {
-            Graphic graphic = target.GetComponent<Graphic>();
-
-            TweenGra tween = TweenGraDic[target];
+            TweenScale tween = TweenScaleDic[target];
 
-            tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve);
+            tween = new TweenScale(target, origin, destination, duration, originActive, destActive, curve);
 
             return tween;
         }
         else
         {
-            Graphic graphic = target.GetComponent<Graphic>();
-
-            TweenGra tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve);
+            TweenScale tween = new TweenScale(target, origin, destination, duration, originActive, destActive, curve);
 
-            TweenGraDic.Add(target, tween);
+            TweenScaleDic.Add(target, tween);
 
             return tween;
         }
     }
 
-    public static TweenGra CreateTweenGra(Transform target, Color destination, float duration, bool originActive, bool destActive, Curve curve)
+    public static TweenScale CreateTweenScale(Transform target, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (TweenGraDic.ContainsKey(target))
+        if (TweenScaleDic.ContainsKey(target))
         {
-            Graphic graphic = target.GetComponent<Graphic>();
-
-            TweenGra tween = TweenGraDic[target];
+            TweenScale tween = TweenScaleDic[target];
 
-            tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve);
+            tween = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve);
 
             return tween;
         }
         else
         {
-            Graphic graphic = target.GetComponent<Graphic>();
-
-            TweenGra tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve);
+            TweenScale tween = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve);
 
-            TweenGraDic.Add(target, tween);
+            TweenScaleDic.Add(target, tween);
 
             return tween;
         }
     }
 
-    public static TweenScale CreateTweenScale(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
+    public static TweenAudio CreateTweenAudio(Transform target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (TweenScaleDic.ContainsKey(target))
+        if (TweenAudioDic.ContainsKey(target))
         {
-            TweenScale tween = TweenScaleDic[target];
+            TweenAudio tween = TweenAudioDic[target];
 
-            tween = new TweenScale(target, origin, destination, duration, originActive, destActive, curve);
+            tween = new TweenAudio(target.GetComponent<AudioSource>(), origin, destination, duration, originActive, destActive, curve);
 
             return tween;
         }
         else
         {
-            TweenScale tween = new TweenScale(target, origin, destination, duration, originActive, destActive, curve);
+            TweenAudio tween = new TweenAudio(target.GetComponent<AudioSource>(), origin, destination, duration, originActive, destActive, curve);
 
-            TweenScaleDic.Add(target, tween);
+            TweenAudioDic.Add(target, tween);
 
             return tween;
         }
     }
 
-    public static TweenScale CreateTweenScale(Transform target, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
+    public static TweenAudio CreateTweenAudio(Transform target, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (TweenScaleDic.ContainsKey(target))
+        if (TweenAudioDic.ContainsKey(target))
         {
-            TweenScale tween = TweenScaleDic[target];
+            AudioSource audio = target.GetComponent<AudioSource>();
 
-            tween = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve);
+            TweenAudio tween = TweenAudioDic[target];
+
+            tween = new TweenAudio(audio , audio.volume, destination, duration, originActive, destActive, curve);
 
             return tween;
         }
         else
         {
-            TweenScale tween = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve);
+            AudioSource audio = target.GetComponent<AudioSource>();
 
-            TweenScaleDic.Add(target, tween);
+            TweenAudio tween = new TweenAudio(audio, audio.volume, destination, duration, originActive, destActive, curve);
+
+            TweenAudioDic.Add(target, tween);
 
             return tween;
         }

Assets/Script/Manage/ManaAudio.cs

@@ -0,0 +1,90 @@
+using UnityEngine;
+
+using System.Collections;
+
+public class ManaAudio : MonoBehaviour 
+{
+    #region 变量
+
+    public Coroutine CoroTheme;
+    public Coroutine CoroMiniGame;
+    public AudioSource MusicMini;
+    public AudioSource MusicTheme;
+
+    #endregion
+
+    private void Awake()
+    {
+        Initializer.RegistValue += RegistValue;
+        Initializer.RegistReference+= RegistReference;
+
+        ManaReso.Get("MusicMini", Folder.Object, true, null, true);
+        ManaReso.Get("MusicTheme", Folder.Object, true, null, true);
+    }
+
+
+	private void RegistValue()
+	{
+        #region MusicMini
+
+        Transform tra = MusicMini.transform;
+	    TweenAudio tween = tra.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
+
+	    tween.OnForwardStart += () =>
+	    {
+	        MusicMini.Play();
+
+	        CoroTheme = StartCoroutine(Loop(MusicMini));
+	    };
+
+	    tween.OnBackwardStart += () =>
+	    {
+	        StopCoroutine(CoroTheme);
+	    };
+
+        #endregion
+
+        #region MusicTheme
+
+        tra = MusicTheme.transform;
+        tween = tra.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            MusicTheme.Play();
+
+            CoroTheme = StartCoroutine(Loop(MusicTheme));
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            StopCoroutine(CoroTheme);
+        };
+
+        #endregion
+
+        ManaReso.Get("MusicTheme").TweenForAudio();
+    }
+
+    private void RegistReference()
+    {
+        MusicMini = ManaReso.Get<AudioSource>("MusicMini");
+        MusicTheme = ManaReso.Get<AudioSource>("MusicTheme");
+    }
+
+
+    private IEnumerator Loop(AudioSource audioSource)
+    {
+        while (true)
+        {
+            while (audioSource.isPlaying)
+            {
+                yield return null;
+            }
+
+            yield return new WaitForSeconds(3);
+
+            audioSource.Play();
+        }
+    }
+}

Assets/Script/Manage/ManaMessage.cs.meta → Assets/Script/Manage/ManaAudio.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: a733b208d72de40479a7e6d0fb154e69
-timeCreated: 1486886710
+guid: 408202f8e4b5c0a4fb596cf49c65a350
+timeCreated: 1489849918
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

Assets/Script/Manage/ManaData.cs

@@ -1,6 +1,7 @@
 using LitJson;
 
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 using System;
 using System.Xml;
@@ -18,7 +19,10 @@ public class ManaData : MonoBehaviour
         {
             _Level = value;
 
-            UpdateSkillStatus();
+            for (int i = 0; i < SkillList.Count; i++)
+            {
+                SkillList[i].OnLevelChange();
+            }
 
             ManaLog.Log(string.Format("已升级 花园等级 : <color=red>{0}</color>", _Level));
         }
@@ -71,32 +75,32 @@ public class ManaData : MonoBehaviour
     private static double _Coin;
     private static double _Diamond;
 
+    public static float SkillPlus;
+    public static float SkillPerson;
+    public static float SkillPersonBuff;
+    public static float SkillCoinPerson;
+
     public static bool SkillBar;
     public static bool Connect;
+    public static float OpTime;
+    public static float CircleTime;
     public static float OpTimer;
+    public static float CircleTimer;
     public static float NewPerson;
     public static float NewCoinPerson;
-    public static double Circle;
-    public static double OfflineCoin;
-    public static double CircleTimer;
+
     public static List<Skill> CoolList;
     public static List<SkillRoot> SkillList;
     public static List<SkillRoot> UsingList;
     public static Dictionary<string, SkillRoot> SkillDic;
 
-    public static float SkillPerson;         
-    public static float SkillPlusPerm;    
-    public static float SkillPlusTemp;    
-    public static float SkillPersonBuff;  
-    public static float SkillCoinPerson;
-
     #endregion
 
     private void Awake()
     {
         Initializer.RegistValue += RegistValue;
         
-        #region 读取技能配置
+        #region 读技能配置
 
         SkillDic = new Dictionary<string, SkillRoot>();
         SkillList = new List<SkillRoot>();
@@ -139,7 +143,7 @@ public class ManaData : MonoBehaviour
             SkillDic.Add(skillRoot.Name, skillRoot);
         }
         
-        SkillList.Sort();
+        SkillList.Sort(SkillRoot.SortByClassID);
 
         #endregion
 
@@ -147,7 +151,7 @@ public class ManaData : MonoBehaviour
 
         for (int i = 0; i < SkillList.Count; i++)
         {
-            if (SkillList[i].Class != SkillClass.Null)
+            if (SkillList[i].Tab != SkillTab.Null)
             {
                 ManaReso.GetSkillItem(SkillList[i]);
             }
@@ -158,29 +162,47 @@ public class ManaData : MonoBehaviour
 
     private void Update()
     {
-        #region 计算参观收益
+        if (Math.Abs(Time.timeScale) < 0.0005f)
+        {
+            return;
+        }
 
-        CircleTimer -= Time.deltaTime;
+        if (Input.anyKeyDown)
+        {
+            OpTimer = 0;
 
-        if (CircleTimer < 0)
+            GameObject go = ManaReso.Get("C_Main").gameObject;
+
+            if (go.activeSelf == false)
+            {
+                go.transform.TweenForCG();
+            }
+        }
+        else
         {
-            CircleTimer = Circle;
+            OpTimer += Time.deltaTime;
 
-            NewPerson = Person*(1 + SkillPersonBuff) + SkillPerson;
-            NewCoinPerson = CoinPerson + SkillCoinPerson;
+            if (OpTimer >= OpTime)
+            {
+                OpTimer = 0;
 
-            Coin += (NewPerson*NewCoinPerson*Circle)*(1 + SkillPlusPerm);
+                GameObject go = ManaReso.Get("C_Main").gameObject;
 
-            ManaLog.Log(string.Format("参观收益<color=red>{0:0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", (NewPerson * NewCoinPerson * Circle) * (1 + SkillPlusPerm), NewPerson, NewCoinPerson, Circle, 1 + SkillPlusPerm));
+                if (go.activeSelf)
+                {
+                    go.transform.TweenBacCG();
+                }
+            }
         }
+    }
 
-        #endregion
-
-        #region 使用中的技能
+    private void FixedUpdate()
+    {
+        #region 使用技能
 
         for (int i = 0; i < UsingList.Count; i++)
         {
-            if (UsingList[i].DoTiming())
+            if (UsingList[i].DoUse())
             {
                 i--;
             }
@@ -188,7 +210,7 @@ public class ManaData : MonoBehaviour
 
         #endregion
 
-        #region 冷却中的技能
+        #region 冷却技能
 
         for (int i = 0; i < CoolList.Count; i++)
         {
@@ -200,80 +222,119 @@ public class ManaData : MonoBehaviour
 
         #endregion
 
-        #region 检测是否有操作
+        #region 计算参观收入
 
-        OpTimer += Time.deltaTime;
-        if (OpTimer >= 60)
+        CircleTimer -= Time.deltaTime;
+
+        if (CircleTimer < 0)
         {
-            OpTimer = 0;
+            CircleTimer = CircleTime;
+
+            NewPerson = Person*(1 + SkillPersonBuff) + SkillPerson;
+            NewCoinPerson = CoinPerson + SkillCoinPerson;
+
+            Coin += (NewPerson*NewCoinPerson*CircleTime)*(1 + SkillPlus);
+
+            ManaLog.Log(string.Format("参观收益<color=red>{0:0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus), NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));
         }
 
         #endregion
     }
 
+
     private void RegistValue()
     {
+        OpTime = 5;
+        CircleTime = 10;
+        CircleTimer = 10;
+
         CoolList = new List<Skill>();
         UsingList = new List<SkillRoot>();
 
-        #region 读取技能状态
+        #region 读技能存档
+
+        double elapse = DateTime.Now.Subtract(DateTime.Parse(Data.PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value)).TotalSeconds;
 
         XmlNodeList xmlNodeList = Data.PlayerNode.SelectSingleNode("SkillList").ChildNodes;
+
+        List<List<SkillRoot>> collectList = new List<List<SkillRoot>>();
+
+        if (elapse > CircleTimer)
+        {
+            int lastCircle = 1 + Mathf.FloorToInt((float)((elapse - CircleTimer) / CircleTime));
+
+            for (int i = 0; i < lastCircle; i++)
+            {
+                collectList.Add(new List<SkillRoot>());
+            }
+        }
+
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
-            if (xmlNodeList[i].Attributes[0].Value == SkillCato.Skill.ToString())
+            if (xmlNodeList[i].Attributes[0].Value == SkillType.Skill.ToString())
             {
                 Skill skill = (Skill)SkillDic[xmlNodeList[i].Name];
 
+                skill.RegistReference();
+
                 skill.Level = int.Parse(xmlNodeList[i].Attributes[2].Value);
                 skill.CoolTimer = float.Parse(xmlNodeList[i].Attributes[3].Value);
                 skill.UsingTimer = float.Parse(xmlNodeList[i].Attributes[4].Value);
 
-                skill.ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value);
+                skill._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value);
+
+                skill.RegistValue(elapse, collectList);
             }
-            else if (xmlNodeList[i].Attributes[0].Value == SkillCato.BigSkill.ToString())
+            else if (xmlNodeList[i].Attributes[0].Value == SkillType.BigSkill.ToString())
             {
                 BigSkill bigSkill = (BigSkill)SkillDic[xmlNodeList[i].Name];
 
+                bigSkill.RegistReference();
+
                 bigSkill.Level = int.Parse(xmlNodeList[i].Attributes[3].Value);
                 bigSkill.CoolTimer = float.Parse(xmlNodeList[i].Attributes[4].Value);
                 bigSkill.UsingTimer = float.Parse(xmlNodeList[i].Attributes[5].Value);
 
-                bigSkill.ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value); //Sa0
-                bigSkill.BarStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[2].Value); //Sa1
+                bigSkill._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value); //Sa0
+                bigSkill._BarStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[2].Value); //Sa1
+
+                bigSkill.RegistValue(elapse, collectList);
             }
-            else if (xmlNodeList[i].Attributes[0].Value == SkillCato.Pack.ToString())
+            else if (xmlNodeList[i].Attributes[0].Value == SkillType.Pack.ToString())
             {
                 Pack pack = (Pack)SkillDic[xmlNodeList[i].Attributes[1].Value];
 
+                pack.RegistReference();
+
                 pack.Level = int.Parse(xmlNodeList[i].Attributes[3].Value);
-                pack.ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[2].Value);
+                pack._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[2].Value);
+
+                pack.RegistValue(elapse, collectList);
             }
-            else if (xmlNodeList[i].Attributes[0].Value == SkillCato.Ability.ToString())
+            else if (xmlNodeList[i].Attributes[0].Value == SkillType.Ability.ToString())
             {
                 Ability ability = (Ability)SkillDic[xmlNodeList[i].Name];
 
+                ability.RegistReference();
+
                 ability.Level = int.Parse(xmlNodeList[i].Attributes[2].Value);
-                ability.ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value);
+                ability._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value);
+
+                ability.RegistValue(elapse, collectList);
             }
             else
             {
                 throw new Exception();
             }
         }
-        
-        for (int i = 0; i < SkillList.Count; i++)
-        {
-            SkillList[i].Initialize();
-        }
 
         #endregion
 
-        #region 读取已解锁的花
+        #region 读花朵存档
 
         XmlAttributeCollection attributes = Data.PlayerNode.SelectSingleNode("FlowerList").Attributes;
 
-        if (!string.IsNullOrEmpty(attributes[0].Value))
+        if (string.IsNullOrEmpty(attributes[0].Value) == false)
         {
             string[] strings = attributes[0].Value.Split(' ');
 
@@ -286,17 +347,10 @@ public class ManaData : MonoBehaviour
 
                 int id = int.Parse(strings[i]);
 
-                FlowerInfo flowerInfo = ManaGarden.FlowerDic[id];
-                flowerInfo._Unlock = true;
-
-                SkillPlusPerm += 0.1f;
+                ManaGarden.FlowerDic[id].Unlock = true;
             }
         }
 
-        #endregion
-
-        #region 读取已种植的花
-
         attributes = Data.PlayerNode.SelectSingleNode("PlantList").Attributes;
 
         for (int i = 0; i < attributes.Count; i++)
@@ -308,54 +362,54 @@ public class ManaData : MonoBehaviour
 
         #endregion
 
-        Coin = double.Parse(Data.PlayerNode.SelectSingleNode("Coin").Attributes[0].Value);
+        #region 读数据存档
+
         Level = int.Parse(Data.PlayerNode.SelectSingleNode("Level").Attributes[0].Value);
-        Circle = 10;
+
+        Coin = double.Parse(Data.PlayerNode.SelectSingleNode("Coin").Attributes[0].Value);
         Diamond = double.Parse(Data.PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value);
-        OfflineCoin = 0;
 
-        #region 离线期间的收入
-        
-        double elapse = DateTime.Now.Subtract(DateTime.Parse(Data.PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value)).TotalSeconds; //离开时间
+        #endregion
 
-        if (elapse > CircleTimer)
-        {
-            elapse -= CircleTimer;
+        #region 计算离线收入
 
-            int offlineCircle = 1 + Mathf.FloorToInt((float) (elapse/Circle)); //离线周期
-            
-            for (int i = 0; i < SkillList.Count; i++)
+        double collectCoin = 0;
+
+        if (collectList.Count > 0)
+        {
+            for (int i = 0; i < collectList.Count; i++)
             {
-                SkillList[i].CollectCoin(offlineCircle);
+                for (int j = 0; j < collectList[i].Count; j++)
+                {
+                    collectList[i][j].Annul();
+                }
+
+                NewPerson = Person * (1 + SkillPersonBuff) + SkillPerson;
+                NewCoinPerson = CoinPerson + SkillCoinPerson;
+
+                collectCoin += (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus);
             }
 
-            OfflineCoin += (Person * CoinPerson * Circle * offlineCircle) * (1 + SkillPlusPerm);
+            Coin += collectCoin;
+
+            ManaReso.SetText("A_IconLab", collectCoin.ToString("0"));
+
+            CircleTimer = (float)((elapse - CircleTimer) % CircleTime);
         }
         else
         {
-            CircleTimer -= elapse;
+            CircleTimer = (float)(CircleTimer - elapse);
+
+            ManaReso.SetText("A_IconLab", "0");
         }
 
-        Coin += OfflineCoin;
-        ManaReso.SetText("A_IconLab", OfflineCoin.ToString("0"));
-        
         #endregion
-
-        Debug.Log(OfflineCoin);
     }
 
 
-    public static void UpdateSkillStatus()
-    {
-        for (int i = 0; i < SkillList.Count; i++)
-        {
-            SkillList[i].OnLevelChange();
-        }
-    }
-
     public static bool Pay(double amt, Current current)
     {
-        amt = (int) amt;
+        amt = (long) amt;
 
         if (current == Current.Free)
         {
@@ -371,8 +425,6 @@ public class ManaData : MonoBehaviour
         }
         else if (current == Current.Coin)
         {
-            #region MyRegion
-
             if (Coin >= amt)
             {
                 Coin -= amt;
@@ -381,17 +433,13 @@ public class ManaData : MonoBehaviour
             }
             else
             {
-                ManaMessage.Show("您没有足够的金币", 1);
+                ManaLog.Log("您没有足够的金币");
 
                 return false;
             }
-
-            #endregion
         }
         else if (current == Current.Diamond)
         {
-            #region MyRegion
-
             if (Diamond >= amt)
             {
                 Diamond -= amt;
@@ -400,12 +448,10 @@ public class ManaData : MonoBehaviour
             }
             else
             {
-                ManaMessage.Show("您没有足够的钻石", 1);
+                ManaLog.Log("您没有足够的钻石");
 
                 return false;
             }
-
-            #endregion
         }
         else
         {

Assets/Script/Manage/ManaGarden.cs

@@ -155,7 +155,7 @@ public class ManaGarden : MonoBehaviour
 
         if (flowerInfo.Plant)
         {
-            ManaMessage.Show("已经种植过了", 1);
+            ManaLog.Log("已经种植过了");
         }
         else
         {
@@ -183,7 +183,7 @@ public class ManaGarden : MonoBehaviour
 
         if (tra == null)
         {
-            ManaMessage.Show("已经没有空地了", 1);
+            ManaLog.Log("已经没有空地了");
         }
         else
         {
@@ -191,7 +191,7 @@ public class ManaGarden : MonoBehaviour
 
             if (flowerInfo.Plant)
             {
-                ManaMessage.Show("已经种植过了", 1);
+                ManaLog.Log("已经种植过了");
             }
             else
             {

Assets/Script/Manage/ManaLog.cs

@@ -5,20 +5,30 @@ using UnityEngine.Serialization;
 using System;
 using System.Text;
 using System.Collections;
-
+using System.Collections.Generic;
 using Random = UnityEngine.Random;
 
 public class ManaLog : MonoBehaviour 
 {
     #region 变量
 
+    private static bool Lock;
     private static Text Lab;
+    private static List<string> TextList;
 
     #endregion
 
     private void Awake()
     {
-        Lab = ManaReso.Get<Text>("E_Lab");
+        Lab = ManaReso.Get<Text>("E_ScrrLab");
+
+        Initializer.RegistValue += RegistValue;
+    }
+
+
+    private static void RegistValue()
+    {
+        TextList = new List<string>();
     }
 
 
@@ -26,7 +36,39 @@ public class ManaLog : MonoBehaviour
     {
         if (Lab)
         {
-            Lab.text = Lab.text + '\n' + message;
+            if (Lock)
+            {
+                TextList.Add('\n' + message);
+            }
+            else
+            {
+                Lab.text += '\n' + message;
+            }
         }
     }
+
+
+    public static void Throw(string message = "Exception")
+    {
+        Lab.text += string.Format("\n<color=red>{0}</color>", message);
+    }
+
+    public static void LockBtn()
+    {
+        if (Lock)
+        {
+            for (int i = 0; i < TextList.Count; i++)
+            {
+                Lab.text += TextList[i];
+            }
+
+            ManaReso.SetText("E_LockLab", "固定");
+        }
+        else
+        {
+            ManaReso.SetText("E_LockLab", "解锁");
+        }
+
+        Lock = !Lock;
+    }
 }

Assets/Script/Manage/ManaMessage.cs

@@ -1,46 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-using System.Collections;
-
-public class ManaMessage : MonoBehaviour 
-{
-    #region 变量
-
-    private static float Timer; //显示时间
-    private static Text MessageLab;
-
-    #endregion
-
-    private void Awake()
-    {
-        MessageLab = ManaReso.Get<Text>("Message");
-    }
-
-    private void FixedUpdate()
-    {
-        if (MessageLab.color.a > 0)
-        {
-            Timer -= Time.fixedDeltaTime;
-            if (Timer > 0)
-            {
-                return;
-            }
-
-            MessageLab.SetAlpha(Mathf.Lerp(MessageLab.color.a, 0, Time.fixedDeltaTime));
-
-            if (MessageLab.color.a <= 0.05f)
-            {
-                MessageLab.SetAlpha(0);
-            }
-        }
-    }
-
-
-    public  static void Show(string message, float stayTime)
-    {
-        MessageLab.text = message;
-        MessageLab.SetAlpha(1);
-        Timer = stayTime;
-    }
-}

Assets/Script/Manage/ManaMiniGame.cs

@@ -171,13 +171,11 @@ public class ManaMiniGame : MonoBehaviour
 
         Timer = GameTime;
         OpTimer = OpTime;
-
-        ManaReso.Get("Game").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
     }
 
     private static void RegistReference()
     {
-        TimerBk = ManaReso.Get<Image>("D_TimerBk2");
+        TimerBk = ManaReso.Get<Image>("D_TimerIcon");
 
         TimerLab = ManaReso.Get<Text>("D_TimerLab");
         ScoreLab = ManaReso.Get<Text>("D_ScoreLab");
@@ -208,7 +206,7 @@ public class ManaMiniGame : MonoBehaviour
             {
                 PenaltyTimer = PenaltyTime;
 
-                ManaMessage.Show("惩罚" + PenaltyTime + "秒", PenaltyTime);
+                ManaLog.Log(string.Format("惩罚<color=red>{0:0}</color>秒", PenaltyTime));
             }
         }
     }
@@ -232,7 +230,7 @@ public class ManaMiniGame : MonoBehaviour
             else //操作错误
             {
                 PenaltyTimer = PenaltyTime;
-                ManaMessage.Show("惩罚" + PenaltyTime + "秒", PenaltyTime);
+                ManaLog.Log(string.Format("惩罚<color=red>{0:0}</color>秒", PenaltyTime));
             }
         }
     }
@@ -256,7 +254,7 @@ public class ManaMiniGame : MonoBehaviour
             else //操作错误
             {
                 PenaltyTimer = PenaltyTime;
-                ManaMessage.Show("惩罚" + PenaltyTime + "秒", PenaltyTime);
+                ManaLog.Log(string.Format("惩罚<color=red>{0:0}</color>秒", PenaltyTime));
             }
         }
     }
@@ -309,15 +307,15 @@ public class ManaMiniGame : MonoBehaviour
     {
         IdleList = new List<Flower>();
         OpList = new List<Flower>();
-        IdleList.Add(ManaReso.GetFlower(1, false, ManaReso.Get("FlowerGameTra1")));
-        IdleList.Add(ManaReso.GetFlower(2, false, ManaReso.Get("FlowerGameTra2")));
-        IdleList.Add(ManaReso.GetFlower(3, false, ManaReso.Get("FlowerGameTra3")));
-        IdleList.Add(ManaReso.GetFlower(4, false, ManaReso.Get("FlowerGameTra4")));
-        IdleList.Add(ManaReso.GetFlower(5, false, ManaReso.Get("FlowerGameTra5")));
-        IdleList.Add(ManaReso.GetFlower(6, false, ManaReso.Get("FlowerGameTra6")));
-        IdleList.Add(ManaReso.GetFlower(7, false, ManaReso.Get("FlowerGameTra7")));
-        IdleList.Add(ManaReso.GetFlower(8, false, ManaReso.Get("FlowerGameTra8")));
-        IdleList.Add(ManaReso.GetFlower(9, false, ManaReso.Get("FlowerGameTra9")));
+        IdleList.Add(ManaReso.GetFlower(1, false, ManaReso.Get("MiniTra1")));
+        IdleList.Add(ManaReso.GetFlower(2, false, ManaReso.Get("MiniTra2")));
+        IdleList.Add(ManaReso.GetFlower(3, false, ManaReso.Get("MiniTra3")));
+        IdleList.Add(ManaReso.GetFlower(4, false, ManaReso.Get("MiniTra4")));
+        IdleList.Add(ManaReso.GetFlower(5, false, ManaReso.Get("MiniTra5")));
+        IdleList.Add(ManaReso.GetFlower(6, false, ManaReso.Get("MiniTra6")));
+        IdleList.Add(ManaReso.GetFlower(7, false, ManaReso.Get("MiniTra7")));
+        IdleList.Add(ManaReso.GetFlower(8, false, ManaReso.Get("MiniTra8")));
+        IdleList.Add(ManaReso.GetFlower(9, false, ManaReso.Get("MiniTra9")));
     }
 
 

Assets/Script/Manage/ManaReso.cs

@@ -15,6 +15,7 @@ public enum Folder
 {
     Skill,
     Object,
+    Shader,
     Garden,
     SpriteUI,
     PrefabUI,
@@ -422,6 +423,10 @@ public class ManaReso : MonoBehaviour
             {
                 t = Resources.Load<T>(@"Sprite\SpriteUI\" + name);
             }
+            else if (folder == Folder.Shader)
+            {
+                t = Resources.Load<T>(@"Shader\" + name);
+            }
             else if (folder == Folder.PrefabUI)
             {
                 t = Resources.Load<T>(@"Prefab\PrefabUI\" + name);
@@ -456,19 +461,19 @@ public class ManaReso : MonoBehaviour
         Transform tra;
         Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
 
-        if (skillRoot.Class == SkillClass.Elf)
+        if (skillRoot.Tab == SkillTab.Elf)
         {
             tra = Get("SkillItem", Folder.PrefabUI, false, Get("Fd_Grid"), false);
         }
-        else if (skillRoot.Class == SkillClass.Store)
+        else if (skillRoot.Tab == SkillTab.Store)
         {
             tra = Get("SkillItem", Folder.PrefabUI, false, Get("Fc_Grid"), false);
         }
-        else if (skillRoot.Class == SkillClass.Magic)
+        else if (skillRoot.Tab == SkillTab.Magic)
         {
             tra = Get("SkillItem", Folder.PrefabUI, false, Get("Fb_Grid"), false);
         }
-        else if (skillRoot.Class == SkillClass.Garden)
+        else if (skillRoot.Tab == SkillTab.Garden)
         {
             tra = Get("SkillItem", Folder.PrefabUI, false, Get("Fa_Grid"), false);
         }

Assets/Script/Manage/ManaUI.cs

@@ -3,6 +3,7 @@ using UnityEngine.UI;
 
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine.EventSystems;
 
 public class ManaUI : MonoBehaviour
 {
@@ -33,7 +34,7 @@ public class ManaUI : MonoBehaviour
             "A_Confirm",
             () =>
             {
-                ManaReso.Get("B_SignIn").TweenBacCG();
+                ManaReso.Get("B_SignIn").TweenForCG();
 
                 ManaReso.SetActive("A_Notice", false);
             }
@@ -86,7 +87,8 @@ public class ManaUI : MonoBehaviour
             "B_Confirm",
             () =>
             {
-                ManaReso.Get("Game").TweenForCG();
+                ManaReso.Get("C_Main").TweenForCG();
+
                 ManaReso.Get("B_SignIn").TweenBacCG();
             }
         );
@@ -104,7 +106,7 @@ public class ManaUI : MonoBehaviour
             "C_Manage",
             () =>
             {
-                ManaReso.SetActive("C_Main", false);
+                ManaReso.Get("C_Main").TweenBacCG();
                 ManaReso.SetActive("F_Manage", true);
 
                 ManaReso.Get("F_Manage").TweenForVec();
@@ -113,6 +115,12 @@ public class ManaUI : MonoBehaviour
 
         #endregion
 
+        #region C_Main
+
+        Tween tween = ManaReso.Get("C_Main").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
         #region C_MiniGame
 
         Button enterGameA = ManaReso.Get<Button>("C_MiniGame");
@@ -121,15 +129,17 @@ public class ManaUI : MonoBehaviour
         (
             () =>
             {
+                ManaReso.Get("C_Main").TweenBacCG();
+
                 ManaReso.Get("D_MiniGame").TweenForVec();
-                ManaReso.Get("GardenGame").TweenForVec();
+                ManaReso.Get("GardenMini").TweenForVec();
 
                 ManaMiniGame.GamePrepare();
             }
         );
 
         HudTarget hudTarget = enterGameA.AddComponent<HudTarget>();
-        hudTarget.PosTra = Player.ChildDic["EnterGameTraA"];
+        hudTarget.PosTra = Player.ChildDic["EnterGameTra"];
 
         #endregion
 
@@ -199,7 +209,27 @@ public class ManaUI : MonoBehaviour
 
         #region D_MiniGame
 
-        ManaReso.Get("D_MiniGame").CreateTweenVec(ManaReso.Get("Canvas").position, 1f, false, true, Curve.EaseOutQuad);
+        tween = ManaReso.Get("D_MiniGame").CreateTweenVec(ManaReso.Get("Canvas").position, 1f, false, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            ManaReso.Get("MusicTheme").TweenBacAudio();
+        };
+
+        tween.OnForwardFinish += () =>
+        {
+            ManaReso.Get("MusicMini").TweenForAudio();
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            ManaReso.Get("MusicMini").TweenBacAudio();
+        };
+
+        tween.OnBackwardFinish += () =>
+        {
+            ManaReso.Get("MusicTheme").TweenForAudio();
+        };
 
         #endregion
 
@@ -218,8 +248,10 @@ public class ManaUI : MonoBehaviour
             "Da_Quit",
             () =>
             {
+                ManaReso.Get("C_Main").TweenForCG();
+
                 ManaReso.Get("D_MiniGame").TweenBacVec();
-                ManaReso.Get("GardenGame").TweenBacVec();
+                ManaReso.Get("GardenMini").TweenBacVec();
 
                 ManaReso.SetActive("Da_Info", false);
 
@@ -259,6 +291,19 @@ public class ManaUI : MonoBehaviour
 
         #endregion
 
+        #region E
+
+        ManaReso.AddButtonEvent
+        (
+            "E_LockBtn",
+            () =>
+            {
+                ManaLog.LockBtn();
+            }
+        );
+
+        #endregion
+
         #region F
 
         #region F_Close
@@ -268,7 +313,7 @@ public class ManaUI : MonoBehaviour
             "F_Close",
             () =>
             {
-                ManaReso.SetActive("C_Main", true);
+                ManaReso.Get("C_Main").TweenForCG();
                 ManaReso.SetActive("F_Manage", false);
 
                 ManaReso.Get("F_Manage").TweenBacVec();
@@ -391,7 +436,7 @@ public class ManaUI : MonoBehaviour
 
         #region F_Manage
 
-        ManaReso.Get("F_Manage").CreateTweenVec(ManaReso.Get("F_TweenTra").position, 0.5f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("F_Manage").CreateTweenVec(ManaReso.Get("F_PageTra").position, 0.5f, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -464,8 +509,8 @@ public class ManaUI : MonoBehaviour
             "G_Special",
             () =>
             {
-                ManaReso.SetActive("G_SpecialRect", true);
-                ManaReso.SetActive("G_RegularRect", false);
+                ManaReso.SetActive("G_SpecialScrr", true);
+                ManaReso.SetActive("G_RegularScrr", false);
 
                 ManaReso.Get<Button>("G_Special").interactable = false;
                 ManaReso.Get<Button>("G_Regular").interactable = true;
@@ -481,8 +526,8 @@ public class ManaUI : MonoBehaviour
             "G_Regular",
             () =>
             {
-                ManaReso.SetActive("G_SpecialRect", false);
-                ManaReso.SetActive("G_RegularRect", true);
+                ManaReso.SetActive("G_SpecialScrr", false);
+                ManaReso.SetActive("G_RegularScrr", true);
 
                 ManaReso.Get<Button>("G_Special").interactable = true;
                 ManaReso.Get<Button>("G_Regular").interactable = false;
@@ -508,7 +553,7 @@ public class ManaUI : MonoBehaviour
 
         #region G_Flower
 
-        Tween tween = ManaReso.Get("G_Flower").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
+        tween = ManaReso.Get("G_Flower").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart += () =>
         {
@@ -597,7 +642,7 @@ public class ManaUI : MonoBehaviour
 
         #region H_FlowerCard
 
-        ManaReso.Get("H_FlowerCard").AddComponent<FlowerCard>();
+        ManaReso.Get("H_FlowerCard").AddComponent<FlowerCard>().RegistValue();
 
         ManaReso.Get("H_FlowerCard").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -608,17 +653,9 @@ public class ManaUI : MonoBehaviour
         #region I
 
         tra = ManaReso.Get("I_BlackMask");
-        tra.CreateTweenGra(new Color(0, 0, 0, 0), 0.5f, true, true, Curve.EaseOutQuad);
+        tra.CreateTweenGra(new Color(0, 0, 0, 0), 0.5f, true, false, Curve.EaseOutQuad);
         tra.TweenForGra();
 
-        tra.GetComponent<Button>().onClick.AddListener
-        (
-            () =>
-            {
-                ManaData.OpTimer = 0;
-            }
-        );
-
         #endregion
     }
 

Assets/Script/Object/Flower.cs

@@ -58,7 +58,7 @@ public class FlowerInfo
 
                 ManaGarden.UpdateCollectStatus();
 
-                ManaData.SkillPlusPerm += 0.1f;
+                ManaData.SkillPlus += 0.1f;
                 ManaLog.Log("解锁花朵 收入<color=red>+10%</color>");
             }
         }
@@ -127,7 +127,7 @@ public class Flower : ObjRoot, IPointerClickHandler
             }
             else if (Phase == 1)
             {
-                ManaReso.GetHudText("得分+1", ChildDic["ScoreHudTra"]);
+                ManaReso.GetHudText("得分+1", ChildDic["ScoreTra"]);
                 ManaMiniGame.Score += 1;
 
                 GameReset();
@@ -171,9 +171,9 @@ public class Flower : ObjRoot, IPointerClickHandler
         
         Auxiliary.CompileDic(transform, ChildDic);
 
-        FlowerSr = ChildDic["FlowerSr"].GetComponent<SpriteRenderer>();
-        OperateSr1 = ChildDic["OperateSr1"].GetComponent<SpriteRenderer>();
-        OperateSr2 = ChildDic["OperateSr2"].GetComponent<SpriteRenderer>();
+        FlowerSr = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
+        OperateSr1 = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
+        OperateSr2 = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
         PhaseTexm = ChildDic["PhaseTexm"].GetComponent<TextMesh>();
     }
 
@@ -182,12 +182,12 @@ public class Flower : ObjRoot, IPointerClickHandler
     
     public void GameOver()
     {
-        ChildDic["Game"].SetActive(false);
+        ChildDic["MiniGame"].SetActive(false);
     }
 
     public void GameBegin()
     {
-        ChildDic["Game"].SetActive(true);
+        ChildDic["MiniGame"].SetActive(true);
 
         GameReset();
     }

Assets/Script/Object/Garden.cs

@@ -121,11 +121,11 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
 
         #endregion
 
-        #region GardenGame
+        #region GardenMini
 
-        tween = ManaReso.Get("GardenGame").CreateTweenVec
+        tween = ManaReso.Get("GardenMini").CreateTweenVec
         (
-            ManaReso.Get("GardenGameTra").position,
+            ManaReso.Get("PageTraMini").position,
             1f, 
             false, 
             true,
@@ -333,17 +333,19 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
 
                 ManaReso.Get("H_FlowerCard").TweenForCG();
 
-                StartCoroutine
-                (Auxiliary.DelayCall
-                    (
-                        () =>
-                        {
-                            flowerCard.Select(0);
-                            ManaReso.Get<ContentSizeFitter>("H_Grid").enabled = false;
-                            ManaReso.Get<HorizontalLayoutGroup>("H_Grid").enabled = false;
-                        },
-                        1
-                    )
+                Auxiliary.Inst.DelayCall
+                (
+                    () =>
+                    {
+                        flowerCard.Select(0);
+
+                        flowerCard.LeftBorder = ManaReso.Get("H_Grid").position.x - Mathf.Abs(flowerCard.ItemList.Last(0).position.x - ManaReso.Get("H_Scrr").position.x);
+                        flowerCard.RightBorder = ManaReso.Get("H_Grid").position.x + Mathf.Abs(flowerCard.ItemList[0].position.x - ManaReso.Get("H_Scrr").position.x);
+
+                        ManaReso.Get<ContentSizeFitter>("H_Grid").enabled = false;
+                        ManaReso.Get<HorizontalLayoutGroup>("H_Grid").enabled = false;
+                    },
+                    1
                 );
             }
         }

Assets/Script/Object/Skill/Ability.cs

@@ -75,7 +75,7 @@ public class Ability : SkillRoot
         }
     }
 
-    protected SkillStatus _ItemStatus;
+    public SkillStatus _ItemStatus;
 
     #endregion
 
@@ -95,13 +95,13 @@ public class Ability : SkillRoot
         UpgradePlus = attributes[16].Value;
         UpgradePerson = attributes[17].Value;
 
-        ClassId = IntParse(attributes[3].Value);
+        ClassID = IntParse(attributes[3].Value);
         UnlockLv = IntParse(attributes[7].Value);
 
         UnlockAmt = FloatParse(attributes[11].Value); //Sa0
         UnlockAheadAmt = FloatParse(attributes[9].Value);
 
-        Class = SkillClassParse(attributes[2].Value);
+        Tab = SkillClassParse(attributes[2].Value);
         UpgradeAmt = UpgradeAmtParse(attributes[14].Value); //Sa1
         
         UnlockCur = CurrentParse(attributes[10].Value);
@@ -118,11 +118,11 @@ public class Ability : SkillRoot
         ValueBuffParse(out NewSkillCD, out NewSkillCdBuff, UpgradeCD);
         ValueBuffParse(out NewCoinPerson, out NewPlus, UpgradePlus);
 
-        SkillCato = SkillCato.Ability;
+        SkillType = SkillType.Ability;
     }
 
 
-    public override void Initialize()
+    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
     {
         ItemTit.text = Name;
         ItemLab.text = GetDescription(0);
@@ -160,11 +160,6 @@ public class Ability : SkillRoot
         }
     }
 
-    public override void CollectCoin(double elapse)
-    {
-
-    }
-
     public override void ReceiveCool(float amt, bool isCurrent, bool isBuff)
     {
         
@@ -205,8 +200,6 @@ public class Ability : SkillRoot
             {
                 throw new Exception();
             }
-
-            Data.SaveSkillList();
         }
     }
 
@@ -214,7 +207,7 @@ public class Ability : SkillRoot
     {
         if (ItemStatus != SkillStatus.Lock)
         {
-            ManaMessage.Show("您并不需要提前解锁", 1);
+            ManaLog.Log("您并不需要提前解锁");
 
             return;
         }
@@ -232,8 +225,6 @@ public class Ability : SkillRoot
                 throw new Exception();
             }
 
-            Data.SaveSkillList();
-
             ManaLog.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
         }
     }
@@ -331,18 +322,11 @@ public class Ability : SkillRoot
                 Annul();
                 Effect();
             }
-
-            Data.SaveSkillList();
         }
     }
 
 
-    public override void Annul() //注销技能
-    {
-        
-    }
-
-    public override bool DoTiming()
+    public override bool DoUse()
     {
         return true;
     }
@@ -360,7 +344,7 @@ public class Ability : SkillRoot
             ManaData.SkillCoinPerson += CoinPerson;
         }
 
-        ManaData.SkillPlusPerm += NewPlus;
+        ManaData.SkillPlus += NewPlus;
         ManaData.SkillPersonBuff += NewPersonBuff;
 
         if (Math.Abs(NewSkillCD) > 0.0005f)

Assets/Script/Object/Skill/BigSkill.cs

@@ -29,7 +29,7 @@ public class BigSkill : Skill
         {
             _BarStatus = value;
 
-            if (_BarStatus == SkillStatus.CD)
+            if (_BarStatus == SkillStatus.Cool)
             {
                 BarBk0.SetActive(true);
                 BarBk1.SetActive(false);
@@ -38,7 +38,7 @@ public class BigSkill : Skill
             }
             else if (_BarStatus == SkillStatus.Buy)
             {
-                if (Class != SkillClass.Null) //有技能条
+                if (Tab != SkillTab.Null) //有技能条
                 {
                     #region MyRegion
 
@@ -48,7 +48,6 @@ public class BigSkill : Skill
                         BarBk1.SetActive(true);
                         BarBtn.interactable = true;
                         BarLab.text = "";
-                        //BarLab.text = Name;
                     }
                     else if (ItemStatus == SkillStatus.Buy) //需要购买
                     {
@@ -56,14 +55,15 @@ public class BigSkill : Skill
                         BarBk1.SetActive(true);
                         BarBtn.interactable = true;
                         BarLab.text = "";
-                        //BarLab.text = string.Format("购买\n{0}{1}\n{2}", UseCur, UseAmt, Name);
                     }
                     else //未解锁
                     {
                         BarBk0.SetActive(false);
                         BarBk1.SetActive(true);
                         BarBtn.interactable = false;
-                        BarLab.text = string.Format("未解锁\n等级{0}\n{1}", UnlockLv, Name);
+                        BarLab.text = "";
+
+                        BarBk1.material = ManaReso.Load<Material>("Gray", Folder.Shader);
                     }
 
                     #endregion
@@ -76,7 +76,6 @@ public class BigSkill : Skill
                     BarBk1.SetActive(true);
                     BarBtn.interactable = true;
                     BarLab.text = "";
-                    //BarLab.text = Name;
 
                     #endregion
                 }
@@ -100,7 +99,7 @@ public class BigSkill : Skill
         {
             _ItemStatus = value;
 
-            if (Class == 0) //该技能不生成技能条
+            if (Tab == SkillTab.Null) //该技能不生成技能条
             {
                 return;
             }
@@ -126,17 +125,15 @@ public class BigSkill : Skill
         }
     }
 
-    protected SkillStatus _BarStatus;
+    public SkillStatus _BarStatus;
 
     #endregion
 
     public BigSkill(XmlAttributeCollection attributes) : base(attributes)
     {
-        Initializer.RegistReference += RegistReference;
-
         SkillIndex = IntParse(attributes[4].Value);
 
-        SkillCato = SkillCato.BigSkill;
+        SkillType = SkillType.BigSkill;
     }
 
 
@@ -164,7 +161,7 @@ public class BigSkill : Skill
         }
     }
 
-    public override void Initialize()
+    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
     {
         BarBtn.onClick.AddListener(Use);
         BarBk1.sprite = ManaReso.Load<Sprite>(Icon + "副", Folder.Skill);
@@ -199,30 +196,69 @@ public class BigSkill : Skill
         UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, Level);
         UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, Level);
 
-        if (Class != SkillClass.Null)
+        if (Tab != SkillTab.Null)
         {
             ItemTit.text = Name;
             ItemLab.text = GetDescription(0);
             ItemBtn.onClick.AddListener(OnClick);
         }
 
-        if (ItemStatus == SkillStatus.Upgrade)
+        if (_ItemStatus == SkillStatus.Lock || _ItemStatus == SkillStatus.UnLock)
+        {
+            BarBk1.material = ManaReso.Load<Material>("Gray", Folder.Shader);
+        }
+        else
+        {
+            BarBk1.material = null;
+        }
+
+        if (_ItemStatus == SkillStatus.Upgrade)
         {
             ManaLog.Log(string.Format("初始化<color=red>{0}</color> 等级 : {1}", Name, Level));
+
             ShowSkillBar();
         }
 
-        if (BarStatus == SkillStatus.Use)
+        if (_BarStatus == SkillStatus.Use)
         {
-            ManaLog.Log(string.Format("初始化<color=red>{0}</color> 等级 : {1}", Name, Level));
-            Effect();
-            BarLab.color = new Color(38/255f, 155/255f, 1, 1);
+            if (UsingTimer < elapse)
+            {
+                if (UsingTimer < ManaData.CircleTimer)
+                {
+                    collectList[0].UniqueAdd(this);
+                }
+                else
+                {
+                    int lastCircle = 1 + Mathf.FloorToInt((float)((UsingTimer - ManaData.CircleTimer) / ManaData.CircleTime));
+
+                    collectList[lastCircle].UniqueAdd(this);
+                }
+
+                CoolTimer = CD - (elapse - UsingTimer);
+            }
+            else
+            {
+                ManaLog.Log(string.Format("初始化<color=red>{0}</color> 等级 : {1}", Name, Level));
+
+                Effect();
+
+                UsingTimer -= elapse;
+
+                BarLab.color = new Color(38 / 255f, 155 / 255f, 1, 1);
+            }
         }
+        else if (_BarStatus == SkillStatus.Cool)
+        {
+            CoolTimer -= elapse;
+        }
+
+        ItemStatus = ItemStatus;
+        BarStatus = BarStatus;
     }
 
     public override void ReceiveCool(float amt, bool isCurrent, bool isBuff)
     {
-        if (!ReduceCD || BarStatus != SkillStatus.CD)
+        if (!ReduceCD || BarStatus != SkillStatus.Cool)
         {
             return;
         }
@@ -252,6 +288,7 @@ public class BigSkill : Skill
     }
 
 
+
     private void ShowSkillBar()
     {
         if (!ManaData.SkillBar)
@@ -270,7 +307,7 @@ public class BigSkill : Skill
         }
     }
 
-    private void RegistReference()
+    public override void RegistReference()
     {
         BarLab = ManaReso.Get<Text>(string.Format("F_SkillLab{0}", SkillIndex - 1));
         BarBk0 = ManaReso.Get<Image>(string.Format("F_SkillBk{0}0", SkillIndex - 1));
@@ -300,7 +337,7 @@ public class BigSkill : Skill
 
             if (Math.Abs(Duration) < 0.0005f)
             {
-                BarStatus = SkillStatus.CD;
+                BarStatus = SkillStatus.Cool;
             }
             else
             {
@@ -311,8 +348,6 @@ public class BigSkill : Skill
             Effect();
             EffectOnce();
 
-            Data.SaveSkillList();
-
             #region 调试输出
 
             StringBuilder strb = new StringBuilder();
@@ -356,7 +391,7 @@ public class BigSkill : Skill
 
             if (Math.Abs(NewCoinOnceBuff) > 0.0005f)
             {
-                strb.AppendFormat(" 获得金币<color=red>{0}</color>", ManaData.Person * ManaData.CoinPerson * ManaData.Circle * NewCoinOnceBuff);
+                strb.AppendFormat(" 获得金币<color=red>{0}</color>", ManaData.Person * ManaData.CoinPerson * ManaData.CircleTime * NewCoinOnceBuff);
             }
 
             if (Math.Abs(DiamondOnce) > 0.0005f)
@@ -387,7 +422,7 @@ public class BigSkill : Skill
 
             BarStatus = SkillStatus.Buy;
 
-            if (Class != SkillClass.Null) //该技能有技能条
+            if (Tab != SkillTab.Null) //该技能有技能条
             {
                 if (UpgradeCur != Current.Free) //升级类型
                 {
@@ -403,7 +438,7 @@ public class BigSkill : Skill
                 ItemStatus = SkillStatus.Buy;
             }
 
-            Data.SaveSkillList();
+            BarBk1.material = null;
 
             ManaLog.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
         }
@@ -413,7 +448,7 @@ public class BigSkill : Skill
     {
         if (ItemStatus != SkillStatus.Lock)
         {
-            ManaMessage.Show("您并不需要提前解锁", 1);
+            ManaLog.Log("您并不需要提前解锁");
 
             return;
         }
@@ -433,8 +468,6 @@ public class BigSkill : Skill
                 throw new Exception();
             }
 
-            Data.SaveSkillList();
-
             ManaLog.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
         }
     }
@@ -470,8 +503,6 @@ public class BigSkill : Skill
                 Annul();
                 Effect();
             }
-
-            Data.SaveSkillList();
         }
     }
 
@@ -479,9 +510,9 @@ public class BigSkill : Skill
     public override void Annul() //注销技能
     {
         BarLab.color = new Color(1, 1, 1, 1);
-        BarStatus = SkillStatus.CD;
+        BarStatus = SkillStatus.Cool;
 
-        ManaData.SkillPlusPerm -= NewPlus;
+        ManaData.SkillPlus -= NewPlus;
         ManaData.SkillPerson -= NewPerson;
         ManaData.SkillPersonBuff -= NewPersonBuff;
         ManaData.SkillCoinPerson -= NewCoinPerson;
@@ -505,7 +536,7 @@ public class BigSkill : Skill
         ManaLog.Log(string.Format("技能结束 <color=red>{0}</color>", Name));
     }
 
-    public override bool DoTiming()
+    public override bool DoUse()
     {
         UsingTimer -= Time.deltaTime;
 

Assets/Script/Object/Skill/Pack.cs

@@ -34,7 +34,7 @@ public class Pack : SkillRoot
 
     #endregion
 
-    protected SkillStatus _ItemStatus;
+    public SkillStatus _ItemStatus;
 
     public SkillStatus ItemStatus
     {
@@ -75,12 +75,12 @@ public class Pack : SkillRoot
         Name = attributes[1].Value;
 
         Flower = IntParse(attributes[9].Value);
-        ClassId = IntParse(attributes[3].Value);
+        ClassID = IntParse(attributes[3].Value);
         UseAmt = FloatParse(attributes[12].Value);
         CoinOnce = FloatParse(attributes[7].Value);
         DiamondOnce = FloatParse(attributes[8].Value);
         
-        Class = SkillClassParse(attributes[2].Value);
+        Tab = SkillClassParse(attributes[2].Value);
         UseCur = CurrentParse(attributes[11].Value);
         MinUseLv = MinLevelParse(attributes[10].Value);
         MaxUseLv = MaxLevelParse(attributes[10].Value);
@@ -91,11 +91,11 @@ public class Pack : SkillRoot
 
         #endregion
 
-        SkillCato = SkillCato.Pack;
+        SkillType = SkillType.Pack;
     }
 
 
-    public override void Initialize()
+    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
     {
         ItemTit.text = Name;
         ItemLab.text = GetDescription(0);
@@ -108,11 +108,6 @@ public class Pack : SkillRoot
         }
     }
 
-    public override void CollectCoin(double elapse)
-    {
-        
-    }
-
     public override void ReceiveCool(float amt, bool isCurrent, bool isBuff)
     {
         
@@ -190,8 +185,6 @@ public class Pack : SkillRoot
 
             Level++;
 
-            Data.SaveSkillList();
-
             #region 调试输出
 
             StringBuilder strb = new StringBuilder();
@@ -247,19 +240,14 @@ public class Pack : SkillRoot
     }
 
 
-    public override void Annul() //注销技能
-    {
-
-    }
-
-    public override bool DoTiming()
+    public override bool DoUse()
     {
         return true;
     }
 
     protected void Effect()
     {
-        ManaData.SkillPlusPerm += Plus;
+        ManaData.SkillPlus += Plus;
         ManaData.SkillPerson += Person;
         ManaData.SkillPersonBuff += PersonBuff;
         ManaData.SkillCoinPerson += CoinPerson;

Assets/Script/Object/Skill/Skill.cs

@@ -6,6 +6,7 @@ using System.Xml;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 public class Skill : SkillRoot
 {
@@ -74,12 +75,12 @@ public class Skill : SkillRoot
         {
             _ItemStatus = value;
 
-            if (Class == SkillClass.Null) //该技能不生成技能条
+            if (Tab == SkillTab.Null) //该技能不生成技能条
             {
                 return;
             }
 
-            if (_ItemStatus == SkillStatus.CD)
+            if (_ItemStatus == SkillStatus.Cool)
             {
                 ManaData.CoolList.Add(this);
             }
@@ -110,7 +111,7 @@ public class Skill : SkillRoot
         }
     }
 
-    protected SkillStatus _ItemStatus;
+    public SkillStatus _ItemStatus;
 
     #endregion
 
@@ -132,7 +133,7 @@ public class Skill : SkillRoot
         UpgradeDuration = attributes[27].Value;
         UpgradeCoinOnce = attributes[26].Value;
 
-        ClassId = IntParse(attributes[3].Value);
+        ClassID = IntParse(attributes[3].Value);
         UnlockLv = IntParse(attributes[13].Value);
 
         CD = FloatParse(attributes[12].Value);
@@ -142,7 +143,7 @@ public class Skill : SkillRoot
         DiamondOnce = FloatParse(attributes[9].Value);
         UnlockAheadAmt = FloatParse(attributes[15].Value);
 
-        Class = SkillClassParse(attributes[2].Value);
+        Tab = SkillClassParse(attributes[2].Value);
         ReduceCD = BoolParse(attributes[5].Value);
         UpgradeAmt = UpgradeAmtParse(attributes[22].Value); //Sa1
         
@@ -158,11 +159,11 @@ public class Skill : SkillRoot
 
         #endregion
 
-        SkillCato = SkillCato.Skill;
+        SkillType = SkillType.Skill;
     }
 
 
-    public override void Initialize()
+    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
     {
         NewPlus = Plus;
         NewPerson = Person;
@@ -198,38 +199,46 @@ public class Skill : SkillRoot
         ItemLab.text = GetDescription(0);
         ItemBtn.onClick.AddListener(OnClick);
 
-        if (ItemStatus != SkillStatus.Lock && ItemStatus != SkillStatus.UnLock)
+        if (_ItemStatus != SkillStatus.Lock && _ItemStatus != SkillStatus.UnLock)
         {
             ManaLog.Log(string.Format("初始化<color=red>{0}</color> 等级 : {1}", Name, Level));
         }
 
-        if (ItemStatus == SkillStatus.Use)
+        if (_ItemStatus == SkillStatus.Use)
         {
-            Effect();
-            ItemBtnLab.color = new Color(38 / 255f, 155 / 255f, 1, 1);
+            if (UsingTimer < elapse)
+            {
+                if (UsingTimer < ManaData.CircleTimer)
+                {
+                    collectList[0].UniqueAdd(this);
+                }
+                else
+                {
+                    int lastCircle = 1 + Mathf.FloorToInt((float)(UsingTimer - ManaData.CircleTimer / ManaData.CircleTime));
+
+                    collectList[lastCircle].UniqueAdd(this);
+                }
+
+                CoolTimer = CD - (elapse - UsingTimer);
+            }
+            else
+            {
+                Effect();
+
+                UsingTimer -= elapse;
+
+                ItemBtnLab.color = new Color(38 / 255f, 155 / 255f, 1, 1);
+            }
+        }
+        else if (_ItemStatus == SkillStatus.Cool)
+        {
+            CoolTimer -= elapse;
         }
-    } //读取配置时调用
 
-    public override void CollectCoin(double elapse)
-    {
-        CoolTimer -= elapse;
-        UsingTimer -= elapse;
-        //if (elapse < UsingTimer)
-        //{
-        //    float newPerson = ManaData.Person * NewPersonBuff + NewPerson;
-        //    float newCoinPerson = ManaData.CoinPerson + NewCoinPerson;
-        //    double income = (newPerson * newCoinPerson * offlineCircle * ManaData.Circle) * (1 + NewPlus + ManaData.SkillPlusPerm);
-        //    ManaData.OfflineCoin += income;
-        //}
-        //else
-        //{
-        //    float newPerson = ManaData.Person * NewPersonBuff + NewPerson;
-        //    float newCoinPerson = ManaData.CoinPerson + NewCoinPerson;
-        //    double income = (newPerson * newCoinPerson * offlineCircle * ManaData.Circle) * (1 + NewPlus + ManaData.SkillPlusPerm);
-        //    ManaData.OfflineCoin += income;
-        //}
+        ItemStatus = ItemStatus;
     }
 
+
     public virtual bool DoCool()
     {
         CoolTimer -= Time.deltaTime;
@@ -254,7 +263,7 @@ public class Skill : SkillRoot
 
     public override void ReceiveCool(float amt, bool isCurrent, bool isBuff)
     {
-        if (!ReduceCD && ItemStatus == SkillStatus.CD)
+        if (!ReduceCD && ItemStatus == SkillStatus.Cool)
         {
             return;
         }
@@ -417,8 +426,6 @@ public class Skill : SkillRoot
                 Annul();
                 Effect();
             }
-
-            Data.SaveSkillList();
         }
     }
 
@@ -431,7 +438,7 @@ public class Skill : SkillRoot
 
             if (Math.Abs(Duration) < 0.0005f)
             {
-                ItemStatus = SkillStatus.CD;
+                ItemStatus = SkillStatus.Cool;
             }
             else
             {
@@ -442,8 +449,6 @@ public class Skill : SkillRoot
             Effect();
             EffectOnce();
 
-            Data.SaveSkillList();
-
             #region 调试输出
 
             StringBuilder strb = new StringBuilder();
@@ -487,7 +492,7 @@ public class Skill : SkillRoot
 
             if (Math.Abs(NewCoinOnceBuff) > 0.0005f)
             {
-                strb.AppendFormat(" 获得金币<color=red>{0}</color>", ManaData.Person * ManaData.CoinPerson * ManaData.Circle * NewCoinOnceBuff);
+                strb.AppendFormat(" 获得金币<color=red>{0}</color>", ManaData.Person * ManaData.CoinPerson * ManaData.CircleTime * NewCoinOnceBuff);
             }
 
             if (Math.Abs(DiamondOnce) > 0.0005f)
@@ -527,8 +532,6 @@ public class Skill : SkillRoot
                 throw new Exception();
             }
 
-            Data.SaveSkillList();
-
             ManaLog.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
         }
     }
@@ -537,7 +540,7 @@ public class Skill : SkillRoot
     {
         if (ItemStatus != SkillStatus.Lock)
         {
-            ManaMessage.Show("您并不需要提前解锁", 1);
+            ManaLog.Log("您并不需要提前解锁");
 
             return;
         }
@@ -557,8 +560,6 @@ public class Skill : SkillRoot
                 throw new Exception();
             }
 
-            Data.SaveSkillList();
-
             ManaLog.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
         }
     }
@@ -591,9 +592,9 @@ public class Skill : SkillRoot
     public override void Annul() //注销技能
     {
         ItemBtnLab.color = new Color(1, 1, 1, 1);
-        ItemStatus = SkillStatus.CD;
+        ItemStatus = SkillStatus.Cool;
 
-        ManaData.SkillPlusPerm -= NewPlus;
+        ManaData.SkillPlus -= NewPlus;
         ManaData.SkillPerson -= NewPerson;
         ManaData.SkillPersonBuff -= NewPersonBuff;
         ManaData.SkillCoinPerson -= NewCoinPerson;
@@ -617,7 +618,7 @@ public class Skill : SkillRoot
         ManaLog.Log(string.Format("技能结束 <color=red>{0}</color>", Name));
     }
 
-    public override bool DoTiming()
+    public override bool DoUse()
     {
         UsingTimer -= Time.deltaTime;
 
@@ -640,7 +641,7 @@ public class Skill : SkillRoot
     protected void Effect()
     {
         ManaData.SkillPerson += NewPerson;
-        ManaData.SkillPlusTemp += NewPlus;
+        ManaData.SkillPlus += NewPlus;
         ManaData.SkillPersonBuff += NewPersonBuff;
         ManaData.SkillCoinPerson += NewCoinPerson;
 
@@ -664,7 +665,7 @@ public class Skill : SkillRoot
     protected void EffectOnce()
     {
         ManaData.Coin += NewCoinOnce;
-        ManaData.Coin += ManaData.Person * ManaData.CoinPerson * ManaData.Circle * NewCoinOnceBuff;
+        ManaData.Coin += ManaData.Person * ManaData.CoinPerson * ManaData.CircleTime * NewCoinOnceBuff;
         ManaData.Diamond += DiamondOnce;
     }
 

Assets/Script/Object/Skill/SkillRoot.cs

@@ -7,16 +7,15 @@ using System.Collections.Generic;
 
 public enum Current
 {
-    Free,
-
     AD,
+    Free,
     Coin,
     Cash,
     Other,
     Diamond,
 }
 
-public enum SkillCato
+public enum SkillType
 {
     Skill,
     Pack,
@@ -24,11 +23,10 @@ public enum SkillCato
     BigSkill,
 }
 
-public enum SkillClass
+public enum SkillTab
 {
-    Null,
-
     Elf,
+    Null,
     Store,
     Magic,
     Garden,
@@ -36,24 +34,24 @@ public enum SkillClass
 
 public enum SkillStatus
 {
-    CD, //冷却中
-    Buy, //需要购买
-    Use, //使用中
-    Lock, //需要提前解锁
-    UnLock, //需要解锁
+    Buy,
+    Use,
+    Cool,
+    Lock,
+    UnLock,
     Upgrade,
 }
 
-public abstract class SkillRoot : IComparable
+public abstract class SkillRoot
 {
     #region 变量
 
     #region 配置
 
-    public int ClassId;
+    public int ClassID;
     public string Icon;
     public string Name;
-    public SkillClass Class;
+    public SkillTab Tab;
 
     #endregion
 
@@ -63,23 +61,53 @@ public abstract class SkillRoot : IComparable
     public Text ItemBtnLab;
     public Image ItemIcon;
     public Button ItemBtn;
-    public SkillCato SkillCato;
+    public SkillType SkillType;
+
+    public abstract bool DoUse();
+    public abstract void RegistValue(double elapse, List<List<SkillRoot>> collectList);
+    public abstract void OnLevelChange();
 
     #endregion
 
-    public virtual int CompareTo(object obj)
+    public static int SortByClassID(SkillRoot skillRootA, SkillRoot skillRootB)
     {
-        SkillRoot other = (SkillRoot) obj;
+        if (skillRootA.ClassID == skillRootB.ClassID)
+        {
+            return 0;
+        }
+        else if (skillRootA.ClassID > skillRootB.ClassID)
+        {
+            return 1;
+        }
+        else if (skillRootA.ClassID < skillRootB.ClassID)
+        {
+            return -1;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
+    public static int SortByTimer(SkillRoot skillRootA, SkillRoot skillRootB)
+    {
+        Skill skillA = (Skill) skillRootA;
+        Skill skillB = (Skill) skillRootB;
+
+        if (skillA == null || skillB == null)
+        {
+            return 0;
+        }
 
-        if (ClassId == other.ClassId)
+        if (Math.Abs(skillA.UsingTimer - skillB.UsingTimer) < 0.0005f)
         {
             return 0;
         }
-        else if (ClassId > other.ClassId)
+        else if (skillA.UsingTimer > skillB.UsingTimer)
         {
             return 1;
         }
-        else if (ClassId < other.ClassId)
+        else if (skillA.UsingTimer < skillB.UsingTimer)
         {
             return -1;
         }
@@ -89,12 +117,21 @@ public abstract class SkillRoot : IComparable
         }
     }
 
-    public abstract void Annul();
-    public abstract void Initialize();
-    public abstract void ReceiveCool(float amt, bool isCurrent, bool isBuff); //接受技能冷却
-    public abstract void OnLevelChange();
-    public abstract void CollectCoin(double elapse);
-    public abstract bool DoTiming();
+
+    public virtual void Annul()
+    {
+
+    }
+
+    public virtual void ReceiveCool(float amt, bool isCurrent, bool isBuff)
+    {
+        
+    }
+
+    public virtual void RegistReference()
+    {
+        
+    }
 
     #region 解读器
 
@@ -302,11 +339,11 @@ public abstract class SkillRoot : IComparable
         }
     }
 
-    protected SkillClass SkillClassParse(string str)
+    protected SkillTab SkillClassParse(string str)
     {
         if (string.IsNullOrEmpty(str))
         {
-            return SkillClass.Null;
+            return SkillTab.Null;
         }
         else
         {
@@ -314,19 +351,19 @@ public abstract class SkillRoot : IComparable
 
             if (number == 1)
             {
-                return SkillClass.Garden;
+                return SkillTab.Garden;
             }
             else if (number == 2)
             {
-                return SkillClass.Elf;
+                return SkillTab.Elf;
             }
             else if (number == 3)
             {
-                return SkillClass.Magic;
+                return SkillTab.Magic;
             }
             else if (number == 4)
             {
-                return SkillClass.Store;
+                return SkillTab.Store;
             }
             else
             {

Assets/Script/Tool/Anim/MoveScrr.cs

@@ -1,75 +0,0 @@
-using UnityEngine;
-
-using System.Collections;
-using UnityEngine.Events;
-using UnityEngine.UI;
-
-public class MoveScrr : Move
-{
-    #region 变量
-
-    protected float Timer;
-    protected float Duration;
-    protected float Delta;
-    protected float Origin;
-    protected float Destination;
-    protected ScrollRect Target;
-
-    protected CurveFunctionF Func;
-
-    #endregion
-
-    public MoveScrr(ScrollRect target)
-    {
-        Target = target;
-    }
-
-
-    public override bool DoMove()
-    {
-        if (Timer > Duration)
-        {
-            Target.horizontalNormalizedPosition = Destination;
-
-            Timer = 0;
-
-            ManaAnim.MoveList.Remove(this);
-
-            if (OnFinish != null)
-            {
-                OnFinish.Invoke();
-            }
-
-            return true;
-        }
-        else
-        {
-            Target.horizontalNormalizedPosition = Func(Timer, Duration, Origin, Delta);
-
-            Timer += Time.fixedDeltaTime;
-
-            return false;
-        }
-    }
-
-    public void StartMove(float destination, float duration, Curve curve)
-    {
-        Timer = 0;
-        Finish = false;
-
-        Delta = destination - Target.horizontalNormalizedPosition;
-        Origin = Target.horizontalNormalizedPosition;
-        Duration = duration;
-        Destination = destination;
-
-        Func = ManaAnim.FunctionDicF[curve];
-
-        if (OnStart != null)
-        {
-            OnStart.Invoke();
-        }
-
-        ManaAnim.MoveList.Remove(this);
-        ManaAnim.MoveList.Add(this);
-    }
-}

Assets/Script/Tool/Anim/MoveScrr.cs.meta

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

Assets/Script/Tool/Anim/MoveVec.cs

@@ -27,6 +27,8 @@ public class MoveVec : Move
 
     public override bool DoMove()
     {
+        Timer += Time.fixedDeltaTime;
+
         if (Timer > Duration)
         {
             Target.position = Destination;
@@ -46,8 +48,6 @@ public class MoveVec : Move
         {
             Target.position = Func(Timer, Duration, Origin, Delta);
 
-            Timer += Time.fixedDeltaTime;
-
             return false;
         }
     }
@@ -69,6 +69,7 @@ public class MoveVec : Move
             OnStart.Invoke();
         }
 
+        ManaAnim.MoveList.Remove(this);
         ManaAnim.MoveList.Add(this);
     }
 }

Assets/Script/Tool/Anim/Tween.cs

@@ -6,8 +6,8 @@ using System.Collections;
 
 public abstract class Tween 
 {
-    public bool ForwardFinish;
-    public bool BackwardFinish;
+    public bool IsForward;
+    public bool IsBackward;
     public UnityAction OnForwardStart;
     public UnityAction OnForwardFinish;
     public UnityAction OnBackwardStart;
@@ -24,7 +24,7 @@ public abstract class Tween
 
     public virtual void StartForward()
     {
-        ForwardFinish = false;
+        IsForward = true;
         OnForwardStart.Invoke();
 
         ManaAnim.TweenForList.Add(this);
@@ -33,7 +33,7 @@ public abstract class Tween
 
     public virtual void StartBackward()
     {
-        BackwardFinish = false;
+        IsBackward = true;
         OnBackwardStart.Invoke();
 
         ManaAnim.TweenBacList.Add(this);

Assets/Script/Tool/Anim/TweenAudio.cs

@@ -0,0 +1,120 @@
+using System;
+using UnityEngine;
+
+using System.Collections;
+
+public class TweenAudio : Tween 
+{
+    #region 变量
+
+    protected float Delta;
+    protected float Origin;
+    protected float Destination;
+    protected AudioSource Target;
+    protected CurveFunctionF Func;
+
+    #endregion
+
+    public TweenAudio(AudioSource target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        Target = target;
+
+        IsForward = false;
+        IsBackward = false;
+
+        Duration = duration;
+
+        Delta = destination - origin;
+        Origin = origin;
+        Destination = destination;
+
+        OnForwardStart += () =>
+        {
+            
+        };
+
+        OnForwardFinish += () =>
+        {
+            
+        };
+
+        OnBackwardStart += () =>
+        {
+            
+        };
+
+        OnBackwardFinish += () =>
+        {
+            
+        };
+
+        Func = ManaAnim.FunctionDicF[curve];
+    }
+
+
+    public override void StartForward()
+    {
+        base.StartForward();
+
+        if (IsBackward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
+
+    public override void StartBackward()
+    {
+        base.StartBackward();
+
+        if (IsForward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
+
+    public override bool DoForward()
+    {
+            Timer += Time.fixedDeltaTime;
+        if (Timer > Duration)
+        {
+            Target.volume = Destination;
+
+            Timer = 0;
+            IsForward = false;
+            OnForwardFinish.Invoke();
+
+            ManaAnim.TweenForList.Remove(this);
+            return true;
+        }
+        else
+        {
+            Target.volume = Func(Timer, Duration, Origin, Delta);
+
+
+            return false;
+        }
+    }
+
+    public override bool DoBackward()
+    {
+            Timer += Time.fixedDeltaTime;
+        if (Timer > Duration)
+        {
+            Target.volume = Origin;
+
+            Timer = 0;
+            IsBackward = false;
+            OnBackwardFinish.Invoke();
+
+            ManaAnim.TweenBacList.Remove(this);
+            return true;
+        }
+        else
+        {
+            Target.volume = Func(Timer, Duration, Destination, -Delta);
+
+
+            return false;
+        }
+    }
+}

Assets/Script/Tool/Anim/TweenAudio.cs.meta

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

Assets/Script/Tool/Anim/TweenCG.cs

@@ -18,6 +18,10 @@ public class TweenCG : Tween
     public TweenCG(CanvasGroup target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
         Target = target;
+
+        IsForward = false;
+        IsBackward = false;
+
         Duration = duration;
         DestActive = destActive;
         OriginActive = originActive;
@@ -53,15 +57,35 @@ public class TweenCG : Tween
         Func = ManaAnim.FunctionDicF[curve];
     }
 
+    public override void StartForward()
+    {
+        base.StartForward();
+
+        if (IsBackward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
+
+    public override void StartBackward()
+    {
+        base.StartBackward();
+
+        if (IsForward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
 
     public override bool DoForward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.alpha = Destination;
 
             Timer = 0;
-            BackwardFinish = true;
+            IsForward = false;
             OnForwardFinish.Invoke();
 
             ManaAnim.TweenForList.Remove(this);
@@ -71,7 +95,6 @@ public class TweenCG : Tween
         {
             Target.alpha = Func(Timer, Duration, Origin, Delta);
 
-            Timer += Time.fixedDeltaTime;
 
             return false;
         }
@@ -79,12 +102,13 @@ public class TweenCG : Tween
 
     public override bool DoBackward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.alpha = Origin;
 
             Timer = 0;
-            ForwardFinish = true;
+            IsBackward = false;
             OnBackwardFinish.Invoke();
 
             ManaAnim.TweenBacList.Remove(this);
@@ -94,7 +118,6 @@ public class TweenCG : Tween
         {
             Target.alpha = Func(Timer, Duration, Destination, -Delta);
 
-            Timer += Time.fixedDeltaTime;
 
             return false;
         }

Assets/Script/Tool/Anim/TweenGra.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System.Collections;
@@ -18,6 +19,10 @@ public class TweenGra : Tween
     public TweenGra(Graphic target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve)
     {
         Target = target;
+
+        IsForward = false;
+        IsBackward = false;
+
         Duration = duration;
         DestActive = destActive;
         OriginActive = originActive;
@@ -49,14 +54,35 @@ public class TweenGra : Tween
         Func = ManaAnim.FunctionDicC[curve];
     }
 
+    public override void StartForward()
+    {
+        base.StartForward();
+
+        if (IsBackward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
+
+    public override void StartBackward()
+    {
+        base.StartBackward();
+
+        if (IsForward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
+
     public override bool DoForward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.color = Destination;
 
             Timer = 0;
-            BackwardFinish = true;
+            IsForward = false;
             OnForwardFinish.Invoke();
 
             ManaAnim.TweenForList.Remove(this);
@@ -66,7 +92,6 @@ public class TweenGra : Tween
         {
             Target.color = Func(Timer, Duration, Origin, Delta);
 
-            Timer += Time.fixedDeltaTime;
 
             return false;
         }
@@ -74,12 +99,13 @@ public class TweenGra : Tween
 
     public override bool DoBackward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.color = Origin;
 
             Timer = 0;
-            ForwardFinish = true;
+            IsBackward = false;
             OnBackwardFinish.Invoke();
 
             ManaAnim.TweenBacList.Remove(this);
@@ -89,7 +115,6 @@ public class TweenGra : Tween
         {
             Target.color = Func(Timer, Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a));
 
-            Timer += Time.fixedDeltaTime;
 
             return false;
         }

Assets/Script/Tool/Anim/TweenScale.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
 using System.Collections;
 
@@ -19,8 +20,8 @@ public class TweenScale : Tween
     {
         Target = target;
 
-        ForwardFinish = true;
-        BackwardFinish = true;
+        IsForward = false;
+        IsBackward = false;
 
         Duration = duration;
         DestActive = destActive;
@@ -80,7 +81,7 @@ public class TweenScale : Tween
     {
         base.StartForward();
 
-        if (!BackwardFinish)
+        if (IsBackward)
         {
             Timer = Duration - Timer;
         }
@@ -90,7 +91,7 @@ public class TweenScale : Tween
     {
         base.StartBackward();
 
-        if (!ForwardFinish)
+        if (IsForward)
         {
             Timer = Duration - Timer;
         }
@@ -98,12 +99,13 @@ public class TweenScale : Tween
 
     public override bool DoForward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.localScale = Destination;
 
             Timer = 0;
-            ForwardFinish = true;
+            IsForward = false;
             OnForwardFinish.Invoke();
 
             ManaAnim.TweenForList.Remove(this);
@@ -114,7 +116,6 @@ public class TweenScale : Tween
         {
             Target.localScale = Func(Timer, Duration, Origin, Delta);
 
-            Timer += Time.fixedDeltaTime;
             
             return false;
         }
@@ -122,12 +123,13 @@ public class TweenScale : Tween
 
     public override bool DoBackward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.localScale = Origin;
 
             Timer = 0;
-            BackwardFinish = true;
+            IsBackward = false;
             OnBackwardFinish.Invoke();
 
             ManaAnim.TweenBacList.Remove(this);
@@ -137,7 +139,6 @@ public class TweenScale : Tween
         {
             Target.localScale = Func(Timer, Duration, Destination, -Delta);
 
-            Timer += Time.fixedDeltaTime;
             
             return false;
         }

Assets/Script/Tool/Anim/TweenVec.cs

@@ -19,6 +19,10 @@ public class TweenVec : Tween
     public TweenVec(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
     {
         Target = target;
+
+        IsForward = false;
+        IsBackward = false;
+
         Duration = duration;
         DestActive = destActive;
         OriginActive = originActive;
@@ -72,15 +76,35 @@ public class TweenVec : Tween
         Func = ManaAnim.FunctionDicV[curve];
     }
 
+    public override void StartForward()
+    {
+        base.StartForward();
+
+        if (IsBackward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
+
+    public override void StartBackward()
+    {
+        base.StartBackward();
+
+        if (IsForward)
+        {
+            Timer = Duration - Timer;
+        }
+    }
 
     public override bool DoForward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.position = Destination;
 
             Timer = 0;
-            ForwardFinish = true;
+            IsForward = false;
             OnForwardFinish.Invoke();
 
             ManaAnim.TweenForList.Remove(this);
@@ -91,7 +115,6 @@ public class TweenVec : Tween
         {
             Target.position = Func(Timer, Duration, Origin, Delta);
 
-            Timer += Time.fixedDeltaTime;
 
             return false;
         }
@@ -99,12 +122,13 @@ public class TweenVec : Tween
 
     public override bool DoBackward()
     {
+            Timer += Time.fixedDeltaTime;
         if (Timer > Duration)
         {
             Target.position = Origin;
 
             Timer = 0;
-            BackwardFinish = true;
+            IsBackward = false;
             OnBackwardFinish.Invoke();
 
             ManaAnim.TweenBacList.Remove(this);
@@ -114,7 +138,6 @@ public class TweenVec : Tween
         {
             Target.position = Func(Timer, Duration, Destination, -Delta);
 
-            Timer += Time.fixedDeltaTime;
 
             return false;
         }

Assets/Script/Tool/Auxiliary.cs

@@ -2,6 +2,7 @@
 
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.Events;
 
 using System;
 using System.IO;
@@ -10,7 +11,6 @@ using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 using System.Security.Cryptography;
-using UnityEngine.Events;
 
 public class Auxiliary : MonoBehaviour 
 {
@@ -23,6 +23,7 @@ public class Auxiliary : MonoBehaviour
     public List<GameObject> GoList;
     public List<SpriteRenderer> SrList;
 
+    public static Auxiliary Inst;
     public static DESCryptoServiceProvider Des
     {
         get
@@ -45,7 +46,7 @@ public class Auxiliary : MonoBehaviour
 
     private void Start()
     {
-        
+        Inst = this;
     }
 
     
@@ -79,8 +80,25 @@ public class Auxiliary : MonoBehaviour
         {
             Data.ResetPlayerConfig();
         }
+
+        if (Input.GetKeyDown(KeyCode.T))
+        {
+            if (Math.Abs(Time.timeScale) < 0.0005f)
+            {
+                Time.timeScale = 1;
+
+                ManaLog.Log("<color=red>游戏已恢复</color>");
+            }
+            else
+            {
+                Time.timeScale = 0;
+
+                ManaLog.Log("<color=red>游戏已暂停</color>");
+            }
+        }
     }
 
+
     public static byte[] Encrypt(string str)
     {
         byte[] bytes = Encoding.UTF8.GetBytes(str);
@@ -149,7 +167,18 @@ public class Auxiliary : MonoBehaviour
     }
 
 
-    public static IEnumerator DelayCall(UnityAction function, int frame)
+    public void DelayCall(UnityAction function, int frame)
+    {
+        StartCoroutine(IDelayCall(function, frame));
+    }
+
+    public void DelayCall(UnityAction function, float time)
+    {
+        StartCoroutine(IDelayCall(function, time));
+    }
+
+
+    private static IEnumerator IDelayCall(UnityAction function, int frame)
     {
         int count = 0;
 
@@ -160,4 +189,11 @@ public class Auxiliary : MonoBehaviour
 
         function.Invoke();
     }
+
+    private static IEnumerator IDelayCall(UnityAction function, float time)
+    {
+        yield return new WaitForSeconds(time);
+
+        function.Invoke();
+    }
 }

Assets/Script/Tool/DashGame.meta

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

Assets/Script/Tool/Data.cs

@@ -45,7 +45,7 @@ public class Data
 
     #endregion
 
-    public static void SaveSkillList()
+    private static void SaveSkillList()
     {
         XmlNode xmlNode;
         XmlAttribute xmlAttribute;
@@ -54,7 +54,7 @@ public class Data
         xmlNode.RemoveAll();
         for (int i = 0; i < ManaData.SkillList.Count; i++)
         {
-            if (ManaData.SkillList[i].SkillCato == SkillCato.Skill)
+            if (ManaData.SkillList[i].SkillType == SkillType.Skill)
             {
                 #region Skill
 
@@ -62,8 +62,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, skill.Name, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = skill.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = skill.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
                 xmlAttribute.Value = skill.ItemStatus.ToString();
@@ -81,7 +81,7 @@ public class Data
 
                 #endregion
             }
-            else if (ManaData.SkillList[i].SkillCato == SkillCato.Pack)
+            else if (ManaData.SkillList[i].SkillType == SkillType.Pack)
             {
                 #region Pack
 
@@ -89,8 +89,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "礼包", ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = pack.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = pack.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Name"));
                 xmlAttribute.Value = pack.Name;
@@ -105,7 +105,7 @@ public class Data
 
                 #endregion
             }
-            else if (ManaData.SkillList[i].SkillCato == SkillCato.Ability)
+            else if (ManaData.SkillList[i].SkillType == SkillType.Ability)
             {
                 #region Ability
 
@@ -113,8 +113,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, ability.Name, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = ability.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = ability.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
                 xmlAttribute.Value = ability.ItemStatus.ToString();
@@ -126,7 +126,7 @@ public class Data
 
                 #endregion
             }
-            else if (ManaData.SkillList[i].SkillCato == SkillCato.BigSkill)
+            else if (ManaData.SkillList[i].SkillType == SkillType.BigSkill)
             {
                 #region BigSkill
 
@@ -134,8 +134,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, bigSkill.Name, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = bigSkill.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = bigSkill.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
                 xmlAttribute.Value = bigSkill.ItemStatus.ToString();
@@ -161,7 +161,7 @@ public class Data
         PlayerDoc.Save(Application.dataPath + @"\Resources\XML\Config\PlayerConfig.xml");
     }
 
-    public static void SavePlantList()
+    private static void SavePlantList()
     {
         XmlAttributeCollection attributes = PlayerNode.SelectSingleNode("PlantList").Attributes;
         attributes.RemoveAll();
@@ -175,7 +175,7 @@ public class Data
         PlayerDoc.Save(Application.dataPath + @"\Resources\XML\Config\PlayerConfig.xml");
     }
 
-    public static void SaveCommon()
+    private static void SaveCommon()
     {
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = ManaData.Coin.ToString("0");
         PlayerNode.SelectSingleNode("Level").Attributes[0].Value = ManaData.Level.ToString();
@@ -188,7 +188,7 @@ public class Data
         PlayerDoc.Save(Application.dataPath + @"\Resources\XML\Config\PlayerConfig.xml");
     }
 
-    public static void SaveFlowerList()
+    private static void SaveFlowerList()
     {
         XmlAttributeCollection attributes = PlayerNode.SelectSingleNode("FlowerList").Attributes;
         attributes[0].RemoveAll();
@@ -216,7 +216,7 @@ public class Data
     }
 
 
-    public static void ResetSkillList()
+    private static void ResetSkillList()
     {
         XmlNode xmlNode;
         XmlAttribute xmlAttribute;
@@ -225,7 +225,7 @@ public class Data
         xmlNode.RemoveAll();
         for (int i = 0; i < ManaData.SkillList.Count; i++)
         {
-            if (ManaData.SkillList[i].SkillCato == SkillCato.Skill)
+            if (ManaData.SkillList[i].SkillType == SkillType.Skill)
             {
                 #region Skill
 
@@ -233,8 +233,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, skill.Name, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = skill.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = skill.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
                 xmlAttribute.Value = SkillStatus.Lock.ToString();
@@ -252,7 +252,7 @@ public class Data
 
                 #endregion
             }
-            else if (ManaData.SkillList[i].SkillCato == SkillCato.Pack)
+            else if (ManaData.SkillList[i].SkillType == SkillType.Pack)
             {
                 #region Pack
 
@@ -260,8 +260,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "礼包", ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = pack.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = pack.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Name"));
                 xmlAttribute.Value = pack.Name;
@@ -276,7 +276,7 @@ public class Data
 
                 #endregion
             }
-            else if (ManaData.SkillList[i].SkillCato == SkillCato.Ability)
+            else if (ManaData.SkillList[i].SkillType == SkillType.Ability)
             {
                 #region Ability
 
@@ -284,8 +284,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, ability.Name, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = ability.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = ability.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
                 xmlAttribute.Value = SkillStatus.Lock.ToString();
@@ -297,7 +297,7 @@ public class Data
 
                 #endregion
             }
-            else if (ManaData.SkillList[i].SkillCato == SkillCato.BigSkill)
+            else if (ManaData.SkillList[i].SkillType == SkillType.BigSkill)
             {
                 #region BigSkill
 
@@ -305,8 +305,8 @@ public class Data
 
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, bigSkill.Name, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillCato"));
-                xmlAttribute.Value = bigSkill.SkillCato.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute.Value = bigSkill.SkillType.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
                 xmlAttribute.Value = SkillStatus.Lock.ToString();
@@ -332,7 +332,7 @@ public class Data
         PlayerDoc.Save(Application.dataPath + @"\Resources\XML\Config\PlayerConfig.xml");
     }
 
-    public static void ResetPlantList()
+    private static void ResetPlantList()
     {
         XmlNode xmlNode = PlayerNode.SelectSingleNode("PlantList");
         xmlNode.RemoveAll();
@@ -367,7 +367,7 @@ public class Data
         PlayerDoc.Save(Application.dataPath + @"\Resources\XML\Config\PlayerConfig.xml");
     }
 
-    public static void ResetCommon()
+    private static void ResetCommon()
     {
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Level").Attributes[0].Value = "0";
@@ -380,7 +380,7 @@ public class Data
         PlayerDoc.Save(Application.dataPath + @"\Resources\XML\Config\PlayerConfig.xml");
     }
 
-    public static void ResetFlowerList()
+    private static void ResetFlowerList()
     {
         XmlAttributeCollection attributes = PlayerNode.SelectSingleNode("FlowerList").Attributes;
         attributes[0].RemoveAll();

Assets/Script/Tool/Extension.cs

@@ -7,6 +7,29 @@ using System.Collections.Generic;
 
 public static class Extension
 {
+    #region List
+
+    public static T Last<T>(this List<T> list, int index)
+    {
+        return list[list.Count - 1 - index];
+    }
+
+    public static bool UniqueAdd<T>(this List<T> list, T obj)
+    {
+        if (list.Contains(obj) == false)
+        {
+            list.Add(obj);
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    #endregion
+
     #region Scale
 
     public static Vector3 GetScale(this Transform tra)
@@ -36,11 +59,6 @@ public static class Extension
         ManaAnim.MoveVec(comp.transform, destination, duration, curve);
     }
 
-    public static void MoveScrr(this Component comp, float destination, float duration, Curve curve)
-    {
-        ManaAnim.MoveScrr(comp.transform, destination, duration, curve);
-    }
-
 
     public static MoveVec GetMoveVec(this Component comp)
     {
@@ -52,17 +70,6 @@ public static class Extension
         return ManaAnim.CreateMoveVec(comp.transform);
     }
 
-
-    public static MoveScrr GetMoveScrr(this Component comp)
-    {
-        return ManaAnim.GetMoveScrr(comp.transform);
-    }
-
-    public static MoveScrr CreateMoveScrr(this Component comp)
-    {
-        return ManaAnim.CreateMoveScrr(comp.transform);
-    }
-
     #endregion
 
     #region Alpha
@@ -142,6 +149,11 @@ public static class Extension
         ManaAnim.TweenForScale(comp.transform);
     }
 
+    public static void TweenForAudio(this Component comp)
+    {
+        ManaAnim.TweenForAudio(comp.transform);
+    }
+
 
 
     public static void TweenBacCG(this Component comp)
@@ -164,6 +176,11 @@ public static class Extension
         ManaAnim.TweenBacScale(comp.transform);
     }
 
+    public static void TweenBacAudio(this Component comp)
+    {
+        ManaAnim.TweenBacAudio(comp.transform);
+    }
+
 
     public static TweenCG GetTweenCG(this Component comp)
     {
@@ -185,6 +202,10 @@ public static class Extension
         return ManaAnim.GetTweenScale(comp.transform);
     }
 
+    public static TweenAudio GetTweenAudio(this Component comp)
+    {
+        return ManaAnim.GetTweenAudio(comp.transform);
+    }
 
 
     public static TweenCG CreateTweenCG(this Component comp, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
@@ -227,6 +248,33 @@ public static class Extension
         return ManaAnim.CreateTweenScale(comp.transform, destination, duration, originActive, destActive, curve);
     }
 
+    public static TweenAudio CreateTweenAudio(this Component comp, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        return ManaAnim.CreateTweenAudio(comp.transform, origin, destination, duration, originActive, destActive, curve);
+    }
+
+    public static TweenAudio CreateTweenAudio(this Component comp, float destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        return ManaAnim.CreateTweenAudio(comp.transform, destination, duration, originActive, destActive, curve);
+    }
+    #endregion
+
+    #region Vector3
+
+    public static void SetX(this Transform tra, float x)
+    {
+        tra.position = new Vector3(x, tra.position.y, tra.position.z);
+    }
+
+    public static void SetY(this Transform tra, float y)
+    {
+        tra.position = new Vector3(tra.position.x, y, tra.position.z);
+    }
+
+    public static void SetZ(this Transform tra, float z)
+    {
+        tra.position = new Vector3(tra.position.x, tra.position.y, z);
+    }
 
     #endregion
 

Assets/Script/Tool/UI/FlowerCard.cs

@@ -4,34 +4,50 @@ using UnityEngine.Events;
 
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine.EventSystems;
 
 public class FlowerCard : MonoBehaviour
 {
 	#region 变量
 
-    public int SelectIndex = -1;
+    public int SelectIndex;
+    public int ScrollSelectIndex;
+    public bool SelectLock;
+    public float LeftBorder;
+    public float RightBorder;
 
     public Transform SeleItem;
-    public List<Transform> ItemList = new List<Transform>();
-    public List<FlowerInfo> InfoList = new List<FlowerInfo>();
+    public List<Transform> ItemList;
+    public List<FlowerInfo> InfoList;
 
-    public ScrollRect ScrollRect
+    public NewScrollRect ScrollRect;
+
+    #endregion
+
+    public void RegistValue()
     {
-        get
+        InfoList = new List<FlowerInfo>();
+        ItemList = new List<Transform>();
+
+        SelectIndex = -1;
+
+        ScrollRect = ManaReso.Get<NewScrollRect>("H_Scrr");
+        ScrollRect.DragEvent += OnDrag;
+        ScrollRect.EndDragEvent += OnEndDrag;
+
+        MoveVec moveVec = ScrollRect.content.CreateMoveVec();
+
+        moveVec.OnStart += () =>
         {
-            if (_ScrollRect == null)
-            {
-                _ScrollRect = ManaReso.Get<ScrollRect>("H_Scrr");
-            }
+            SelectLock = true;
+        };
 
-            return _ScrollRect;
-        }
-        set { _ScrollRect = value; }
+        moveVec.OnFinish += () =>
+        {
+            SelectLock = false;
+        };
     }
 
-    private ScrollRect _ScrollRect;
-
-    #endregion
 
     public void Add(FlowerInfo flowerInfo)
     {
@@ -63,24 +79,33 @@ public class FlowerCard : MonoBehaviour
 
     public void Select(int index)
     {
+        
+        if (SelectLock)
+        {
+            return;
+        }
+        
         if (SelectIndex != index)
         {
             if (SeleItem != null)
             {
                 SeleItem.TweenBacScale();
             }
-
+            
             SelectIndex = index;
 
             SeleItem = ItemList[index];
             SeleItem.TweenForScale();
             SeleItem.transform.SetAsLastSibling();
-            
+
             ManaGarden.SetFlowerCard(InfoList[index].Id);
 
-            float pos = (SelectIndex - 1)/((float) ItemList.Count - 3);
+            Vector3 delta = ScrollRect.transform.position - SeleItem.transform.position;
+
+            delta.y = 0;
+            delta.z = 0;
 
-            ScrollRect.MoveScrr(pos, 0.25f, Curve.EaseOutQuad);
+            ScrollRect.content.MoveVec(ScrollRect.content.transform.position + delta, 0.25f, Curve.EaseOutQuad);
         }
     }
 
@@ -101,8 +126,19 @@ public class FlowerCard : MonoBehaviour
             SeleItem.TweenBacScale();
             SeleItem = null;
         }
+
         SelectIndex = -1;
 
+        if (ItemList.Count > 0)
+        {
+            Vector3 delta = ScrollRect.transform.position - ItemList[0].transform.position;
+
+            delta.y = 0;
+            delta.z = 0;
+
+            ScrollRect.content.MoveVec(ScrollRect.content.transform.position + delta, 0.25f, Curve.EaseOutQuad);
+        }
+
         for (int i = 0; i < ItemList.Count; i++)
         {
             ManaReso.SaveUI(ItemList[i]);
@@ -111,6 +147,7 @@ public class FlowerCard : MonoBehaviour
         InfoList = new List<FlowerInfo>();
         ItemList = new List<Transform>();
 
+        ManaReso.Get<ContentSizeFitter>("H_Grid").enabled = true;
         ManaReso.Get<HorizontalLayoutGroup>("H_Grid").enabled = true;
     }
 
@@ -128,5 +165,46 @@ public class FlowerCard : MonoBehaviour
         {
             Select(SelectIndex + 1);
         }
-    } 
+    }
+
+    public void OnDrag(PointerEventData eventData)
+    {
+        if (ItemList.Count >= 3)
+        {
+            ScrollRect.horizontal = true;
+
+            if (ScrollRect.content.position.x < LeftBorder)
+            {
+                ScrollRect.content.SetX(LeftBorder);
+            }
+            else if (ScrollRect.content.position.x > RightBorder)
+            {
+                ScrollRect.content.SetX(RightBorder);
+            }
+
+            //ScrollRect.horizontalNormalizedPosition = Mathf.Clamp(ScrollRect.horizontalNormalizedPosition, -1/(float) (ItemList.Count - 3), (ItemList.Count - 2)/(float) (ItemList.Count - 3));
+        }
+        else
+        {
+            ScrollRect.horizontal = false;
+        }
+    }
+
+    public void OnEndDrag(PointerEventData eventData)
+    {
+        float minX = 999999999;
+
+        for (int i = 0; i < ItemList.Count; i++)
+        {
+            float x = Mathf.Abs(ItemList[i].localPosition.x - ScrollRect.content.InverseTransformPoint(ScrollRect.transform.position).x);
+            
+            if (x < minX)
+            {
+                minX = x;
+                ScrollSelectIndex = i;
+            }
+        }
+
+        Select(ScrollSelectIndex);
+    }
 }

Assets/Script/Tool/UI/NewScrollRect.cs

@@ -0,0 +1,36 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Collections;
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+
+public class NewScrollRect : ScrollRect 
+{
+    #region 变量
+
+    public UnityAction<PointerEventData> DragEvent;
+    public UnityAction<PointerEventData> EndDragEvent;
+
+    #endregion
+
+    public override void OnDrag(PointerEventData eventData)
+    {
+        base.OnDrag(eventData);
+
+        if (DragEvent != null)
+        {
+            DragEvent.Invoke(eventData);
+        }
+    }
+
+    public override void OnEndDrag(PointerEventData eventData)
+    {
+        base.OnEndDrag(eventData);
+
+        if (EndDragEvent != null)
+        {
+            EndDragEvent.Invoke(eventData);
+        }
+    }
+}

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

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

MyLovelyGarden.Editor.csproj

@@ -156,6 +156,7 @@
     <Compile Include="Assets\Script\Editor\EditorPlayer.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Resources\Shader\Gray.shader" />
     <None Include="Assets\Resources\XML\Config\PlayerConfig.xml" />
     <None Include="Assets\Resources\XML\Config\ability_config.xml" />
     <None Include="Assets\Resources\XML\Config\flower_config.xml" />

MyLovelyGarden.csproj

@@ -97,21 +97,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Assets\Script\Manage\Initializer.cs" />
-    <Compile Include="Assets\Script\Manage\Logo.cs" />
     <Compile Include="Assets\Script\Manage\Main.cs" />
     <Compile Include="Assets\Script\Manage\ManaAnim.cs" />
+    <Compile Include="Assets\Script\Manage\ManaAudio.cs" />
     <Compile Include="Assets\Script\Manage\ManaData.cs" />
     <Compile Include="Assets\Script\Manage\ManaGarden.cs" />
     <Compile Include="Assets\Script\Manage\ManaLog.cs" />
-    <Compile Include="Assets\Script\Manage\ManaMessage.cs" />
     <Compile Include="Assets\Script\Manage\ManaMiniGame.cs" />
     <Compile Include="Assets\Script\Manage\ManaPlayer.cs" />
     <Compile Include="Assets\Script\Manage\ManaReso.cs" />
     <Compile Include="Assets\Script\Manage\ManaUI.cs" />
     <Compile Include="Assets\Script\Object\Flower.cs" />
     <Compile Include="Assets\Script\Object\Garden.cs" />
-    <Compile Include="Assets\Script\Object\Hud\HudTarget.cs" />
-    <Compile Include="Assets\Script\Object\Hud\HudText.cs" />
     <Compile Include="Assets\Script\Object\ObjRoot.cs" />
     <Compile Include="Assets\Script\Object\Player.cs" />
     <Compile Include="Assets\Script\Object\Skill\Ability.cs" />
@@ -120,23 +117,28 @@
     <Compile Include="Assets\Script\Object\Skill\Skill.cs" />
     <Compile Include="Assets\Script\Object\Skill\SkillRoot.cs" />
     <Compile Include="Assets\Script\Tool\Anim\Move.cs" />
-    <Compile Include="Assets\Script\Tool\Anim\MoveScrr.cs" />
     <Compile Include="Assets\Script\Tool\Anim\MoveVec.cs" />
     <Compile Include="Assets\Script\Tool\Anim\Tween.cs" />
+    <Compile Include="Assets\Script\Tool\Anim\TweenAudio.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenCG.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenGra.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenScale.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenVec.cs" />
     <Compile Include="Assets\Script\Tool\Auxiliary.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\DateUtil.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\DecryptionUtil.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\DelayCall.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\Language.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\Logo.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\RSACryptoService.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\URLRequest.cs" />
+    <Compile Include="Assets\Script\Tool\DashGame\URLRequestData.cs" />
     <Compile Include="Assets\Script\Tool\Data.cs" />
-    <Compile Include="Assets\Script\Tool\DateUtil.cs" />
-    <Compile Include="Assets\Script\Tool\DecryptionUtil.cs" />
-    <Compile Include="Assets\Script\Tool\DelayCall.cs" />
     <Compile Include="Assets\Script\Tool\Extension.cs" />
-    <Compile Include="Assets\Script\Tool\Language.cs" />
     <Compile Include="Assets\Script\Tool\UI\FlowerCard.cs" />
-    <Compile Include="Assets\Script\Tool\URLRequest.cs" />
-    <Compile Include="Assets\Script\Tool\URLRequestData.cs" />
+    <Compile Include="Assets\Script\Tool\UI\HudTarget.cs" />
+    <Compile Include="Assets\Script\Tool\UI\HudText.cs" />
+    <Compile Include="Assets\Script\Tool\UI\NewScrollRect.cs" />
     <Compile Include="Assets\Script\Utils\DGFileUtil.cs" />
     <Compile Include="Assets\Script\Utils\JsonUtil.cs" />
     <Compile Include="Assets\Script\Utils\MD5Util.cs" />
@@ -144,6 +146,7 @@
     <Compile Include="Assets\Script\Utils\StringUtil.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Resources\Shader\Gray.shader" />
     <None Include="Assets\Resources\XML\Config\PlayerConfig.xml" />
     <None Include="Assets\Resources\XML\Config\ability_config.xml" />
     <None Include="Assets\Resources\XML\Config\flower_config.xml" />

MyLovelyGarden.txt

@@ -1,16 +1,22 @@
-声音
+时间线中的CD CD效果没有 C_Main会弹出来
 
-删掉ManaMessage 给ManaLog增加一个渐影效果
+进行到ManaData
 
-增加一个调试面板(能够查看正在使用的技能 周期计时 Person与CoinPerson等)
+Xml加密
 
-throw new exception输入到调试面板中
+ListView实时放大
+
+给GameObject添加Extension
+
+给Rect添加动画
 
 图文混排
 
 
 Anchor
 
+使用加密
+
 RichText
 
 OverFlow
@@ -19,8 +25,6 @@ SpritePacker
 
 RaycastTarget
 
-使用加密和签名
-
 DisableButton的颜色
 
 Auxiliary中的测试按键