正式版

Assets/Editor.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 5fcd7f3618d0f154995b49930421ea1b
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/metro/UWP.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b3a793fc2ce8625488a5576817135789
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/metro/WindowsPhone81.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ea89367846fcf554188c49cca742be04
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/Logo.unity

@@ -427,7 +427,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1833966245}
   - component: {fileID: 1833966244}
-  - component: {fileID: 1833966246}
   m_Layer: 0
   m_Name: ManagerGame
   m_TagString: Untagged
@@ -461,20 +460,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1833966246
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1833966243}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ef3c42f14ba649d4aaf2ea3afe194ba7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Sprite: {fileID: 0}
-  Graphic: {fileID: 0}
-  TextAsset1: {fileID: 0}
-  TextAsset2: {fileID: 0}
-  Texture2D: {fileID: 0}
-  SpriteRenderer: {fileID: 0}

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

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

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="-9" />
+  <Version value="-11" />
 
   <ID value="Default" />
   <TutorialA value="1" />

Assets/Script/Manage/ManaData.cs

@@ -238,6 +238,10 @@ public class ManaData : Regist
 
                 ManaServer.Save();
             }
+            else if (nativeVersion > defaultVersion)
+            {
+                PlayerDoc_ = DefaultDoc;
+            }
         }
         else
         {

Assets/Script/Manage/ManaGarden.cs

@@ -284,23 +284,23 @@ public class ManaGarden : Regist
     }
 
 
-    public static void LockSlot()
-    {
-        for (int i = 0; i < SlotList.Count; i++)
-        {
-            if (SlotList[i].Lock)
-            {
-                Slot--;
+    //public static void LockSlot()
+    //{
+    //    for (int i = 0; i < SlotList.Count; i++)
+    //    {
+    //        if (SlotList[i].Lock)
+    //        {
+    //            Slot--;
 
-                SlotList[i].Lock = false;
-                SlotList[i].Available = false;
+    //            SlotList[i].Lock = false;
+    //            SlotList[i].Available = false;
 
-                return;
-            }
-        }
+    //            return;
+    //        }
+    //    }
 
-        throw new Exception();
-    }
+    //    throw new Exception();
+    //}
 
     public static void UnlockSlot()
     {
@@ -567,11 +567,4 @@ public class ManaGarden : Regist
             ManaAudio.PlayClip(Clip.FlowerClip);
         }
     }
-}
-
-#region 已测试内容
-
-//一共有3种花卡 回收卡 不能解锁卡 可以解锁卡 
-//各种卡之间转换时的按钮变化(事件和Text)
-
-#endregion
+}

Assets/Script/Manage/ManaMiniGame.cs

@@ -1732,7 +1732,7 @@ public class ManaMiniGame : Regist
 
     public static void RoundResetC(bool firstRound = false)
     {
-        ExtList.ForEach(IdleList, flower => { flower.Retrieve();});
+        ExtList.ForEach(IdleList, flower => { flower.FlowerIcon.SetAlpha(1); flower.FlowerIcon.SetActive(true); flower.Retrieve();});
 
         IdleList = new List<Flower>();
 

Assets/Script/Manage/ManaReso.cs

@@ -647,6 +647,9 @@ public class ManaReso : Regist
         flower.FlowerInfo = flowerInfo;
         flower.Slot = slot;
 
+        //flower.FlowerIcon.SetActive(true);
+        //flower.FlowerIcon.SetAlpha(1);
+
         flower.SetShadow();
         flower.SetCollider(collider);
 
@@ -665,6 +668,9 @@ public class ManaReso : Regist
 
         flower.FlowerInfo = flowerInfo;
 
+        //flower.FlowerIcon.SetActive(true);
+        //flower.FlowerIcon.SetAlpha(1);
+
         flower.SetShadow();
         flower.SetCollider(false);
 

Assets/Script/Manage/ManaUI.cs

@@ -1168,7 +1168,7 @@ public class ManaUI : Regist
             "Ea_Unlock",
             () =>
             {
-                ManaDebug.Log(ManaAudio.MusicTheme.isPlaying + " " + ManaAudio.MusicTheme.volume + " " + ManaAudio.MusicTheme.spatialBlend + " " + ManaAudio.MusicTheme.mute + " " + ManaAudio.MusicTheme.time);
+                //ManaDebug.Log(ManaAudio.MusicTheme.isPlaying + " " + ManaAudio.MusicTheme.volume + " " + ManaAudio.MusicTheme.spatialBlend + " " + ManaAudio.MusicTheme.mute + " " + ManaAudio.MusicTheme.time);
 
                 ManaGarden.UnlockSlot();
             }

Assets/Script/Object/Slot.cs

@@ -113,5 +113,7 @@ public class Slot : Regist
 
 
         Flower.Retrieve();
+
+        Flower = null;
     }
 }

Assets/Script/Tool/Auxiliary.cs

@@ -133,20 +133,12 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            ManaServer.GetProductID
-            (
-                "com.dashgame.garden.packone",
-                data =>
-                {
-                    Debug.Log(data);
-                    //AliplayManager.Instance.Pay(data, str);
-                }
-            );
+
         }
 
         if (Input.GetKeyDown(KeyCode.M))
         {
-            ManaTutorial.EnterD1();
+            //Debug.Log(ManaGarden.Slot);
         }
 
         if (Input.GetKeyDown(KeyCode.N))
@@ -169,20 +161,20 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.B))
         {
-            foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
-            {
-                VARIABLE.Value.Unlock();
-            }
+            //foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
+            //{
+            //    VARIABLE.Value.Unlock();
+            //}
         }
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            ManaCenter.MiniTimer = 0;
+            //ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            ManaMiniGame.GameTimer = 45;
+            //ManaMiniGame.GameTimer = 45;
 
             //Lottery.TempTypeList = new List<int>();
             //Lottery.TempValueList = new List<int>();
@@ -197,20 +189,20 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            ManaMiniGame.Score = 1000;
+            //ManaMiniGame.Score = 1000;
 
-            ManaSign.SignTime = new DateTime(2007, 1, 1);
+            //ManaSign.SignTime = new DateTime(2007, 1, 1);
         }
 
         if (Input.GetKeyDown(KeyCode.V))
         {
-            ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
-            ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
+            //ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
+            //ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
 
-            ManaServer.GetMainReward(mailReward);
-            ManaServer.GetMainReward(mailReward1);
+            //ManaServer.GetMainReward(mailReward);
+            //ManaServer.GetMainReward(mailReward1);
 
-            ManaGarden.ElfTimer = 0;
+            //ManaGarden.ElfTimer = 0;
 
             //ManaServer.Time = new DateTime(2007,1,1);
         }
@@ -222,10 +214,10 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.O))
         {
-            for (int i = 0; i < ManaCenter.CoolList.Count; i++)
-            {
-                ManaCenter.CoolList[i].CoolTimer = 0;
-            }
+            //for (int i = 0; i < ManaCenter.CoolList.Count; i++)
+            //{
+            //    ManaCenter.CoolList[i].CoolTimer = 0;
+            //}
         }
 
         //if (Input.GetKeyDown(KeyCode.I))

Assets/Script/Tool/UI/UIPartical.cs

@@ -51,9 +51,12 @@ public class UIPartical : Image
         {
             return;
         }
-        
-        Animator.SetTrigger("Play");
 
+        if (Animator.isInitialized)
+        {
+            Animator.SetTrigger("Play");
+        }
+        
         ParticleSystem.Play();
     }
 

ToList.txt

@@ -1,17 +1,4 @@
-自动打包后的支付宝
-
-自动打包后还能添加BundleDisplayName吗
-
-花隐形的bug(小游戏C? 小游戏B?)
-
-苹果上面没有声音(ManaUI中的调试代码 耳机有没有声音 检查Xcode控制台 playback categories 苹果是否被静音了)
-
-
-苹果的本地化
-
-还原PlayerConfig
-
-关闭调试按键
+//关闭调试按键
 
 先开启Service再打包