增加选择小游戏功能

Assets/Script/Manage/EnterMinigamePanelManager.cs

@@ -30,6 +30,32 @@ public class EnterMinigamePanelManager : Regist
     }
 
 
+    public static void TryOpenPanel()
+    {
+        MiniGameType miniGameType;
+        if (TutorialManager.NewplayerTutorial)
+        {
+            MinigameAward.UnlockFlowerID = 1;
+            MinigameAward.HaveNewFlowerFlag = true;
+            miniGameType = MiniGameType.Punch;
+            MiniGameManager.GameEnter(miniGameType);
+        }
+        else if (TutorialManager.MemoryMinigameTutorial)
+        {
+            miniGameType = MiniGameType.Memory;
+            MiniGameManager.GameEnter(miniGameType);
+        }
+        else if (TutorialManager.FindMinigameTutorial)
+        {
+            miniGameType = MiniGameType.Find;
+            MiniGameManager.GameEnter(miniGameType);
+        }
+        else
+        {
+            miniGameType = MiniGameManager.SelectMinigameType();
+        }
+    }
+
     public static void OpenPanel()
     {
         Mask.TweenForCG();

Assets/Script/Manage/MiniGameManager.cs

@@ -597,15 +597,15 @@ public class MinigameAward
     }
 }
 
-public class MiniGameManager : Regist 
+public enum MiniGameType
 {
-    public enum MiniGameType
-    {
-        Punch, //打地鼠
-        Memory, //记住花的消失顺序
-        Find, //找落单的花
-    }
+    Punch, //打地鼠
+    Memory, //记住花的消失顺序
+    Find, //找落单的花
+}
 
+public class MiniGameManager : Regist 
+{
     #region Config
 
     public static int Score
@@ -750,7 +750,6 @@ public class MiniGameManager : Regist
     public static int MiniGameIndex; //从上一次掉落钻石开始计起 进行了几次小游戏
 
     public static bool IsPrepare;
-    public static bool HaveNewFlowerFlag;
     public static bool PlayNewflowerEffectFlag;
 
     public static float CreateOperateTime = 1.5f;
@@ -1049,7 +1048,7 @@ public class MiniGameManager : Regist
     }
 
 
-    public static void GetNewFlower()
+    public static void TryGetNewFlower()
     {
         bool newFlowerFlag = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.NewFlowerFlag);
 
@@ -1083,7 +1082,7 @@ public class MiniGameManager : Regist
         }
     }
 
-    public static void SelectMinigameType()
+    public static MiniGameType SelectMinigameType()
     {
         PunchGameOperateParent.SetActive(false);
         MemoryGameOperateParent.SetActive(false);
@@ -1135,44 +1134,20 @@ public class MiniGameManager : Regist
         {
             miniGameType = MiniGameType.Find;
         }
-
-        if (TutorialManager.MemoryMinigameTutorial)
+        else
         {
-            miniGameType = MiniGameType.Memory;
+            throw new Exception();
         }
 
-        if (TutorialManager.FindMinigameTutorial)
-        {
-            miniGameType = MiniGameType.Find;
-        }
+        return miniGameType;
     }
 
 
-    public static void GameEnter()
+    public static void GameEnter(MiniGameType type)
     {
-        if (TutorialManager.NewplayerTutorial)
-        {
-            MinigameAward.UnlockFlowerID = 1;
-            MinigameAward.HaveNewFlowerFlag = true;
-
-            SelectMinigameType();
-        }
-        else
-        {
-            if (!HaveNewFlowerFlag)
-            {
-                SelectMinigameType();
-
-                HaveNewFlowerFlag = true;
-            }
-        }
+        miniGameType = type;
 
-        GetNewFlower();
-
-        if (TutorialManager.MemoryMinigameTutorial)
-        {
-            SelectMinigameType();
-        }
+        TryGetNewFlower();
 
         if (miniGameType == MiniGameType.Punch)
         {
@@ -1195,6 +1170,9 @@ public class MiniGameManager : Regist
         MinigameTimerText.text = GameTime.ToString("0");
 
         ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
+        ResourceManager.Get(GardenLabel.Minigame).TweenForVec();
+        ResourceManager.Get(ObjectLabel.D_MiniGame).TweenForCG();
+        AudioManager.PlayClip(AudioLabel.Bubble);
     }
 
     public static void GameBegin()
@@ -1349,8 +1327,6 @@ public class MiniGameManager : Regist
 
         Manager.PlayMinigameAmt++;
 
-        HaveNewFlowerFlag = false;
-
         GameEnd();
     }
 

Assets/Script/Manage/ResourceManager.cs

@@ -644,7 +644,7 @@ public class ResourceManager : Regist
         Vector3 leftPos = Get(GardenLabel.Minigame_DropAward_LeftBorder).position;
         Vector3 rightPos;
 
-        if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Punch || MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Find)
+        if (MiniGameManager.miniGameType == MiniGameType.Punch || MiniGameManager.miniGameType == MiniGameType.Find)
         {
             rightPos = Get(GardenLabel.FindMinigame_DropAward_RightBorder).position;
         }

Assets/Script/Manage/UIManager.cs

@@ -398,13 +398,7 @@ public class UIManager : Regist
             {
                 if (Manager.MinigameCDTimer <= 0)
                 {
-                    ResourceManager.Get(GardenLabel.Minigame).TweenForVec();
-
-                    ResourceManager.Get(ObjectLabel.D_MiniGame).TweenForCG();
-
-                    MiniGameManager.GameEnter();
-
-                    AudioManager.PlayClip(AudioLabel.Bubble);
+                    EnterMinigamePanelManager.TryOpenPanel();
                 }
                 else
                 {
@@ -805,7 +799,7 @@ public class UIManager : Regist
 
             #region PunchGame
 
-            if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Punch)
+            if (MiniGameManager.miniGameType == MiniGameType.Punch)
             {
                 for (int i = 0; i < MiniGameManager.PunchGameOperateList.Count; i++)
                 {
@@ -826,7 +820,7 @@ public class UIManager : Regist
 
             #region MemoryGame
 
-            if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Memory)
+            if (MiniGameManager.miniGameType == MiniGameType.Memory)
             {
                 for (int i = 0; i < MiniGameManager.MemoryGameFadeList.Count; i++)
                 {
@@ -849,7 +843,7 @@ public class UIManager : Regist
 
             #region FindGame
 
-            if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Find)
+            if (MiniGameManager.miniGameType == MiniGameType.Find)
             {
                 MiniGameManager.MinigameIdleFlowerList.ForEach
                 (