LiuQilin 8 роки тому
батько
коміт
a04c48af3f

+ 3 - 2
Assets/Resource/Logo.unity

@@ -445,8 +445,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 2 - 2
Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="681" />
+  <Version value="0" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -28,7 +28,7 @@
 
   <Player value="PlayerBlond" />
   <PlantList value =""/>
-  <DressList value ="2 6 11 201 202 203 401 405 408 601 602 603 801 802 803 1001"/>
+  <DressList value =""/>
   <FlowerList value="1" />
   <AchieveList value="" />
   <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse="" Wing="Empty"/>

+ 14 - 0
Assets/Script/Manage/ManaTutorial.cs

@@ -302,6 +302,20 @@ public class ManaTutorial : Regist
                     ManaPlayer.DressData.Add("Empty");
                 }
 
+                foreach (var str in ManaPlayer.DressData)
+                {
+                    if (!ManaPlayer.CloseIDDic.ContainsKey(str))
+                    {
+                        continue;
+                    }
+
+                    int id = ManaPlayer.CloseIDDic[str];
+
+                    ManaPlayer.CloseUnitDic[id].Unlock();
+
+                    ManaPlayer.BoughtCloseList.Add(id);
+                }
+
                 ManaData.SaveDress();
 
 

+ 1 - 1
Assets/Script/Object/Player.cs

@@ -90,7 +90,7 @@ public class CloseUnit
         Sprites = SpriteParse(attribute[13].Value);
         SpriteAlpha = Auxiliary.FloatParse(attribute[14].Value, 1);
         ArmatureName = attribute[15].Value;
-
+        
         ManaPlayer.CloseIDDic.Add(ArmatureName, ID);
         ManaPlayer.CloseUnitDic.Add(ID, this);
 

+ 5 - 16
Assets/Script/Object/Skill/Pack.cs

@@ -205,18 +205,6 @@ public class Pack : SkillRoot
     }
 
 
-    protected void UseB()
-    {
-        if (!string.IsNullOrEmpty(CoinFml))
-        {
-            double coin = Auxiliary.FmlParse(CoinFml, "l", ManaCenter.Level.ToString(), "c", ManaCenter.CoinPerson.ToString("0.000"));
-
-            ManaCenter.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Shop);
-        }
-
-        ManaCenter.AddDiamond(DiamondOnce, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Charge);
-    }
-
     protected void UseA()
     {
         ManaCenter.SkillPlus += Plus;
@@ -283,6 +271,8 @@ public class Pack : SkillRoot
         int tempCoin = 0;
         int tempDiamond = (int) DiamondOnce;
 
+        ManaCenter.AddDiamond(DiamondOnce, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Charge);
+
         string tempFlower = "";
 
         if (!string.IsNullOrEmpty(Flower))
@@ -322,19 +312,19 @@ public class Pack : SkillRoot
         {
             int coin = (int) Auxiliary.FmlParse(CoinFml, "l", ManaCenter.Level.ToString(), "c", ManaCenter.CoinPerson.ToString("0.000"));
 
-            ManaCenter.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Charge);
+            ManaCenter.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Shop);
 
             tempCoin += coin;
         }
 
         if (!tempCoin.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(金币)>", tempCoin);
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(金币)>", Auxiliary.ShrinkNumberStr(tempCoin));
         }
 
         if (!tempDiamond.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(钻石)>", tempDiamond);
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(钻石)>", Auxiliary.ShrinkNumberStr(tempDiamond));
         }
 
         if (!string.IsNullOrEmpty(tempFlower))
@@ -360,7 +350,6 @@ public class Pack : SkillRoot
         }
 
         UseA();
-        UseB();
     }
 
 

+ 11 - 9
Assets/Script/Tool/Auxiliary.cs

@@ -145,12 +145,12 @@ public class Auxiliary : Regist
             //    VARIABLE.Value.Unlock = true;
             //}
 
-            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
-            //{
-            //    VARIABLE.Value.Unlock = false;
-            //}
+            foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
+            {
+                VARIABLE.Value.Unlock = false;
+            }
 
-            //ManaGarden.FlowerInfoDic.First().Value.Unlock = true;
+            ManaGarden.FlowerInfoDic.First().Value.Unlock = true;
         }
 
         if (Input.GetKeyDown(KeyCode.B))
@@ -168,11 +168,13 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            Lottery.TempTypeList = new List<int>();
-            Lottery.TempValueList = new List<int>();
-            Lottery.TempLotteryList = new List<Lottery>();
+            ManaMiniGame.GameTimer = 45;
+
+            //Lottery.TempTypeList = new List<int>();
+            //Lottery.TempValueList = new List<int>();
+            //Lottery.TempLotteryList = new List<Lottery>();
 
-            Lottery.EnterAnimation();
+            //Lottery.EnterAnimation();
 
             //ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
             //ManaReso.Get("Bc_LotteryItem2").TweenForEuler();

+ 1 - 3
ToList.txt

@@ -1,9 +1,7 @@
-购买礼包时花的转换价格从配置中取
+更新配置
 
 苹果的本地化
 
-播放广告可能有问题
-
 清空存档
 
 分享appid