修复不能分享的Bug

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/Prefab/PrefabUI/Canvas.prefab

@@ -67291,7 +67291,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -28.2, y: -271.9}
+  m_AnchoredPosition: {x: -28.199951, y: -271.9}
   m_SizeDelta: {x: 45.9, y: 42.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224100712321006736

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="19" />
+  <Version value="20" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />
@@ -38,6 +38,7 @@
   <NewFlowerFlag value="0" />
   <MiniGameIndex value="0" />
   <NotificationIndex value="-1" />
+  <MinigameCoolFlag value="0" />
   <OneTimeReward value="" />
   
   <Player value="PlayerBlond" />

Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -56,17 +56,17 @@ MonoBehaviour:
     MD5DictionaryFileName: AndroidMD5Dictionary.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: b144e6804b7dd404e849b0bc74527138, type: 3}
+    - Object: {fileID: 102900000, guid: 46a699a86f13316489a948f63bfaf901, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 8cdda597a784fa44098f091fab3fb829, type: 3}
+    - Object: {fileID: 102900000, guid: 33466405b7ecc6b4c901205ff5be2667, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: d205a191403fc2a4c9e9cbfd84e6a204, type: 3}
+    - Object: {fileID: 102900000, guid: 1a49bf28873b63346a9d25a39c921fa7, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: ef850c01badae034f8aa1a2a88f76f03, type: 3}
+    - Object: {fileID: 102900000, guid: 93b2fda5a42fe4a4cb89c237fd0e01ec, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 6d9c13d607d91c746877e21c80481636, type: 3}
+    - Object: {fileID: 102900000, guid: 5b8c44112f2fe534c9dfaa0a6dfc0cf5, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: c19d6ad25e0cf5e44853e5dcf379dcbc, type: 3}
+    - Object: {fileID: 102900000, guid: 53f574c01e2650046b757b46d3da7100, type: 3}
       URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt

Assets/Script/Label/CanvasLabel.cs

@@ -46,6 +46,7 @@ public class CanvasLabel
     public static string C_MiniArrow0 = "C_MiniArrow0";
     public static string C_MiniArrow1 = "C_MiniArrow1";
     public static string C_MiniGameLab = "C_MiniGameLab";
+    public static string C_MinigameMask = "C_MinigameMask";
     public static string C_Group0 = "C_Group0";
     public static string C_Group = "C_Group";
     public static string C_Tip = "C_Tip";

Assets/Script/Label/PlayerConfigLabel.cs

@@ -8,6 +8,7 @@ public class PlayerConfigLabel
     public static string DefaultID = "Default";
     public static string DefaultSerialNumber = "Default";
 
+    public static string MinigameCoolFlag = "MinigameCoolFlag";
     public static string FindMissingMinigameTutorial = "FindMissingMinigameTutorial";
     public static string FindMissingMinigameTutorialIndex = "FindMissingMinigameTutorialIndex";
     public static string AttributeName = "value";

Assets/Script/Manage/CDMinigamePanelManager.cs

@@ -142,10 +142,12 @@ public class CDMinigamePanelManager : Regist
             DiamondCDMinigame();
         }
 
-        if (Manager.MinigameCDTimer <= 0)
-        {
-            ClosePanel();
-        }
+        ClosePanel();
+
+        //if (Manager.MinigameCDTimer <= 0)
+        //{
+        //    ClosePanel();
+        //}
     }
 
     private static void CoinCDMinigame()
@@ -155,7 +157,7 @@ public class CDMinigamePanelManager : Regist
             null,
             CoinCost,
             Current.Coin,
-            () => { Manager.MinigameCDTimer -= CoinCDAmount; AudioManager.PlayClip(ResourceLabel.CurrentClip); },
+            () => { Manager.MinigameCDTimer -= CoinCDAmount; AudioManager.PlayClip(ResourceLabel.CurrentClip); DisableCDButton(); },
             StaticsManager.ItemID.冷却小游戏,
             StaticsManager.ConsumeModule.Charge,
             false
@@ -169,10 +171,23 @@ public class CDMinigamePanelManager : Regist
             null,
             DiamondCost,
             Current.Diamond,
-            () => { Manager.MinigameCDTimer = 0; AudioManager.PlayClip(ResourceLabel.CurrentClip); },
+            () => { Manager.MinigameCDTimer = 0; AudioManager.PlayClip(ResourceLabel.CurrentClip); DisableCDButton(); },
             StaticsManager.ItemID.冷却小游戏,
             StaticsManager.ConsumeModule.Charge,
             false
         );
     }
+
+
+    public static void EnableCDButton()
+    {
+        ConfigManager.SaveBoolToConfig(PlayerConfigLabel.MinigameCoolFlag, false);
+        ResourceManager.Get<Button>(CanvasLabel.C_MiniGame).enabled = true;
+    }
+
+    public static void DisableCDButton()
+    {
+        ConfigManager.SaveBoolToConfig(PlayerConfigLabel.MinigameCoolFlag, true);
+        ResourceManager.Get<Button>(CanvasLabel.C_MiniGame).enabled = false;
+    }
 }

Assets/Script/Manage/ConfigManager.cs

@@ -1410,6 +1410,13 @@ public class ConfigManager : Regist
             ToVersion19(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 20)
+        {
+            Debug.LogWarning("UpdateArchive to 20");
+
+            ToVersion20(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1721,4 +1728,14 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion20(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 20.ToString();
+
+        XmlNode xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.MinigameCoolFlag);
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/DebugManager.cs

@@ -74,6 +74,16 @@ public class DebugManager : MonoBehaviour
         skillRoot.ItemStatus = SkillStatus.Lock;
     }
 
+    public static void ResetElf()
+    {
+        for (int i = 5; i <= 24; i++)
+        {
+            SkillRoot skillRoot = Manager.SkillDictionary["Ability" + i];
+            skillRoot.Level = 0;
+            skillRoot.ItemStatus = SkillStatus.Lock;
+        }   
+    }
+
     public static void ResetGardenLevel(int level)
     {
         SkillRoot skillRoot = Manager.SkillDictionary["Ability1"];

Assets/Script/Manage/IAPManager.cs

@@ -348,6 +348,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
             {
                 shareContent.SetText(content);
             }
+
             shareContent.SetTitle(Language.GetStr(LanguageLabel.Common__ShareTit));
             shareContent.SetTitleUrl(Language.GetShareUrl());
             shareContent.SetSite(Language.GetShareUrl());

Assets/Script/Manage/Manager.cs

@@ -767,6 +767,8 @@ public class Manager : Regist
 
                 ResourceManager.Get(CanvasLabel.C_MiniGame).TweenBacRect();
 
+                CDMinigamePanelManager.EnableCDButton();
+
                 ResourceManager.SetText(CanvasLabel.C_MiniGameLab, "");
 
                 StaticsManager.GetInstance().RewardItem(StaticsManager.ItemID.获得小游戏, StaticsManager.ItemType.小游戏, "1", StaticsManager.ConsumeModule.None);
@@ -970,13 +972,16 @@ public class Manager : Regist
         if (MinigameCDTimer > 0)
         {
             ResourceManager.Get(CanvasLabel.C_MiniGame).TweenForRect();
+            if (ConfigManager.GetBoolFormConfig(PlayerConfigLabel.MinigameCoolFlag))
+            {
+                CDMinigamePanelManager.DisableCDButton();
+            }
         }
         else
         {
             MinigameFlag = true;
         }
 
-
         HttpManager.ID = ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID);
         HttpManager.SerialNumber = ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber);
 

Assets/Script/Manage/MiniGameManager.cs

@@ -1406,6 +1406,8 @@ public class MiniGameManager : Regist
 
             DropAwardList.RemoveAt(i--);
         }
+
+        CDMinigamePanelManager.EnableCDButton();
     }
 
     public static void GameOver()

Assets/Script/Manage/UIManager.cs

@@ -3577,6 +3577,9 @@ public class UIManager : Regist
 
         #endregion
 
+        ResourceManager.Get<Text>(CanvasLabel.K_Tit).resizeTextForBestFit = true;
+        ResourceManager.Get<Text>(CanvasLabel.K_Tit).resizeTextMaxSize = 21;
+
         if (!TutorialManager.NewplayerTutorial)
         {
             SetEnterMinigameGameLabel();

Assets/Script/Object/Player.cs

@@ -741,6 +741,8 @@ public class Player : Regist , IPointerClickHandler
     }
     public PlayerDirection playerDirection = PlayerDirection.Left;
 
+    public Vector3 PosInGarden;
+
     public bool IsDisplayInUGUI;
     public float UGUIScale;
 
@@ -1267,7 +1269,8 @@ public class Player : Regist , IPointerClickHandler
                 {
                     transform.SetParent(ResourceManager.Get(GardenLabel.GardenPivot));
 
-                    transform.position = ResourceManager.Get(GardenLabel.GardenPlayerPos).position;
+                    transform.position = PosInGarden;
+                    //transform.position = ResourceManager.Get(GardenLabel.GardenPlayerPos).position;
                     transform.localScale = ResourceManager.Get(GardenLabel.GardenPlayerPos).lossyScale;
 
                     ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
@@ -1337,6 +1340,7 @@ public class Player : Regist , IPointerClickHandler
 
                     transform.SetParent(ResourceManager.Get(DressroomLabel.DressRoom));
 
+                    PosInGarden = transform.position;
                     transform.position = ResourceManager.Get(DressroomLabel.DressRoomPos).position;
                     transform.localScale = ResourceManager.Get(DressroomLabel.DressRoomPos).lossyScale;
 

Assets/Script/Tool/Auxiliary.cs

@@ -221,11 +221,13 @@ public class Auxiliary : Regist
         //    Manager.Diamond = 0;
         //}
 
-        //if (Input.GetKeyDown(KeyCode.D))
-        //{
-        //    Manager.Coin = 100000;
-        //    Manager.Diamond = 1000;
-        //}
+        if (Input.GetKeyDown(KeyCode.D))
+        {
+            PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+            //DebugManager.ResetElf();
+            //Manager.Coin = 100000;
+            //Manager.Diamond = 1000;
+        }
 
         //if (Input.GetKeyDown(KeyCode.Z))
         //{

Assets/Script/Tool/DashGame/Language.cs

@@ -305,46 +305,24 @@ public class Language
 
     public static string GetShareUrl()
     {
-        XmlDocument tempXML = new XmlDocument();
-
-        tempXML.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
-
-
-        string page;
-
+        string pageAndId;
         if (Application.isEditor)
         {
-            page = "Android";
+            pageAndId = LanguageLabel.Android__ShareUrl;
         }
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            page = "IOS";
+            pageAndId = LanguageLabel.IOS__ShareUrl;
         }
         else if (Application.isMobilePlatform)
         {
-            page = "Android";
+            pageAndId = LanguageLabel.Android__ShareUrl;
         }
         else
         {
             throw new Exception();
         }
-
-
-        try
-        {
-            XmlNode pageNode = tempXML.SelectSingleNode("lan/" + page);
-            XmlNode node = pageNode.SelectSingleNode("ShareUrl");
-            if (node != null)
-                return node.InnerText.Replace("\\n", "\n");
-        }
-        catch (Exception e)
-        {
-            Debug.LogException(e);
-        }
-
-        string error = "Topic missing page[" + page + "] id[" + "ShareUrl" + "]";
-        Debug.LogError(error);
-        return error;
+        return GetStr(pageAndId);
     }
 
 	private static Font defaultFont;

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.10
+  bundleVersion: 1.2.11
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 22
+  AndroidBundleVersionCode: 23
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 

第五期.txt

@@ -8,6 +8,8 @@
 
 //更新Bundle
 
+//更新服务器MD5
+
 //更新版本号
 
 IOS设置Team