增加搭配秀教程

Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,25 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-    iOS:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityUGUIDisplay.cs

@@ -20,15 +20,19 @@ public class UnityUGUIDisplay : MonoBehaviour
         dbGraphic.Disable();
     }
 
-    public void Enable(Transform parent, Transform copyTrans, MeshFilter meshFilter, MeshRenderer meshRenderer)
+    public bool Enable(Transform parent, Transform copyTrans, MeshFilter meshFilter, MeshRenderer meshRenderer)
     {
+        Debug.Log(-1);
+        bool addComponent = false;
         if (dbGraphic == null)
         {
             GameObject go = new GameObject(copyTrans.name);
             go.AddComponent<RectTransform>();
             go.AddComponent<CanvasRenderer>();
             dbGraphic = go.AddComponent<DragonBoneGraphic>();
+            addComponent = true;
         }
         dbGraphic.Enable(parent, copyTrans, meshFilter, meshRenderer);
+        return addComponent;
     }
 }

Assets/Resource/Logo.unity

@@ -613,9 +613,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 0
-  DebugMode: 0
-  CatchException: 1
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  CatchException: 0
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Sprite/Editor/HotUpdate/NewFlower.meta

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

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="24" />
+  <Version value="25" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />
@@ -12,6 +12,7 @@
   <TutorialE value="1" />
   <TutorialPlazaRoom value="1" />
   <FindMissingMinigameTutorial value="1" />
+  <FashionShowTutorial value="1" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
@@ -19,6 +20,7 @@
   <TutorialIndexE value="1" />
   <TutorialIndexPlazaRoom value="1" />
   <FindMissingMinigameTutorialIndex value="1" />
+  <FashionShowTutorialIndex value="1" />
 
   <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -165,6 +165,7 @@
     <Pi_TitleTip desc=""><![CDATA[请填写标题]]></Pi_TitleTip>
     <Pi_ContentTip desc=""><![CDATA[请填写描述]]></Pi_ContentTip>
     <Pi_BuyAllTip desc=""><![CDATA[确定要购买缺少的装扮？]]></Pi_BuyAllTip>
+    <Pi_Share desc=""><![CDATA[分享]]></Pi_Share>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[给这家主人说点什么吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
@@ -941,4 +942,10 @@
     <FindMissing desc=""><![CDATA[记花朵]]></FindMissing>
     <FindSolo desc=""><![CDATA[找不同]]></FindSolo>
   </MinigameName>
+  <Tutorial>
+    <ShowButtonDesc desc=""><![CDATA[搭配秀展示了所有玩家分享的精心搭配，你可以分享、查看，并对你感兴趣的搭配评价和打分。]]></ShowButtonDesc>
+    <ShareButtonDesc desc=""><![CDATA[现在我们来创建一个搭配秀吧！]]></ShareButtonDesc>
+    <CloseDesc desc=""><![CDATA[分享到搭配秀并不需要购买装装扮，试穿即可分享。]]></CloseDesc>
+    <CreateButtonDesc desc=""><![CDATA[现在就分享你的装扮吧！]]></CreateButtonDesc>
+  </Tutorial>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -165,6 +165,7 @@
     <Pi_TitleTip desc=""><![CDATA[請填寫標題]]></Pi_TitleTip>
     <Pi_ContentTip desc=""><![CDATA[請填寫描述]]></Pi_ContentTip>
     <Pi_BuyAllTip desc=""><![CDATA[確定要購買缺少的裝扮？]]></Pi_BuyAllTip>
+    <Pi_Share desc=""><![CDATA[]]></Pi_Share>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[給這家主人說點什麼吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
@@ -941,4 +942,10 @@
     <FindMissing desc=""><![CDATA[記花朵]]></FindMissing>
     <FindSolo desc=""><![CDATA[找不同]]></FindSolo>
   </MinigameName>
+  <Tutorial>
+    <ShowButtonDesc desc=""><![CDATA[搭配秀展示了所有玩家分享的精心搭配，你可以分享、查看，並對你感興趣的搭配評價和打分。]]></ShowButtonDesc>
+    <ShareButtonDesc desc=""><![CDATA[現在我們來創建一個搭配秀吧！]]></ShareButtonDesc>
+    <CloseDesc desc=""><![CDATA[分享到搭配秀並不需要購買裝裝扮，試穿即可分享。]]></CloseDesc>
+    <CreateButtonDesc desc=""><![CDATA[現在就分享你的裝扮吧！]]></CreateButtonDesc>
+  </Tutorial>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -165,6 +165,7 @@ Program 水怪
     <Pi_TitleTip desc=""><![CDATA[Enter the title]]></Pi_TitleTip>
     <Pi_ContentTip desc=""><![CDATA[Enter the description]]></Pi_ContentTip>
     <Pi_BuyAllTip desc=""><![CDATA[Are you sure to buy them all?]]></Pi_BuyAllTip>
+    <Pi_Share desc=""><![CDATA[]]></Pi_Share>
     <Q_Tit desc=""><![CDATA[Message board]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[Say something to the host]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[Comment]]></Q_CommentLab>
@@ -940,4 +941,10 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <FindMissing desc=""><![CDATA[Missing one]]></FindMissing>
     <FindSolo desc=""><![CDATA[Single one]]></FindSolo>
   </MinigameName>
+  <Tutorial>
+    <ShowButtonDesc desc=""><![CDATA[Fashsion Show lists all of the players dress collocation. You can view, share, rate, or comment them.]]></ShowButtonDesc>
+    <ShareButtonDesc desc=""><![CDATA[Now, let's join the fashion show.]]></ShareButtonDesc>
+    <CloseDesc desc=""><![CDATA[Just try them on, and share to fashion show. You don't even need to buy them.]]></CloseDesc>
+    <CreateButtonDesc desc=""><![CDATA[Share them now!]]></CreateButtonDesc>
+  </Tutorial>
 </lan>

Assets/Script/Label/CanvasLabel.cs

@@ -69,6 +69,7 @@ public class CanvasLabel
     public static string C_Group4 = "C_Group4";
     public static string C_FashionShowButtonParent = "C_FashionShowButtonParent";
     public static string C_FashionShowButton = "C_FashionShowButton";
+    public static string C_FashionShowArrow = "C_FashionShowArrow";
     public static string C_AddFriendButton = "C_AddFriendButton";
     public static string C_EnterPlazaRoom0 = "C_EnterPlazaRoom0";
     public static string C_EnterPlazaRoom = "C_EnterPlazaRoom";
@@ -479,6 +480,14 @@ public class CanvasLabel
     public static string Pf_ShoeTab = "Pf_ShoeTab";
     public static string Pf_ShoeGrid = "Pf_ShoeGrid";
     public static string P_CancelShare = "P_CancelShare";
+    public static string P_Tutorial = "P_Tutorial";
+    public static string P_TutorialBg = "P_TutorialBg";
+    public static string P_CloseTipBK = "P_CloseTipBK";
+    public static string P_CloseTip = "P_CloseTip";
+    public static string P_CreateTipBK = "P_CreateTipBK";
+    public static string P_CreateTip = "P_CreateTip";
+    public static string P_CloseArrow0 = "P_CloseArrow0";
+    public static string P_CloseArrow1 = "P_CloseArrow1";
     public static string Pi_FashionShowHomePanel = "Pi_FashionShowHomePanel";
     public static string Pi_FashionShowHomePanelPosition = "Pi_FashionShowHomePanelPosition";
     public static string Pi_FashionShowHomeSidePanel = "Pi_FashionShowHomeSidePanel";
@@ -501,6 +510,7 @@ public class CanvasLabel
     public static string Pi_GloryTabBubble = "Pi_GloryTabBubble";
     public static string Pi_GloryTabButtonText = "Pi_GloryTabButtonText";
     public static string Pi_MineTabButton = "Pi_MineTabButton";
+    public static string Pi_MineTabButtonArrow = "Pi_MineTabButtonArrow";
     public static string Pi_MineTabBubble = "Pi_MineTabBubble";
     public static string Pi_MineTabButtonText = "Pi_MineTabButtonText";
     public static string Pi_HomeTabButton = "Pi_HomeTabButton";
@@ -528,6 +538,17 @@ public class CanvasLabel
     public static string Pi_MineTab = "Pi_MineTab";
     public static string Pi_MineScrollRect = "Pi_MineScrollRect";
     public static string Ph_MineGrid = "Ph_MineGrid";
+    public static string Pi_ShareArrow = "Pi_ShareArrow";
+    public static string Pi_ShareBg = "Pi_ShareBg";
+    public static string Pi_Share = "Pi_Share";
+    public static string Pi_Tutorial = "Pi_Tutorial";
+    public static string Pi_TutorialBg = "Pi_TutorialBg";
+    public static string Pi_HomePageTipBK = "Pi_HomePageTipBK";
+    public static string Pi_HomePageTip = "Pi_HomePageTip";
+    public static string Pi_LeaveTipBK = "Pi_LeaveTipBK";
+    public static string Pi_LeaveTip = "Pi_LeaveTip";
+    public static string Pi_HomePageArrow0 = "Pi_HomePageArrow0";
+    public static string Pi_HomePageArrow1 = "Pi_HomePageArrow1";
     public static string Pg_FashionShowEditPanel = "Pg_FashionShowEditPanel";
     public static string Pg_FashionShowEditPanelPosition = "Pg_FashionShowEditPanelPosition";
     public static string Pg_Ribbon = "Pg_Ribbon";

Assets/Script/Label/LanguageLabel.cs

@@ -177,6 +177,7 @@ public class LanguageLabel
     	public static string UI__Pi_TitleTip = "UI__Pi_TitleTip";
     	public static string UI__Pi_ContentTip = "UI__Pi_ContentTip";
     	public static string UI__Pi_BuyAllTip = "UI__Pi_BuyAllTip";
+    	public static string UI__Pi_Share = "UI__Pi_Share";
     	public static string UI__Q_Tit = "UI__Q_Tit";
     	public static string UI__Q_Placeholder = "UI__Q_Placeholder";
     	public static string UI__Q_CommentLab = "UI__Q_CommentLab";
@@ -929,5 +930,10 @@ public class LanguageLabel
     	public static string MinigameName__Memory = "MinigameName__Memory";
     	public static string MinigameName__FindMissing = "MinigameName__FindMissing";
     	public static string MinigameName__FindSolo = "MinigameName__FindSolo";
+    	public static string Tutorial = "Tutorial";
+    	public static string Tutorial__ShowButtonDesc = "Tutorial__ShowButtonDesc";
+    	public static string Tutorial__ShareButtonDesc = "Tutorial__ShareButtonDesc";
+    	public static string Tutorial__CloseDesc = "Tutorial__CloseDesc";
+    	public static string Tutorial__CreateButtonDesc = "Tutorial__CreateButtonDesc";
     //EndMark-Used by LabelUtility-Do not remove
 }

Assets/Script/Label/PlayerConfigLabel.cs

@@ -53,6 +53,8 @@ public class PlayerConfigLabel
     public static string MemoryMinigameTutorial = "TutorialB";
     public static string VisitTutorial = "TutorialC";
     public static string DressroomTutorial = "TutorialD";
+    public static string FashionShowTutorial = "FashionShowTutorial";
+    public static string FashionShowTutorialIndex = "FashionShowTutorialIndex";
     public static string FindSoloMinigameTutorial = "TutorialE";
     public static string TutorialPlazaRoom = "TutorialPlazaRoom";
     public static string NewplayerTutorialIndex = "TutorialIndexA";

Assets/Script/Manage/ConfigManager.cs

@@ -549,9 +549,12 @@ public class ConfigManager : Regist
 
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.NewplayerTutorial).Attributes[0].Value = TutorialManager.NewplayerTutorial.ToInt().ToString();
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.MemoryMinigameTutorial).Attributes[0].Value = TutorialManager.memoryMinigameTutorial.ToInt().ToString();
+
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.VisitTutorial).Attributes[0].Value = TutorialManager.visitTutorial.ToInt().ToString();
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.DressroomTutorial).Attributes[0].Value = TutorialManager.dressroomTutorial.ToInt().ToString();
 
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.FashionShowTutorial).Attributes[0].Value = TutorialManager.fashionShowTutorial.ToInt().ToString();
+
         if (TutorialManager.findSoloMinigameTutorial || TutorialManager.FindSoloMinigameTutorial)
         {
             ConfigRootNode.SelectSingleNode(PlayerConfigLabel.FindSoloMinigameTutorial).Attributes[0].Value = "1";
@@ -577,6 +580,7 @@ public class ConfigManager : Regist
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.FindSoloMinigameTutorialIndex).Attributes[0].Value = TutorialManager.FindSoloMinigameTutorialIndex.ToString();
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorialIndex).Attributes[0].Value = TutorialManager.FindMissingMinigameTutorialIndex.ToString();
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.TutorialIndexPlazaRoom).Attributes[0].Value = TutorialManager.PlazaRoomTutorialIndex.ToString();
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.FashionShowTutorialIndex).Attributes[0].Value = TutorialManager.FashionShowTutorialIndex.ToString();
     }
 
     public static void SaveFlowers()
@@ -1445,6 +1449,13 @@ public class ConfigManager : Regist
             ToVersion24(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 25)
+        {
+            Debug.LogWarning("UpdateArchive to 25");
+
+            ToVersion25(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1818,4 +1829,16 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion25(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 25.ToString();
+
+        XmlNode xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FashionShowTutorial);
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
+        xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FashionShowTutorialIndex);
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/Initializer.cs

@@ -272,6 +272,9 @@ public class Initializer : MonoBehaviour
         TutorialManager.dressroomTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.DressroomTutorial);
         DebugText.text = "Error code : 1-4";
 
+        TutorialManager.fashionShowTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.FashionShowTutorial);
+        DebugText.text = "Error code : 1-4-1";
+
         TutorialManager.findSoloMinigameTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.FindSoloMinigameTutorial);
         DebugText.text = "Error code : 1-5";
 
@@ -302,6 +305,9 @@ public class Initializer : MonoBehaviour
         TutorialManager.PlazaRoomTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.TutorialIndexPlazaRoom);
         DebugText.text = "Error code : 1-10-1";
 
+        TutorialManager.FashionShowTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.FashionShowTutorialIndex);
+        DebugText.text = "Error code : 1-10-1";
+
         Bundle.LoadAtlasSprites();
 
         DebugText.text = "Error code : 7";

Assets/Script/Manage/Manager.cs

@@ -333,6 +333,15 @@ public class Manager : Regist
                     ResourceManager.SetActive(CanvasLabel.C_EnterPlazaRoom0, true);
                 }
             }
+
+            if (gardenLevel >= TutorialManager.FashionShowTutorialLevel)
+            {
+                if (TutorialManager.fashionShowTutorial)
+                {
+                    TutorialManager.BeginFashionShowTutorial();
+                    return;
+                }
+            }
         }
     }
     private static int gardenLevel;

Assets/Script/Manage/TutorialManager.cs

@@ -73,6 +73,7 @@ public class TutorialManager : Regist
     public static int MinFlowerForFindSoloGame = 2;
     public static int MinFlowerForFindMissingGame = 3;
     public static int FindMissingMinigameTutorialLevel = 31;
+    public static int FashionShowTutorialLevel = 21;
 
     public static bool NewplayerTutorial;
     public static int NewplayerTutorialIndex;
@@ -101,6 +102,11 @@ public class TutorialManager : Regist
     public static bool plazaRoomTutorial;
     public static int PlazaRoomTutorialIndex;
 
+
+    public static bool FashionShowTutorial;
+    public static bool fashionShowTutorial;
+    public static int FashionShowTutorialIndex;
+
     #endregion
 
     public override void InstantiatePrefabs()
@@ -1373,4 +1379,254 @@ public class TutorialManager : Regist
             }
         );
     }
+
+
+    public static void EndClickFashionShowBtn()
+    {
+        StaticsManager.GetInstance().TutoComplete("EndClickFashionShowBtn");
+
+        Tutorial.HightDisable();
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
+
+        ShowHomePageDesc();
+    }
+
+    public static void EndHomePageDesc()
+    {
+        StaticsManager.GetInstance().TutoComplete("EndHomePageDesc");
+        ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.Pi_HomePageTipBK, false);
+
+        ClickMineTabButton();
+    }
+
+    public static void EndClickMineTabButton()
+    {
+        StaticsManager.GetInstance().TutoComplete("EndClickMineTabButton");
+        Tutorial.HightDisable();
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
+
+        DelayCall.Call(1, ShowLeaveDesc);
+    }
+
+    public static void EndLeaveDesc()
+    {
+        StaticsManager.GetInstance().TutoComplete("EndLeaveDesc");
+
+        Tutorial.HightDisable();
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
+
+        ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.Pi_LeaveTipBK, false);
+
+        ShowCloseDesc();
+    }
+
+    public static void EndCloseDesc()
+    {
+        StaticsManager.GetInstance().TutoComplete("EndCloseDesc");
+        ResourceManager.SetActive(CanvasLabel.P_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.P_CloseTipBK, false);
+        ClickShareButton();
+    }
+
+    public static void EndFashionShowTutorial()
+    {
+        StaticsManager.GetInstance().TutoComplete("EndFashionShowTutorial");
+
+        ResourceManager.SetActive(CanvasLabel.P_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.P_CreateTipBK, false);
+
+        Tutorial.HightDisable();
+
+        FashionShowTutorial = false;
+        fashionShowTutorial = false;
+
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
+
+        PayExemptAmt = 0;
+        ConnectExemptAmt = 0;
+    }
+
+    public static void BeginFashionShowTutorial()
+    {
+        FashionShowTutorial = true;
+
+        ResourceManager.SetText(CanvasLabel.Pi_HomePageTip, Language.GetStr(LanguageLabel.Tutorial__ShowButtonDesc));
+        ResourceManager.SetText(CanvasLabel.Pi_LeaveTip, Language.GetStr(LanguageLabel.Tutorial__ShareButtonDesc));
+        ResourceManager.SetText(CanvasLabel.P_CloseTip, Language.GetStr(LanguageLabel.Tutorial__CloseDesc));
+        ResourceManager.SetText(CanvasLabel.P_CreateTip, Language.GetStr(LanguageLabel.Tutorial__CreateButtonDesc));
+
+        UIManager.BlockOfflinePanel();
+
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
+
+        if (tweenRoot.InDestination)
+        {
+            TweenRoot tween = ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
+
+            tween.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    ResourceManager.Get(CanvasLabel.F_Manage).TweenBacGra();
+
+                    tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
+
+                    tween.AddEventOnetime
+                    (
+                        EventType.BackwardFinish,
+                        () =>
+                        {
+                            ClickFashionShowBtn();
+                        }
+                    );
+                }
+            );
+        }
+        else
+        {
+            ClickFashionShowBtn();
+        }
+    }
+
+    public static void ClickFashionShowBtn()
+    {
+        ResourceManager.Get(CanvasLabel.C_Main).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group0).TweenReForCG();
+
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.C_Group).GetTweenCG();
+
+        tween.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
+
+                tween = ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
+
+                tween.AddEventOnetime
+                (
+                    EventType.ForwardFinish,
+                    () =>
+                    {
+                        ResourceManager.SetActive(CanvasLabel.C_FashionShowButton, true);
+                        ResourceManager.Get<HorizontalLayoutGroup>(CanvasLabel.C_Group4).CalculateLayoutInputHorizontal();
+                        ResourceManager.Get<HorizontalLayoutGroup>(CanvasLabel.C_Group4).SetLayoutHorizontal();
+                        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.C_FashionShowArrow), ResourceManager.Get(CanvasLabel.C_FashionShowButton));
+
+                        ResourceManager.AddButtonEventOnetime
+                        (
+                            CanvasLabel.C_FashionShowButton,
+                            () =>
+                            {
+                                EndClickFashionShowBtn();
+                            }
+                        );
+                    }
+                );
+            }
+        );
+    }
+
+    public static void ShowHomePageDesc()
+    {
+        ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.Pi_HomePageTipBK, true);
+        LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.Pi_HomePageTipBK));
+
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.Pi_FashionShowHomePanel).GetTweenVec();
+        tween.AddEventOnetime
+        (EventType.ForwardFinish, () =>
+        {
+            ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
+            Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.Pi_HomePageArrow1),
+                ResourceManager.Get(CanvasLabel.Pi_HomePageArrow0), ResourceManager.Get(CanvasLabel.Pi_ShareBg));
+            ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().Pause();
+            ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().InOrigin = true;
+
+            ResourceManager.AddButtonEventOnetime(CanvasLabel.Pi_TutorialBg, EndHomePageDesc);
+        });
+    }
+
+    public static void ClickMineTabButton()
+    {
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
+
+        ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().InDestination = true;
+
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.Pi_MineTabButtonArrow), ResourceManager.Get(CanvasLabel.Pi_MineTabButton));
+
+        ResourceManager.PushButtonEventOnetime
+        (
+            CanvasLabel.Pi_MineTabButton,
+            () =>
+            {
+                EndClickMineTabButton();
+            }
+        );
+    }
+
+    public static void ShowLeaveDesc()
+    {
+        ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.Pi_LeaveTipBK, true);
+        LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.Pi_LeaveTipBK));
+        //Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.P_Close), ResourceManager.Get(CanvasLabel.Pi_ShareBg));
+
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.Pi_ShareArrow), ResourceManager.Get(CanvasLabel.Pi_ShareBg));
+        ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().Pause();
+        ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().InOrigin = true;
+
+        ResourceManager.AddButtonEventOnetime(CanvasLabel.Pi_Share, EndLeaveDesc);
+    }
+
+    public static void ShowCloseDesc()
+    {
+        ResourceManager.SetActive(CanvasLabel.P_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.P_CloseTipBK, true);
+
+        DelayCall.Call
+        (
+            0.5f,
+            () =>
+            {
+                LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.P_CloseTipBK));
+
+                ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.P_CloseArrow0), ResourceManager.Get(CanvasLabel.P_CloseArrow1), ResourceManager.Get(CanvasLabel.Pi_ShareBg));
+                ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().Pause();
+                ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().InOrigin = true;
+            }
+        );
+
+        ResourceManager.AddButtonEventOnetime(CanvasLabel.P_TutorialBg, EndCloseDesc);
+    }
+
+    public static void ClickShareButton()
+    {
+        ResourceManager.SetActive(CanvasLabel.P_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.P_CreateTipBK, true);
+        DelayCall.Call(0.5f, () => LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.P_CreateTipBK)));
+
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
+
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.Pi_LeaveTipBK), ResourceManager.Get(CanvasLabel.P_FashionShowButton));
+
+        ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().Pause();
+        ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().InOrigin = true;
+
+        ResourceManager.AddButtonEventOnetime
+        (
+            CanvasLabel.P_FashionShowButton,
+            () =>
+            {
+                EndFashionShowTutorial();
+            }
+        );
+    }
 }

Assets/Script/Manage/VisitManager.cs

@@ -118,6 +118,16 @@ public class VisitManager : Regist
 
     public static void Init()
     {
+        MaxTipAmt = 0;
+        for (int i = 1; i < 100; i++)
+        {
+            if (Language.ContainNode(LanguageLabel.Tip, LanguageLabel.Tip + i))
+            {
+                MaxTipAmt++;
+            }
+        }
+        MaxTipAmt++;
+
         XmlAttributeCollection attribute = ConfigManager.GetVisitConfig();
 
         VisitCostFml = attribute[5].Value;
@@ -868,10 +878,10 @@ public class VisitManager : Regist
 
         HudTarget hudTarget = ResourceManager.Get(CanvasLabel.C_Tip).GetComponent<HudTarget>();
         hudTarget.PosTra = VisiteePlayer.ChildDic[PlayerLabel.EnterGameTra];
-
+        
         string languageID = LanguageLabel.Tip + Random.Range(1, MaxTipAmt);
         ResourceManager.Get<Text> (CanvasLabel.C_TipLab).text = Language.GetStr (LanguageLabel.CombineLanguageLabel(LanguageLabel.Tip, languageID));
-	}
+    }
 
 	public static void HideTip()
 	{

Assets/Script/Object/Player.cs

@@ -1722,6 +1722,8 @@ public class Player : Regist , IPointerClickHandler
 
         if (IsDisplayInUGUI)
         {
+            Debug.Log(0);
+
             uguiDisplays.MySort((display1, display0) =>
                     display1.transform.position.z < display0.transform.position.z);
 

Assets/Script/Social/FashionShowEditPage.cs

@@ -90,8 +90,6 @@ public class FashionShowEditPage : Regist
     //private static List<string> CloseNames = new List<string>();
     private static List<FashionShowCloseItem> CloseItems = new List<FashionShowCloseItem>();
 
-    private static int UnlockLevel = 21;
-
     #endregion
 
     public override void RegistReference()
@@ -254,7 +252,7 @@ public class FashionShowEditPage : Regist
             closeItem.ChangeDress(DisplayPlayer, false);
         }
         DelayCall.Call(1, () => { DisplayPlayer.DisplayInUI(37.5f, true);});
-        DelayCall.Call(0.5f, () => { DisplayPlayer.ResetDepth(); });
+        //DelayCall.Call(0.5f, () => { DisplayPlayer.ResetDepth(); });
 
         float cuteRate = FashionShowData.GetCuteRate();
         float gloryRate = FashionShowData.GetGloryRate();
@@ -860,7 +858,7 @@ public class FashionShowEditPage : Regist
         //GardenFashionShowButtonParent.SetActive(false);
         //DressroomFashionShowButton.SetActive(false);
 
-        if (level >= UnlockLevel)
+        if (level >= TutorialManager.FashionShowTutorialLevel)
         {
             GardenFashionShowButtonParent.SetActive(true);
             DressroomFashionShowButton.SetActive(true);

Assets/Script/Social/FashionShowHomePage.cs

@@ -14,8 +14,10 @@ public class FashionShowHomePage : Regist
 	private static Text GloryTabButtonText;
 	private static Text MineTabButtonText;
 	private static Text RecommendTitle;
+	private static Text ShareTxt;
+	private static Button ShareButton;
 	private static Button Return;
-	private static Button HomeTabButton;
+    private static Button HomeTabButton;
 	private static Button CuteTabButton;
 	private static Button GraceTabButton;
 	private static Button VividTabButton;
@@ -76,6 +78,8 @@ public class FashionShowHomePage : Regist
         GloryTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_GloryTabButtonText);
         MineTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_MineTabButtonText);
         RecommendTitle = ResourceManager.Get<Text>(CanvasLabel.Pi_RecommendTitle);
+        ShareTxt = ResourceManager.Get<Text>(CanvasLabel.Pi_Share);
+        ShareButton = ResourceManager.Get<Button>(CanvasLabel.Pi_Share);
         Return = ResourceManager.Get<Button>(CanvasLabel.Pi_Return);
         HomeTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_HomeTabButton);
         CuteTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_CuteTabButton);
@@ -156,8 +160,10 @@ public class FashionShowHomePage : Regist
         LanguageManager.Add(SimpleTabButtonText, new MulLanStr(LanguageLabel.UI__Pg_Simple));
         LanguageManager.Add(MineTabButtonText, new MulLanStr(LanguageLabel.UI__Pg_Mine));
         LanguageManager.Add(RecommendTitle, new MulLanStr(LanguageLabel.UI__Pi_Title));
+        LanguageManager.Add(ShareTxt, new MulLanStr(LanguageLabel.UI__Pi_Share));
 
         Return.onClick.AddListener(OnCloseButtonClick);
+        ShareButton.onClick.AddListener(LeaveToDressRoom);
         OpenHomePageButton.onClick.AddListener(OnOpenButtonClick);
         HomeTabButton.onClick.AddListener(() => OnTabButtonClick(HomeTabButton));
         CuteTabButton.onClick.AddListener(() => OnTabButtonClick(CuteTabButton));
@@ -211,6 +217,10 @@ public class FashionShowHomePage : Regist
         );
 
         ResourceManager.Get(CanvasLabel.C_Main).TweenBacCG();
+        foreach (var tabButton in TabButtons)
+        {
+            tabButton.GetTweenScale().InOrigin = true;
+        }
         OnTabButtonClick(CurrentTabButton);
     }
 
@@ -237,6 +247,15 @@ public class FashionShowHomePage : Regist
         tween.StartBackward();
     }
 
+    public static void LeaveToDressRoom()
+    {
+        GardenManager.RetrieveAllElf();
+        ResourceManager.SetActive(ResourceLabel.Garden, true);
+        TweenRoot tween = Panel.GetTweenVec();
+        tween.StartBackward();
+        ResourceManager.Get<Button>(CanvasLabel.C_DressRoom).onClick.Invoke();
+    }
+
     public static TweenRoot ShowSidePanel()
     {
         return SidePanel.TweenForVec();
@@ -248,6 +267,7 @@ public class FashionShowHomePage : Regist
     }
 
 
+
     private static void OnOpenButtonClick()
     {
         //AudioManager.PlayClip(ResourceLabel.BtnClip);
@@ -285,11 +305,17 @@ public class FashionShowHomePage : Regist
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         for (int i = 0; i < TabButtons.Count; i++)
         {
+            //Debug.Log(TabButtons[i].transform.name);
             TabButtons[i].transform.SetSiblingIndex(i);
             TabButtons[i].TweenBacScale();
             TabButtons[i].interactable = true;
+            //if (TabButtons[i].GetTweenScale().InPause)
+            //{
+            //    TabButtons[i].GetTweenScale().Resume();
+            //}
             ScrollRects[i].transform.parent.SetActive(false);
         }
+        //Debug.Log(button.transform.name);
         button.GetTweenScale().Pause();
         button.transform.SetAsLastSibling();
         button.TweenForScale();

Assets/Script/Tool/Auxiliary.cs

@@ -156,7 +156,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            Manager.Coin = 0;
+            DebugManager.ResetGardenLevel(20);
+            //Manager.Coin = 0;
             //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
             //GardenManager.CreateElfTimer = 0;
             //DebugManager.ResetGardenLevel(50);
@@ -187,32 +188,33 @@ public class Auxiliary : Regist
             //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
         }
 
-        //if (Input.GetKeyDown(KeyCode.A))
-        //{
-        //    XmlDocument document = new XmlDocument();
-        //    Debug.Log(ConfigManager.ConfigDocument.InnerXml);
-        //    Debug.Log(ConfigManager.ConfigDocument.OuterXml);
-        //    document.LoadXml(ConfigManager.ConfigDocument.InnerXml);
-        //    XmlNode rootNode = document.SelectSingleNode(PlayerConfigLabel.RootNode);
-        //    rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorial));
-        //    rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorialIndex));
-        //    rootNode.SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 15.ToString();
-        //    rootNode.SelectSingleNode(PlayerConfigLabel.ID).Attributes[0].Value = "jrjL84";
-        //    rootNode.SelectSingleNode(PlayerConfigLabel.SerialNumber).Attributes[0].Value = "1708014471457405866";
-
-        //    URLRequestData urlData = new URLRequestData();
-        //    urlData.Add("u", "1708014471457405866");
-        //    urlData.Add("v", "1");
-        //    urlData.Add("l", rootNode.OuterXml);
-        //    URLRequest.CreateStrURLRequest(false, HttpManager.SaveURL, urlData, data => { Debug.Log(data); }, URLRequest.Method.POST);
-
-        //    StringFilter.ContainSensitiveWord("真");
-        //    TutorialManager.findMissingMinigameTutorial = true;
-        //    DebugManager.ResetGardenLevel(30);
-        //    Manager.Diamond = 1000;
-        //    PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
-        //    FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
-        //}
+        if (Input.GetKeyDown(KeyCode.A))
+        {
+            TutorialManager.fashionShowTutorial = true;
+            //XmlDocument document = new XmlDocument();
+            //Debug.Log(ConfigManager.ConfigDocument.InnerXml);
+            //Debug.Log(ConfigManager.ConfigDocument.OuterXml);
+            //document.LoadXml(ConfigManager.ConfigDocument.InnerXml);
+            //XmlNode rootNode = document.SelectSingleNode(PlayerConfigLabel.RootNode);
+            //rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorial));
+            //rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorialIndex));
+            //rootNode.SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 15.ToString();
+            //rootNode.SelectSingleNode(PlayerConfigLabel.ID).Attributes[0].Value = "jrjL84";
+            //rootNode.SelectSingleNode(PlayerConfigLabel.SerialNumber).Attributes[0].Value = "1708014471457405866";
+
+            //URLRequestData urlData = new URLRequestData();
+            //urlData.Add("u", "1708014471457405866");
+            //urlData.Add("v", "1");
+            //urlData.Add("l", rootNode.OuterXml);
+            //URLRequest.CreateStrURLRequest(false, HttpManager.SaveURL, urlData, data => { Debug.Log(data); }, URLRequest.Method.POST);
+
+            //StringFilter.ContainSensitiveWord("真");
+            //TutorialManager.findMissingMinigameTutorial = true;
+            //DebugManager.ResetGardenLevel(30);
+            //Manager.Diamond = 1000;
+            //PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
+            //FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
+        }
 
         //if (Input.GetKeyDown(KeyCode.S))
         //{

Assets/Script/Tool/DashGame/Language.cs

@@ -275,6 +275,26 @@ public class Language
         return GetStr(page, id, LanguageManager.CurrentLanguage);
     }
 
+    public static bool ContainNode(string page, string id)
+    {
+        CurrentLanguage language = LanguageManager.CurrentLanguage;
+        List<XmlDocument> documents = XmlDocumentDictionary[language];
+        foreach (var document in documents)
+        {
+            XmlNode pageNode = document.SelectSingleNode("lan/" + page);
+            if (pageNode == null)
+            {
+                continue;
+            }
+            XmlNode node = pageNode.SelectSingleNode(id);
+            if (node != null)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public static string GetStr(string page, string id, CurrentLanguage language)
     {
         if (Initializer.Instance.AuditEdition)

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.11
+  bundleVersion: 1.3.0
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 23
+  AndroidBundleVersionCode: 24
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 15
+  iPhoneBuildNumber: 16
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0