更新BubblePanel

Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,25 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-    iOS:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/Logo.unity

@@ -612,10 +612,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AuditEdition: 1
-  DebugMode: 0
-  CatchException: 1
-  DebugModeGo: {fileID: 0}
+  AuditEdition: 0
+  DebugMode: 1
+  CatchException: 0
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Sprite/Editor/HotUpdate/NewFlower.meta → Assets/Resource/Xlsx/cost_config.xlsx.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 46b274c8414a222419da71c9a4da16df
-folderAsset: yes
-timeCreated: 1516869190
+guid: fdccfa913cb9a504ab993695ce9874a0
+timeCreated: 1523153211
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Script/Manage/VisitManager.cs

@@ -346,7 +346,8 @@ public class VisitManager : Regist
 
         #region Player
 
-        ResourceManager.Save(PlayerManager.Player);
+        DestroyImmediate(PlayerManager.Player.gameObject);
+        //ResourceManager.Save(PlayerManager.Player);
 
         ResourceManager.TransformDictionary.Remove(PlayerLabel.Player);
 
@@ -692,7 +693,8 @@ public class VisitManager : Regist
 
         #region Player
 
-        ResourceManager.Save(PlayerManager.Player);
+        DestroyImmediate(PlayerManager.Player.gameObject);
+        //ResourceManager.Save(PlayerManager.Player);
 
         ResourceManager.TransformDictionary.Remove(PlayerLabel.Player);
 

Assets/Script/Social/FashionShowEditPage.cs

@@ -610,12 +610,12 @@ public class FashionShowEditPage : Regist
         UpdateTotalCost(true);
         if (TotalCoin.Value > Manager.Coin)
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.Common__ShortCoin));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ShortCoin));
             return;
         }
         if (TotalDiamond.Value > Manager.Diamond)
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.Common__ShortDiamond));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ShortDiamond));
             return;
         }
         ShowBuyTip();
@@ -623,7 +623,7 @@ public class FashionShowEditPage : Regist
 
     private static void ShowBuyTip()
     {
-        Bubble.Show(Language.GetStr(LanguageLabel.UI__Pi_BuyAllTip), null, null, null,
+        Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Pi_BuyAllTip), null, null,
             () =>
             {
                 Manager.Pay("", TotalCoin.Value, Current.Coin, OnBuyAllSucceedCallback, StaticsManager.ItemID.解锁服装, StaticsManager.ConsumeModule.Charge, false, false, null, TotalCoin.Key);

Assets/Script/Tool/Auxiliary.cs

@@ -156,8 +156,9 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
+            Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
             //GardenManager.CreateElfTimer = 0;
-            DebugManager.ResetGardenLevel(50);
+            //DebugManager.ResetGardenLevel(50);
             //foreach (var skill in Manager.UsingSkillList)
             //{
             //    skill.UseTimer = 0;

Assets/Script/Tool/UI/HudTarget.cs

@@ -17,6 +17,10 @@ public class HudTarget : MonoBehaviour
 
     public void SetPosition()
     {
+        if (PosTra == null)
+        {
+            return;
+        }
         transform.position = Camera.main.WorldToScreenPoint(PosTra.position);
     }
 }

第五期.txt

@@ -6,12 +6,6 @@
 
 
 
-5兆金币成就
-
-点击换小游戏卡住
-
-
-
 //关闭DebugMode 开启CatchException
 
 //切换到远程服务器 正常Zone