Browse Source

解决后台恢复游戏Bug(导致金币负增长 技能重复冷却)

LiuQilin 8 years ago
parent
commit
971a86a663

+ 0 - 8
Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Advertisements/Editor/Resources/iOS/builds.meta

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

+ 0 - 8
Assets/Advertisements/Editor/Resources/iOS/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: deca0ba656ca01b40a6bc5a68c0561b1
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 2
Assets/Advertisements/Editor/Resources/Android/builds.meta → Assets/Extension.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 8d2d384f78b29a44a9c70c3daf45d1cb
+guid: b948198483a8b93419206e81215060f3
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1496150477
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/Resource/Logo.unity


BIN
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


+ 4 - 4
Assets/Script/Manage/ManaCenter.cs

@@ -643,8 +643,8 @@ public class ManaCenter : Regist
 
         List<string> offlineList = ManaData.GetOfflineConfig();
 
-        MaxCoin = Auxiliary.LongParse(offlineList[2], 999999999999999999);
-        MaxTime = Auxiliary.LongParse(offlineList[1], 999999999999999999);
+        MaxCoin = Auxiliary.LongParse(offlineList[1], 999999999999999999);
+        MaxTime = Auxiliary.LongParse(offlineList[2], 999999999999999999);
         OfflineFml = offlineList[0];
 
 
@@ -674,7 +674,7 @@ public class ManaCenter : Regist
             MiniTimer -= Elapse;
 
             ManaDebug.Log(string.Format("离线时间<color=red>{0}</color>", Elapse));
-            
+
             if (Elapse <= 120)
             {
                 Elapse = 0;
@@ -762,7 +762,7 @@ public class ManaCenter : Regist
 
         Coin += coin;
 
-        ManaReso.SetText("Ba_IconLab", coin.ToString("0"));
+        ManaReso.SetText("Ba_IconLab", Auxiliary.ShrinkNumberStr(coin));
     }
 
     public static void SwitchLanguage()

+ 4 - 2
Assets/Script/Object/Skill/BigSkill.cs

@@ -183,7 +183,7 @@ public class BigSkill : Skill
         Level = int.Parse(attribute[4].Value);
         UseTimer = float.Parse(attribute[6].Value);
         CoolTimer = float.Parse(attribute[5].Value);
-
+        
         BarBk1.material = Shortcut.GrayMat;
 
         BarStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[3].Value);
@@ -200,7 +200,6 @@ public class BigSkill : Skill
         NewUpgradeAmt = UpgradeAmt;
         NewCoinOnceBuff = CoinOnceBuff;
 
-
         BarBk1.sprite = Icon;
 
         BarBtn.onClick.RemoveAllListeners();
@@ -239,6 +238,8 @@ public class BigSkill : Skill
 
             if (UseTimer < elapse)
             {
+                ManaCenter.UseList.Remove(this);
+
                 if (useList.Count > 0)
                 {
                     if (UseTimer < ManaCenter.CircleTimer)
@@ -405,6 +406,7 @@ public class BigSkill : Skill
                 if (BarStatus == SkillStatus.Use)
                 {
                     AnnulB();
+                    ManaCenter.UseList.Remove(this);
                 }
 
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString("0.00"));

+ 3 - 1
Assets/Script/Object/Skill/Skill.cs

@@ -459,7 +459,7 @@ public class Skill : SkillRoot
         Level = int.Parse(attribute[3].Value);
         UseTimer = float.Parse(attribute[5].Value);
         CoolTimer = float.Parse(attribute[4].Value);
-
+        
         ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
 
         NewPlus = Plus;
@@ -479,6 +479,8 @@ public class Skill : SkillRoot
 
             if (UseTimer < elapse)
             {
+                ManaCenter.UseList.Remove(this);
+
                 if (useList.Count > 0)
                 {
                     if (UseTimer < ManaCenter.CircleTimer)

BIN
ProjectSettings/GraphicsSettings.asset


+ 1 - 1
ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.2f1
+m_EditorVersion: 5.5.0f3

+ 7 - 3
ToList.txt

@@ -6,9 +6,13 @@
 
 //注意存档覆盖情况
 
+//打包时重新导入配置
 
-移除Reload代码
 
-技能的注册机制
 
-监督补上循环特效
+开放小游戏B
+
+
+监督补上循环特效
+
+更新后给玩家0qfzPS补偿