修复切换小游戏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/Logo.unity

@@ -613,10 +613,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 1
-  DebugMode: 1
+  DebugMode: 0
   CatchException: 1
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -908,7 +908,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1

Assets/Script/Manage/EnterMinigamePanelManager.cs

@@ -204,9 +204,9 @@ public class EnterMinigamePanelManager : Regist
         tween.InOrigin = true;
         tween.AddEventOnetime(EventType.ForwardFinish, () => OnArriveScrollPos1(tween));
 
-        ScrollMiniGameType = AvailableGameTypes.Random()[0];
-        string languageLabel = LanguageLabel.CombineLanguageLabel(LanguageLabel.MinigameName, ScrollMiniGameType.ToString());
-        tween.Target.GetComponent<Text>().text = Language.GetStr(languageLabel);
+        //ScrollMiniGameType = AvailableGameTypes.Random()[0];
+        //string languageLabel = LanguageLabel.CombineLanguageLabel(LanguageLabel.MinigameName, ScrollMiniGameType.ToString());
+        //tween.Target.GetComponent<Text>().text = Language.GetStr(languageLabel);
 
         if (ScrollTimer + CurrentScrollDuration >= ScrollTime)
         {
@@ -214,6 +214,9 @@ public class EnterMinigamePanelManager : Regist
         }
         else
         {
+            ScrollMiniGameType = AvailableGameTypes.Random()[0];
+            string languageLabel = LanguageLabel.CombineLanguageLabel(LanguageLabel.MinigameName, ScrollMiniGameType.ToString());
+            tween.Target.GetComponent<Text>().text = Language.GetStr(languageLabel);
             tween.StartForward();
         }
     }
@@ -223,6 +226,7 @@ public class EnterMinigamePanelManager : Regist
         ChangeButton.interactable = true;
         ConfirmButton.interactable = true;
         IsChangingGameType = false;
+        Debug.Log(ScrollMiniGameType);
         CurrentMiniGameType = ScrollMiniGameType;
         ConfigManager.SaveIntToConfig(PlayerConfigLabel.CurrentMinigameType, ScrollMiniGameType.GetHashCode());
     }

Assets/Script/Tool/Auxiliary.cs

@@ -142,33 +142,33 @@ public class Auxiliary : Regist
         //}
 
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-            //Debug.Log(screenPosition);
-            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-            //DebugManager.ResetGardenLevel(22);
-            //DebugManager.ResetVisitTutorial();
-            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+        //    Debug.Log(screenPosition);
+        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+        //    DebugManager.ResetGardenLevel(22);
+        //    DebugManager.ResetVisitTutorial();
+        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        //}
 
-        if (Input.GetKeyDown(KeyCode.A))
-        {
-            StringFilter.ContainSensitiveWord("真");
-            //Manager.GardenLevel = 50;
-            //Manager.Diamond = 1000;
-            //PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
-            //FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
-        }
+        //if (Input.GetKeyDown(KeyCode.A))
+        //{
+        //    StringFilter.ContainSensitiveWord("真");
+        //    Manager.GardenLevel = 50;
+        //    Manager.Diamond = 1000;
+        //    PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
+        //    FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
+        //}
 
-        if (Input.GetKeyDown(KeyCode.S))
-        {
-            PlayerManager.Player.DisplayInScene();
-            //Manager.Coin = 0;
-            //Manager.Diamond = 0;
-        }
+        //if (Input.GetKeyDown(KeyCode.S))
+        //{
+        //    PlayerManager.Player.DisplayInScene();
+        //    Manager.Coin = 0;
+        //    Manager.Diamond = 0;
+        //}
 
         //if (Input.GetKeyDown(KeyCode.D))
         //{
@@ -176,15 +176,15 @@ public class Auxiliary : Regist
         //    Manager.Diamond = 1000;
         //}
 
-        if (Input.GetKeyDown(KeyCode.Z))
-        {
-            Manager.MinigameCDTimer = 0;
-        }
+        //if (Input.GetKeyDown(KeyCode.Z))
+        //{
+        //    Manager.MinigameCDTimer = 0;
+        //}
 
-        if (Input.GetKeyDown(KeyCode.X))
-        {
-            MiniGameManager.GameTimer = 45;
-        }
+        //if (Input.GetKeyDown(KeyCode.X))
+        //{
+        //    MiniGameManager.GameTimer = 45;
+        //}
 
         //if (Input.GetKeyDown(KeyCode.C))
         //{

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.2
+  bundleVersion: 1.2.3
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 14
+  AndroidBundleVersionCode: 15
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 8
+  iPhoneBuildNumber: 9
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

第五期.txt

@@ -1,8 +1,3 @@
-私信Bug
-
-手机恢复出厂设置后没有拉取到存档
-
-
 //关闭DebugMode 开启CatchException
 
 //切换到远程服务器 正常Zone