增加-试衣间教程

增加-合并存档

Assets/Extension.meta

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

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="666" />
+  <Version value="670" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -11,7 +11,6 @@
   <TutorialIndexC value="1" />
   <TutorialIndexD value="1" />
 
-  <Player value="PlayerBlond" />
   <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />
   <SignTime value="4/23/2017 09:30:00 AM" />
@@ -25,8 +24,9 @@
   <CircleTimer value="0" />
   <MiniGameIndex value="0" />
 
+  <Player value="PlayerBlond" />
   <PlantList value =""/>
-  <DressList value ="2 5 8 11 14"/>
+  <DressList value ="2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"/>
   <FlowerList value="1" />
   <AchieveList value="" />
   <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse=""/>

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -92,6 +92,7 @@
     <P_BtnLab2 desc=""><![CDATA[已购<(已购)>]]></P_BtnLab2>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
+    <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -92,6 +92,7 @@
     <P_BtnLab2 desc=""><![CDATA[已購<(已购)>]]></P_BtnLab2>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
+    <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/English.xml

@@ -92,6 +92,7 @@
     <P_BtnLab2 desc=""><![CDATA[Bought<(已购)>]]></P_BtnLab2>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
+    <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>

Assets/Script/Manage/ManaCenter.cs

@@ -157,7 +157,7 @@ public class ManaCenter : Regist
             {
                 if (ManaTutorial.TutorialD_)
                 {
-                    ManaTutorial.EnterD();
+                    ManaTutorial.EnterD1();
                 }
             }
 
@@ -514,18 +514,6 @@ public class ManaCenter : Regist
                 ManaReso.Get("Ba_Notice").TweenForCG();
             }
         }
-        if (!ManaTutorial.TutorialA && ManaData.GetPlayerBool("QuitFlag") && ManaServer.Connect)
-        {
-            int daySpan = ManaServer.Time.Day - ManaSign.SignTime.Day;
-            int yearSpan = ManaServer.Time.Year - ManaSign.SignTime.Year;
-            int monthSpan = ManaServer.Time.Month - ManaSign.SignTime.Month;
-
-            if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
-            {
-                ManaReso.Get("B_SignIn").TweenForCG();
-                ManaReso.Get("Bb_SignIn").TweenForCG();
-            }
-        }
     }
 
     public override void Instantiate()
@@ -1009,17 +997,11 @@ public class ManaCenter : Regist
 
             ManaReso.SetText("La_Lab", Language.GetStr("UI", "La_Lab0"));
 
-            //ManaReso.SetActive("La_Mask", false);
-
 
-            int version = ManaData.GetPlayerInt("Version");
-            
             ManaData.PlayerDoc.LoadXml(jsonData["l"].ToString());
 
             ManaData.PlayerNode = ManaData.PlayerDoc.SelectSingleNode("PlayerConfig");
 
-            ManaData.SavePlayerInt("Version", version);
-
 
             ManaReso.SetText("L_UserLab", ManaData.GetPlayerString("ID"));
 

Assets/Script/Manage/ManaData.cs

@@ -77,7 +77,7 @@ public class ManaData : Regist
                         
                         if (nativeVersion < defaultVersion)
                         {
-                            PlayerDoc_ = MergeXML(nativeVersion, defaultVersion, nativeDoc, DefaultDoc);
+                            PlayerDoc_ = MergeXML(nativeVersion, nativeDoc, DefaultDoc);
                         }
                         else if (nativeVersion > defaultVersion)
                         {
@@ -214,21 +214,28 @@ public class ManaData : Regist
 
         DamageLock = false;
 
+        TextAsset textAsset = ManaReso.Load<TextAsset>("PlayerConfig", Folder.Config);
+
+        DefaultDoc.LoadXml(textAsset.text);
+
+
         if (jsonData.Inst_Object.Keys.Contains("l"))
         {
             PlayerDoc_ = new XmlDocument();
 
             PlayerDoc_.LoadXml(jsonData["l"].ToString());
 
-            SavePlayerInt("Version", int.Parse(DefaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value));
+            int nativeVersion = int.Parse(PlayerDoc_.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
+            int defaultVersion = int.Parse(DefaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
+
+            if (nativeVersion < defaultVersion)
+            {
+                MergeXML(nativeVersion, PlayerDoc_, DefaultDoc);
+            }
         }
         else
         {
-            TextAsset textAsset = ManaReso.Load<TextAsset>("PlayerConfig", Folder.Config);
-
-            PlayerDoc_ = new XmlDocument();
-
-            PlayerDoc_.LoadXml(textAsset.text);
+            PlayerDoc_ = DefaultDoc;
         }
     }
 
@@ -362,7 +369,7 @@ public class ManaData : Regist
         }
     }
 
-    public static void SaveDressList()
+    public static void SaveDress()
     {
         XmlNode xmlNode = PlayerNode.SelectSingleNode("DressList");
         xmlNode.Attributes[0].Value = "";
@@ -483,7 +490,7 @@ public class ManaData : Regist
         {
             SaveSkillList();
             SaveAchieve();
-            SaveDressList();
+            SaveDress();
             SavePlantList();
             SaveCommon();
             SaveFlowerList();
@@ -841,27 +848,24 @@ public class ManaData : Regist
     }
 
 
-    public static XmlDocument MergeXML(int nativeVersion, int defaultVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        if (nativeVersion < 665)
-        {
-            To665(nativeDoc, defaultDoc);
-        }
-
-        if (nativeVersion < 666)
+        if (nativeVersion < 670)
         {
-            To666(nativeDoc, defaultDoc);
+            To670(nativeDoc, defaultDoc);
         }
 
         return nativeDoc;
     }
 
-    public static XmlDocument To665(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument To670(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         string playerType = "";
         XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
         XmlNode xmlNode2 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
-        XmlNode xmlNode3 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
+        XmlNode xmlNode3 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
+        XmlNode xmlNode4 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
+        XmlNode xmlNode5 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
 
         if (xmlNode1 != null)
         {
@@ -875,16 +879,33 @@ public class ManaData : Regist
 
         if (xmlNode3 != null)
         {
-            playerType = xmlNode3.Attributes[0].Value;
-
             nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode3);
         }
 
+        if (xmlNode4 != null)
+        {
+            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode4);
+        }
+
+        if (xmlNode5 != null)
+        {
+            playerType = xmlNode5.Attributes[0].Value;
+
+            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode5);
+        }
+        else
+        {
+            playerType = "PlayerBlond";
+        }
+
 
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 665.ToString();
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 670.ToString();
 
         xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
         xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
+        xmlNode3 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
+        xmlNode4 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
+        xmlNode5 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
 
         if (playerType == "PlayerBlond")
         {
@@ -919,33 +940,9 @@ public class ManaData : Regist
 
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode2, true));
-
-        return nativeDoc;
-    }
-
-    public static XmlDocument To666(XmlDocument nativeDoc, XmlDocument defaultDoc)
-    {
-        XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
-        XmlNode xmlNode2 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
-
-        if (xmlNode1 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode1);
-        }
-
-        if (xmlNode2 != null)
-        {
-            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode2);
-        }
-
-
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 666.ToString();
-
-        xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
-        xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
-
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode2, true));
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode3, true));
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode4, true));
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode5, true));
 
         return nativeDoc;
     }

Assets/Script/Manage/ManaTutorial.cs

@@ -278,6 +278,9 @@ public class ManaTutorial : Regist
                     ManaPlayer.DressData.Add("嘴巴2");
                 }
 
+                ManaData.SaveDress();
+
+
                 Transform tra = ManaPlayer.SeleTra;
 
                 ManaPlayer.Player = tra.GetComponent<Player>();
@@ -891,17 +894,97 @@ public class ManaTutorial : Regist
     {
         TutorialD = false;
 
-        ManaReso.Get("C_Group2").TweenForCG();
+        ManaReso.Get("C_Main2").TweenForCG();
+
+        TweenRoot tweenRoot = ManaReso.Get("I_BlackMask").TweenBacCG();
+
+        tweenRoot.AddEventOnetime
+        (
+            EventType.BackwardFinish,
+            () =>
+            {
+                Tutorial.MaskLock = true;
+
+                Tutorial.HightDisable();
+
+                ManaReso.Get("N_Mask").TweenBacGra();
+                ManaReso.Get("N_LabBK").TweenBacCG();
+
+                ManaReso.SetActive("N_Button", false);
+                ManaReso.SetActive("N_Tutorial", false);
+            }
+        );
     }
 
-    public static void EnterD()
+    public static void EnterD1()
     {
-        //Debug.Log("TutorialD");
-
         TutorialD = true;
         TutorialD_ = false;
 
-        ManaReso.Get("C_Group2").TweenBacCG();
+        TweenRoot tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
+
+        if (tweenRoot.InDestination)
+        {
+            tweenRoot = ManaReso.Get("Fe_Info").TweenBacCG();
+
+            tweenRoot.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    ManaReso.Get("F_Manage").TweenBacGra();
+
+                    tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
+
+                    tweenRoot.AddEventOnetime
+                    (
+                        EventType.BackwardFinish,
+                        () =>
+                        {
+                            EnterD2();
+                        }
+                    );
+                }
+            );
+        }
+        else
+        {
+            EnterD2();
+        }
+    }
+
+    public static void EnterD2()
+    {
+        ManaReso.Get("B_SignIn0").TweenBacCG();
+
+        ManaReso.Get("C_Main2").TweenBacCG();
+
+        ManaReso.SetActive("N_Tutorial", true);
+
+        ManaReso.Get("N_Mask").TweenForGra();
+
+        ManaReso.SetText("N_Lab", Language.GetStr("UI", "N_Lab"));
+
+        Tutorial.MaskLock = true;
+
+        Tutorial.SetArea(ManaPlayer.Player.ChildDic["HighLightPos"], 0.1f, 0.2f);
+
+        Tutorial.SetUIButton(ManaPlayer.Player.ChildDic["HighLightPos"].position, 0.1f, 0.2f);
+
+        Tutorial.ShowDescriptScene(ManaPlayer.Player.ChildDic["LabPos"].position);
+
+        Tutorial.PointScene(ManaPlayer.Player.ChildDic["Arrow"].position, ManaPlayer.Player.transform);
+
+        ManaReso.AddButtonEventOnetime
+        (
+            "N_Button",
+            () =>
+            {
+                ManaPlayer.Player.OnPointerClick(null);
+
+                EndD();
+            }
+        );
     }
 }
 

Assets/Script/Manage/ManaUI.cs

@@ -115,6 +115,12 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region B_SignIn0
+
+        ManaReso.Get("B_SignIn0").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
         #region Ba_Notice
 
         ManaReso.Get("Ba_Notice").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
@@ -215,6 +221,12 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_Main2
+
+        ManaReso.Get("C_Main2").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
         #region C_Group
 
         ManaReso.Get("C_Group").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -1550,7 +1562,7 @@ public class ManaUI : Regist
 
         #region I
 
-        ManaReso.Get("I_BlackMask").CreateTweenCG(1, 0, 1.5f, true, false, Curve.EaseOutQuad);
+        ManaReso.Get("I_BlackMask").CreateTweenCG(1, 0, 1f, true, false, Curve.EaseOutQuad);
 
         #endregion
 
@@ -1941,7 +1953,10 @@ public class ManaUI : Regist
 
         #region N
 
+        ManaLan.Add(ManaReso.Get<Text>("N_Lab"), new LanStr("UI", "N_Lab"));
+
         ManaReso.Get("N_Mask").CreateTweenGra(0, 180 / 255f, 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("N_LabBK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("N_Arrow").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("N_Tutorial").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("N_Confirm").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);

Assets/Script/Manage/ManaVisit.cs

@@ -588,7 +588,7 @@ public class ManaVisit
                 (jsonData) =>
                 {
                     LoadComplete = true;
-
+                    
                     if (jsonData.Inst_Object.ContainsKey("l"))
                     {
                         XmlStr = jsonData["l"].ToString();

Assets/Script/Object/Player.cs

@@ -542,6 +542,7 @@ public class Player : Regist , IPointerClickHandler
                     ChildDic["Shadow"].GetStreamScale().InOrigin = true;
                     ChildDic["Shadow"].SetActive(false);
 
+                    ManaReso.Get("B_SignIn0").TweenForCG();
                     ManaReso.Get("I_BlackMask").TweenForCG();
                 }
             );
@@ -554,6 +555,8 @@ public class Player : Regist , IPointerClickHandler
             return;
         }
 
+        ManaReso.Get("B_SignIn0").TweenBacCG();
+
         InDressRoom = true;
 
         JumpTime = Mathf.Lerp(0, JumpFrequency, Random.Range(0.5f, 1f));

Assets/Script/Object/Skill/Pack.cs

@@ -292,7 +292,7 @@ public class Pack : SkillRoot
     {
         ManaAudio.PlayClip(Clip.BtnClip);
 
-        ManaCenter.Pay(ID, UseAmt, Current.Cash, PurchaseResult);
+        ManaCenter.Pay(ID, UseAmt, BuyCur, PurchaseResult);
     }
 
     protected void PurchaseResult()

Assets/Script/Object/Star.cs

@@ -49,7 +49,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
 
                 tween.OnBackwardFinish = () =>
                 {
-                    ManaReso.Save(gameObject);
+                    ManaReso.Save(gameObject, true);
 
                     ManaGarden.StarList.Remove(this);
                 };

Assets/Script/Object/Tutorial.cs

@@ -2,6 +2,7 @@
 
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.Events;
 using UnityEngine.EventSystems;
 
 using System.Collections;
@@ -171,6 +172,35 @@ public class Tutorial : Regist, IPointerClickHandler
     }
 
 
+    public static void ShowDescriptScene(Vector3 pos)
+    {
+        pos = Camera.main.WorldToScreenPoint(pos);
+
+        ShowDescriptScreen(pos);
+    }
+
+    public static void ShowDescriptScreen(Vector3 pos)
+    {
+        ManaReso.Get("N_LabBK").TweenForCG();
+
+        ManaReso.Get("N_LabBK").transform.position = pos;
+    }
+
+
+    public static void SetUIButton(Vector3 pos, float radiusX, float radiusY)
+    {
+        pos = Camera.main.WorldToScreenPoint(pos);
+
+        Image image = ManaReso.Get<Image>("N_Button");
+
+        image.transform.position = pos;
+
+        image.transform.localScale = new Vector3(radiusX*2, radiusY*2, 1);
+
+        image.SetActive(true);
+    }
+
+
     public void OnPointerClick(PointerEventData eventData)
     {
         ManaAudio.PlayClip(Clip.BtnClip);

ToList.txt

@@ -1,16 +1,3 @@
-测试 大于13级才开放试衣间
-
-13级出现试衣间教程 圆角遮罩+文本框+指引箭头+Collider+关闭小游戏
-
-测试 从8级教程到13级教程
-
-测试 教程结束后要和其它教程一致(N_Mask和N_Tutorial) 开启小游戏
-
-测试 合并(合并后高等级账号能否触发教程)
-
-测试 是否会重复触发教程
-
-
 还原PlayerConfig
 
 关闭调试界面