LiuQilin 8 years ago
parent
commit
b4fc235c31

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resources/Garden.unity


BIN
Assets/Resources/Prefab/PrefabUI/Canvas.prefab


+ 20 - 20
Assets/Resources/XML/Config/PlayerConfig.xml

@@ -1,45 +1,45 @@
 <PlayerConfig>
-  <Coin value="57" />
-  <Level value="10" />
+  <Coin value="0" />
+  <Level value="0" />
   <Person value="1" />
   <Diamond value="0" />
-  <QuitTime value="3/20/2017 7:55:45 AM" />
+  <QuitTime value="3/20/2017 8:05:29 AM" />
   <CoinPerson value="1" />
-  <CircleTimer value="6.959956" />
+  <CircleTimer value="0" />
   <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 " />
+  <FlowerList ID="1 2 3 4 5 6 7 8 9" />
   <SkillList>
-    <免费获取金币 SkillType="Skill" ItemStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
-    <免费获取钻石 SkillType="Skill" ItemStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
+    <免费获取金币 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
+    <免费获取钻石 SkillType="Skill" ItemStatus="Lock" 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="Ability" ItemStatus="Lock" 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="1709.9999986589" EffectTimer="1.58000018820167" />
+    <人潮涌动 SkillType="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
     <紫色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillType="Pack" Name="金币大礼包" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="金币大礼包" ItemStatus="Lock" 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="Pack" Name="天赐大礼包" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="中级礼包" ItemStatus="Lock" Level="0" />
     <蓝色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillType="Pack" Name="高级礼包" ItemStatus="Buy" Level="0" />
-    <礼包 SkillType="Pack" Name="花神大礼包" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="高级礼包" ItemStatus="Lock" Level="0" />
+    <礼包 SkillType="Pack" Name="花神大礼包" ItemStatus="Lock" 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="Pack" Name="钻石100" ItemStatus="Lock" Level="0" />
     <黄色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillType="Pack" Name="钻石500 赠送50" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石500 赠送50" ItemStatus="Lock" 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="Pack" Name="钻石2000 赠送500" ItemStatus="Lock" Level="0" />
+    <滴哩哩的小黄鹂 SkillType="Ability" ItemStatus="Lock" Level="0" />
     <蓝色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillType="Pack" Name="钻石6000 赠送600" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石6000 赠送600" ItemStatus="Lock" Level="0" />
     <红色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
-    <礼包 SkillType="Pack" Name="钻石10000 赠送2000" ItemStatus="Buy" Level="0" />
+    <礼包 SkillType="Pack" Name="钻石10000 赠送2000" ItemStatus="Lock" Level="0" />
     <白色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
   </SkillList>
 </PlayerConfig>

+ 11 - 1
Assets/Script/Manage/ManaData.cs

@@ -80,6 +80,7 @@ public class ManaData : MonoBehaviour
     public static float SkillPersonBuff;
     public static float SkillCoinPerson;
 
+    public static int Main;
     public static bool SkillBar;
     public static bool Connect;
     public static float OpTime;
@@ -171,7 +172,7 @@ public class ManaData : MonoBehaviour
         {
             OpTimer = 0;
 
-            if (ManaReso.Get("GardenMini").gameObject.activeSelf || ManaReso.Get("F_Manage").gameObject.activeSelf)
+            if (Main > 0)
             {
                 return;
             }
@@ -249,6 +250,15 @@ public class ManaData : MonoBehaviour
 
     private void RegistValue()
     {
+        if (ManaReso.Get("A_Notice").gameObject.activeSelf)
+        {
+            Main = 1;
+        }
+        else
+        {
+            Main = 0;
+        }
+
         OpTime = 5;
         CircleTime = 10;
         CircleTimer = 10;

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

@@ -87,7 +87,7 @@ public class ManaUI : MonoBehaviour
             "B_Confirm",
             () =>
             {
-                ManaReso.Get("C_Main").TweenForCG();
+                ManaData.Main--;
 
                 ManaReso.Get("B_SignIn").TweenBacCG();
             }
@@ -106,6 +106,8 @@ public class ManaUI : MonoBehaviour
             "C_Manage",
             () =>
             {
+                ManaData.Main++;
+
                 ManaReso.Get("C_Main").TweenBacCG();
                 ManaReso.SetActive("F_Manage", true);
 
@@ -129,6 +131,8 @@ public class ManaUI : MonoBehaviour
         (
             () =>
             {
+                ManaData.Main++;
+
                 ManaReso.Get("C_Main").TweenBacCG();
 
                 ManaReso.Get("D_MiniGame").TweenForVec();
@@ -248,6 +252,8 @@ public class ManaUI : MonoBehaviour
             "Da_Quit",
             () =>
             {
+                ManaData.Main--;
+
                 ManaReso.Get("C_Main").TweenForCG();
 
                 ManaReso.Get("D_MiniGame").TweenBacVec();
@@ -313,6 +319,8 @@ public class ManaUI : MonoBehaviour
             "F_Close",
             () =>
             {
+                ManaData.Main--;
+
                 ManaReso.Get("C_Main").TweenForCG();
                 ManaReso.SetActive("F_Manage", false);
 

+ 144 - 0
Assets/Script/Tool/Anim/TweenScrr.cs

@@ -0,0 +1,144 @@
+using UnityEngine;
+
+using System.Collections;
+
+public class TweenScrr : Tween 
+{
+    #region
+
+    protected Vector2 Delta;
+    protected Vector2 Origin;
+    protected Vector2 Destination;
+    protected CanvasGroup CG;
+    protected RectTransform Target;
+    protected CurveFunctionV Func;
+
+    #endregion
+
+    public TweenScrr(RectTransform 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;
+
+        Delta = destination - origin;
+        Origin = origin;
+        Destination = destination;
+
+        CG = Target.GetComponent<CanvasGroup>();
+
+        OnForwardStart += () =>
+        {
+            Target.SetActive(true);
+
+            if (CG != null)
+            {
+                CG.interactable = false;
+            }
+        };
+
+        OnForwardFinish += () =>
+        {
+            Target.SetActive(DestActive);
+
+            if (CG != null)
+            {
+                CG.interactable = DestActive;
+            }
+        };
+
+        OnBackwardStart += () =>
+        {
+            Target.SetActive(true);
+
+            if (CG != null)
+            {
+                CG.interactable = false;
+            }
+        };
+
+        OnBackwardFinish += () =>
+        {
+            Target.SetActive(OriginActive);
+
+            if (CG != null)
+            {
+                CG.interactable = OriginActive;
+            }
+        };
+
+        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;
+            IsForward = false;
+            OnForwardFinish.Invoke();
+
+            ManaAnim.TweenForList.Remove(this);
+
+            return true;
+        }
+        else
+        {
+            Target.position = Func(Timer, Duration, Origin, Delta);
+
+
+            return false;
+        }
+    }
+
+    public override bool DoBackward()
+    {
+        Timer += Time.fixedDeltaTime;
+        if (Timer > Duration)
+        {
+            Target.position = Origin;
+
+            Timer = 0;
+            IsBackward = false;
+            OnBackwardFinish.Invoke();
+
+            ManaAnim.TweenBacList.Remove(this);
+            return true;
+        }
+        else
+        {
+            Target.position = Func(Timer, Duration, Destination, -Delta);
+
+
+            return false;
+        }
+    }
+}

+ 12 - 0
Assets/Script/Tool/Anim/TweenScrr.cs.meta

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

+ 1 - 0
MyLovelyGarden.csproj

@@ -123,6 +123,7 @@
     <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\TweenScrr.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenVec.cs" />
     <Compile Include="Assets\Script\Tool\Auxiliary.cs" />
     <Compile Include="Assets\Script\Tool\DashGame\DateUtil.cs" />

+ 6 - 2
MyLovelyGarden.txt

@@ -1,3 +1,9 @@
+TweenScrr改为TweenRect
+
+给Rect添加动画
+
+CanvasGroup改为CG
+
 进行到ManaData
 
 Xml加密
@@ -6,8 +12,6 @@ ListView实时
 
 给GameObject添加Extension
 
-给Rect添加动画
-
 图文混排