Browse Source

修复-大技能等级无法保存

LiuQilin 8 years ago
parent
commit
974689addb

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

@@ -137,7 +137,7 @@ public class ManaData : Regist
 
     public void Update()
     {
-        if (!DownloadLock)
+        if (DamageLock)
         {
             Timer += Time.fixedDeltaTime;
 
@@ -153,7 +153,10 @@ public class ManaData : Regist
 
                 return;
             }
-            
+        }
+
+        if (!DownloadLock)
+        {   
             if (ManaServer.ID != "Default")
             {
                 DownloadLock = true;
@@ -204,6 +207,11 @@ public class ManaData : Regist
 
     public static void RecoveXml(JsonData jsonData)
     {
+        if (!DamageLock)
+        {
+            return;
+        }
+
         DamageLock = false;
 
         if (jsonData.Inst_Object.Keys.Contains("l"))

+ 7 - 7
Assets/Script/Object/Skill/BigSkill.cs

@@ -207,17 +207,12 @@ public class BigSkill : Skill
 
         if (SkillTab != SkillTab.Null)
         {
-            ItemLab.text = GetDescription(0);
-
-            ItemBtn.onClick.RemoveAllListeners();
-            ItemBtn.onClick.AddListener(OnClick);
-
             for (int i = 0; i < Level - 1; i++)
             {
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
             }
-
-            if (BarStatus_ == SkillStatus.Upgrade)
+            
+            if (BarStatus_ != SkillStatus.Lock && BarStatus_ != SkillStatus.UnLock)
             {
                 UpgradeValue(ref NewPlus, UpgradePlus, Level - 1);
                 UpgradeValue(ref NewPersonBuff, UpgradePerson, Level - 1);
@@ -230,6 +225,11 @@ public class BigSkill : Skill
                 UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, Level - 1);
                 UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, Level - 1);
             }
+
+            ItemBtn.onClick.RemoveAllListeners();
+            ItemBtn.onClick.AddListener(OnClick);
+
+            ItemLab.text = GetDescription(0);
         }
 
         if (BarStatus_ == SkillStatus.Use)

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

@@ -125,7 +125,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            //ManaServer.Download("hsoiv1", (data => Debug.Log(data.ToJson())));
+            //ManaTutorial.PayExemptAmt = 99;
         }
 
         if (Input.GetKeyDown(KeyCode.X))

BIN
ProjectSettings/GraphicsSettings.asset


BIN
ProjectSettings/ProjectSettings.asset


+ 3 - 5
ToList.txt

@@ -2,19 +2,17 @@
 
 //关闭调试界面
 
-关闭调试按键
+//关闭调试按键
 
 //注意存档覆盖情况
 
 //打包时重新导入配置
 
-先开启Service再打包
+//先开启Service再打包
 
-更新版本号
+//更新版本号
  
 
-修复签到的Bug一个
-
 卸载安装时的存档(有网没网 服务器端有存档 服务器端没有存档)