|
@@ -2098,6 +2098,10 @@ public class MiniGameManager : Regist
|
|
{
|
|
{
|
|
flowers[i].FlowerIcon.TweenBacSr();
|
|
flowers[i].FlowerIcon.TweenBacSr();
|
|
}
|
|
}
|
|
|
|
+ if (FindMissingNewFlower != null)
|
|
|
|
+ {
|
|
|
|
+ FindMissingNewFlower.PlayNewFlowerEffec();
|
|
|
|
+ }
|
|
List<Flower> buttonFlowers = new List<Flower>();
|
|
List<Flower> buttonFlowers = new List<Flower>();
|
|
buttonFlowers.Add(flowers[0]);
|
|
buttonFlowers.Add(flowers[0]);
|
|
for (int i = 1; i < flowers.Count; i++)
|
|
for (int i = 1; i < flowers.Count; i++)
|
|
@@ -2150,9 +2154,17 @@ public class MiniGameManager : Regist
|
|
|
|
|
|
public static void FindMissingGameRoundEnd()
|
|
public static void FindMissingGameRoundEnd()
|
|
{
|
|
{
|
|
|
|
+ if (FindMissingNewFlower != null)
|
|
|
|
+ {
|
|
|
|
+ FindMissingNewFlower.StopNewFlowerEffec();
|
|
|
|
+ }
|
|
|
|
+ for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
|
|
|
|
+ {
|
|
|
|
+ MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
|
|
|
|
+ }
|
|
DelayCall.Call
|
|
DelayCall.Call
|
|
(
|
|
(
|
|
- 1f, () =>
|
|
|
|
|
|
+ 0.5f, () =>
|
|
{
|
|
{
|
|
FindMissingGameRoundReset(false);
|
|
FindMissingGameRoundReset(false);
|
|
FindMissingGameRoundBegin();
|
|
FindMissingGameRoundBegin();
|
|
@@ -2176,6 +2188,7 @@ public class MiniGameManager : Regist
|
|
Flower flower;
|
|
Flower flower;
|
|
if (MinigameAward.HaveNewFlowerFlag)
|
|
if (MinigameAward.HaveNewFlowerFlag)
|
|
{
|
|
{
|
|
|
|
+ FindMissingNewFlower = null;
|
|
List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
|
|
List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
|
|
for (int i = 0; i < flowerInfos.Count; i++)
|
|
for (int i = 0; i < flowerInfos.Count; i++)
|
|
{
|
|
{
|
|
@@ -2201,7 +2214,6 @@ public class MiniGameManager : Regist
|
|
{
|
|
{
|
|
int specialSlotID = idList.Random(1, true, true)[0];
|
|
int specialSlotID = idList.Random(1, true, true)[0];
|
|
FindMissingNewFlower = ResourceManager.GetFlower(GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID], MinigameSlots[specialSlotID]);
|
|
FindMissingNewFlower = ResourceManager.GetFlower(GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID], MinigameSlots[specialSlotID]);
|
|
- FindMissingNewFlower.PlayNewFlowerEffec();
|
|
|
|
MinigameIdleFlowerList.Add(FindMissingNewFlower);
|
|
MinigameIdleFlowerList.Add(FindMissingNewFlower);
|
|
List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
|
|
List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
|
|
for (int i = 0; i < flowerInfos.Count; i++)
|
|
for (int i = 0; i < flowerInfos.Count; i++)
|
|
@@ -2234,6 +2246,10 @@ public class MiniGameManager : Regist
|
|
|
|
|
|
public static void FindMissingGameRoundBegin()
|
|
public static void FindMissingGameRoundBegin()
|
|
{
|
|
{
|
|
|
|
+ if (FindMissingNewFlower != null)
|
|
|
|
+ {
|
|
|
|
+ FindMissingNewFlower.PlayNewFlowerEffec();
|
|
|
|
+ }
|
|
FindMissingGameFadeTimer = FindMissingGameCurrentFadeTime;
|
|
FindMissingGameFadeTimer = FindMissingGameCurrentFadeTime;
|
|
for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
|
|
for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
|
|
{
|
|
{
|
|
@@ -2248,6 +2264,11 @@ public class MiniGameManager : Regist
|
|
MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
|
|
MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (FindMissingNewFlower != null)
|
|
|
|
+ {
|
|
|
|
+ FindMissingNewFlower.StopNewFlowerEffec();
|
|
|
|
+ }
|
|
|
|
+
|
|
DelayCall.Call
|
|
DelayCall.Call
|
|
(
|
|
(
|
|
FindMissingGameFlowerDisappearTime,
|
|
FindMissingGameFlowerDisappearTime,
|
|
@@ -2272,6 +2293,7 @@ public class MiniGameManager : Regist
|
|
Score += FindSoloCorrectScore;
|
|
Score += FindSoloCorrectScore;
|
|
|
|
|
|
FindMissingCorrectFlower.PlayFlashLight();
|
|
FindMissingCorrectFlower.PlayFlashLight();
|
|
|
|
+ FindMissingCorrectFlower.FlowerIcon.TweenBacSr();
|
|
|
|
|
|
AudioManager.PlayClip(AudioLabel.ClickButton);
|
|
AudioManager.PlayClip(AudioLabel.ClickButton);
|
|
|
|
|
|
@@ -2279,16 +2301,7 @@ public class MiniGameManager : Regist
|
|
{
|
|
{
|
|
D_FindMissingGameBtns[i].TweenBacCG();
|
|
D_FindMissingGameBtns[i].TweenBacCG();
|
|
}
|
|
}
|
|
- if (FindMissingNewFlower != null)
|
|
|
|
- {
|
|
|
|
- FindMissingNewFlower.StopNewFlowerEffec();
|
|
|
|
- FindMissingNewFlower = null;
|
|
|
|
- }
|
|
|
|
- for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
|
|
|
|
- {
|
|
|
|
- MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
|
|
|
|
- }
|
|
|
|
- FindMissingGameRoundEnd();
|
|
|
|
|
|
+ DelayCall.Call(0.5f, FindMissingGameRoundEnd);
|
|
}
|
|
}
|
|
|
|
|
|
public static void OnFindMissingGameWrongButtonClick(Button button, Image icon)
|
|
public static void OnFindMissingGameWrongButtonClick(Button button, Image icon)
|