浏览代码

Update 6.18

LiuQilin 8 年之前
父节点
当前提交
2f52b5ef29

+ 0 - 9
Assets/Advertisements/Editor/Resources/Android.meta

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

二进制
Assets/Resource/Logo.unity


二进制
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


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

@@ -1,10 +1,10 @@
 <PlayerConfig>
-  <Version value="655" />
+  <Version value="662" />
 
   <ID value="Default" />
-  <TutorialA value="1" />
-  <TutorialB value="1" />
-  <TutorialC value="1" />
+////  <TutorialA value="0" />
+////  <TutorialB value="0" />
+////  <TutorialC value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
@@ -49,7 +49,7 @@
     <Skill ID="Pack10" SkillType="Pack" ItemStatus="Lock" Level="0" />
     <Skill ID="Pack11" SkillType="Pack" ItemStatus="Lock" Level="0" />
     
-    <Skill ID="Ability1" SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <Skill ID="Ability1" SkillType="Ability" ItemStatus="Upgrade" Level="14" />
     <Skill ID="Ability2" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability3" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability4" SkillType="Ability" ItemStatus="Lock" Level="0" />

+ 7 - 7
Assets/Script/Manage/ManaCenter.cs

@@ -148,13 +148,13 @@ public class ManaCenter : Regist
                 }
             }
 
-            //if (Level_ >= 18)
-            //{
-            //    if (ManaTutorial.TutorialB_)
-            //    {
-            //        ManaTutorial.TutorialB = true;
-            //    }
-            //}
+            if (Level_ >= 18)
+            {
+                if (ManaTutorial.TutorialB_)
+                {
+                    ManaTutorial.TutorialB = true;
+                }
+            }
         }
     }
     public static float Person

+ 22 - 23
Assets/Script/Manage/ManaMiniGame.cs

@@ -1079,29 +1079,28 @@ public class ManaMiniGame : Regist
         D_Operate1.SetActive(false);
         D_Operate2.SetActive(false);
 
-        GameA = true;
-        //if (ManaCenter.Level >= 18)
-        //{
-        //    if (ManaTutorial.TutorialB)
-        //    {
-        //        GameB = true;
-        //    }
-        //    else
-        //    {
-        //        if (Random.Range(0f, 1f) <= 0.5f)
-        //        {
-        //            GameB = true;
-        //        }
-        //        else
-        //        {
-        //            GameA = true;
-        //        }
-        //    }
-        //}
-        //else
-        //{
-        //    GameA = true;
-        //}
+        if (ManaCenter.Level >= 18)
+        {
+            if (ManaTutorial.TutorialB)
+            {
+                GameB = true;
+            }
+            else
+            {
+                if (Random.Range(0f, 1f) <= 0.5f)
+                {
+                    GameB = true;
+                }
+                else
+                {
+                    GameA = true;
+                }
+            }
+        }
+        else
+        {
+            GameA = true;
+        }
     }
 
     public static void InitializeAward()

+ 3 - 3
Assets/Script/Tool/Auxiliary.cs

@@ -124,17 +124,17 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            //ManaCenter.MiniTimer = 0;
+            ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            //ManaMiniGame.GameTimer = 45;
+            ManaMiniGame.GameTimer = 45;
         }
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            //ManaMiniGame.Score = 2000;
+            ManaMiniGame.Score = 2000;
         }
 
         if (Input.GetKeyDown(KeyCode.V))

+ 5 - 13
ToList.txt

@@ -1,20 +1,12 @@
-//还原PlayerConfig
+还原PlayerConfig
 
-//关闭调试界面
+关闭调试界面
 
-//关闭调试按键
+关闭调试按键
 
-//注意存档覆盖情况
+注意存档覆盖情况
 
 
 装个WPS
 
-监督补上循环特效
-
-
-切换材质时的颜色
-
-开启小游戏B和其教程
-
-
-TweenNumber加一个Prefix和Epilogue功能
+监督补上循环特效