浏览代码

Fix few bugs

LiuQilin 8 年之前
父节点
当前提交
cbbc0bab86

二进制
.vs/MyLovelyGarden/v14/.suo


+ 4 - 4
Assets/Resource/XML/PlayerConfig.xml

@@ -1,10 +1,10 @@
 <PlayerConfig>
-  <Version value="241" />
+  <Version value="250" />
 
   <ID value="Default" />
-////  <TutorialA value="0" />
+////  <TutorialA value="1" />
   <TutorialB value="1" />
-////  <TutorialC value="0" />
+////  <TutorialC value="1" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
@@ -34,7 +34,7 @@
     <Skill ID="Skill4" SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
     <Skill ID="Skill5" SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
     <Skill ID="Skill6" SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
-    <Skill ID="Skill1" SkillType="BigSkill" ItemStatus="Upgrade" BarStatus="Buy" Level="1" CdTimer="0" EffectTimer="0" />
+    <Skill ID="Skill1" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="1" CdTimer="0" EffectTimer="0" />
     <Skill ID="Skill2" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CdTimer="0" EffectTimer="0" />
     <Skill ID="Skill3" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CdTimer="0" EffectTimer="0" />
     <Skill ID="Skill7" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CdTimer="0" EffectTimer="0" />

+ 19 - 2
Assets/Script/Manage/ManaData.cs

@@ -215,14 +215,29 @@ public class ManaData : Regist
         set
         {
             SkillPerson_ = value;
-
+           
             if (SkillPerson_.Equal(0))
             {
+                ManaReso.Get("F_PersonLab").GetTweenOutline().Pause();
+
                 ManaReso.Get<Outline>("F_PersonLab").enabled = false;
             }
             else
             {
-                ManaReso.Get("F_PersonLab").TweenReForOutline();
+                Tween tween = ManaReso.Get("F_PersonLab").GetTweenOutline();
+
+                if (tween.InForward)
+                {
+                    tween.StartForward();
+                }
+                else if (tween.InBackward)
+                {
+                    tween.StartBackward();
+                }
+                else
+                {
+                    tween.StartForward();
+                }
             }
 
             ManaReso.SetText("F_PersonLab", Mathf.FloorToInt(60*(Person_ + SkillPerson_)).ToString());
@@ -1074,6 +1089,8 @@ public class ManaData : Regist
                     return;
                 }
 
+                Auxiliary.DecryptXml(Data.PlayerDoc);
+
                 ReactiveRequest = true;
 
                 ManaServer.Login(LoginCallbackReactive);

+ 4 - 0
Assets/Script/Tool/Anim/TweenOutline.cs

@@ -92,6 +92,8 @@ public class TweenOutline : Tween
     {
         base.StartForward();
 
+        Target.enabled = true;
+
         if (InBackward)
         {
             Timer = ManaAnim.GetTimerColor(Target.effectColor, Duration, Origin, Delta, Curve);
@@ -102,6 +104,8 @@ public class TweenOutline : Tween
     {
         base.StartBackward();
 
+        Target.enabled = true;
+
         if (InForward)
         {
             Timer = ManaAnim.GetTimerColor(Target.effectColor, Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a), Curve);

+ 1 - 1
Assets/Script/Tool/Bundle.cs

@@ -213,7 +213,7 @@ public class Bundle : MonoBehaviour
     {
         yield return LoadConfig();
 
-        ManaReso.AddAsyncLoad("skill_config", Folder.Config, () => { Data.PlayerDoc = Data.PlayerDoc; });
+        ManaReso.AddAsyncLoad("PlayerConfig", Folder.Config, () => { Data.PlayerDoc = Data.PlayerDoc; });
 
         yield return LoadUI();
 

+ 5 - 6
Assets/Script/Tool/Data.cs

@@ -34,7 +34,7 @@ public class Data
             {
                 int version = 0;
                 int nativeVersion = 0;
-                XmlNode temoNode;
+                XmlNode tempNode;
                 XmlDocument tempDoc1;
                 XmlDocument tempDoc2;
 
@@ -72,7 +72,6 @@ public class Data
 
                     Auxiliary.DecryptXml(tempDoc1);
 
-
                     sr.Close();
                     
                     TextAsset textAsset = ManaReso.Load<TextAsset>("PlayerConfig", Folder.Config);
@@ -82,9 +81,9 @@ public class Data
                     
                     version = int.Parse(tempDoc2.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
 
-                    temoNode = tempDoc1.SelectSingleNode("PlayerConfig").SelectSingleNode("Version");
+                    tempNode = tempDoc1.SelectSingleNode("PlayerConfig").SelectSingleNode("Version");
 
-                    if (temoNode == null)
+                    if (tempNode == null)
                     {
                         StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
 
@@ -96,7 +95,7 @@ public class Data
                     }
                     else
                     {
-                        nativeVersion = int.Parse(temoNode.Attributes[0].Value);
+                        nativeVersion = int.Parse(tempNode.Attributes[0].Value);
 
                         if (nativeVersion != version)
                         {
@@ -144,7 +143,7 @@ public class Data
         if (Initializer.LoadComplete)
         {
             Auxiliary.EncryptXml(PlayerDoc);
-
+            
             StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
             
             sw.Write(PlayerDoc.OuterXml);