正式版

Assets/Resource/Prefab/Object/Player.prefab

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

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -645,6 +645,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1343842509269482
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224123597743654216}
+  m_Layer: 5
+  m_Name: C_DressRoomLabPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1351733696706804
 GameObject:
   m_ObjectHideFlags: 1
@@ -1327,6 +1342,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1591355901390800
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224963544489202826}
+  m_Layer: 5
+  m_Name: C_ManageArrow0
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1591962986494202
 GameObject:
   m_ObjectHideFlags: 1
@@ -1751,7 +1781,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224713315808876022}
   m_Layer: 5
-  m_Name: C_ManageArrow0
+  m_Name: C_DressRoomArrow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7846,7 +7876,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
-  m_Children: []
+  m_Children:
+  - {fileID: 224713315808876022}
+  - {fileID: 224123597743654216}
   m_Father: {fileID: 224686880427899620}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7855,6 +7887,24 @@ RectTransform:
   m_AnchoredPosition: {x: 40, y: -111}
   m_SizeDelta: {x: 80, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224123597743654216
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343842509269482}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224106350729927538}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -76.999985, y: -136}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224133419404342274
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8681,7 +8731,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224713315808876022}
+  - {fileID: 224963544489202826}
   m_Father: {fileID: 224686880427899620}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9365,7 +9415,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224455867312941770}
+  m_Father: {fileID: 224106350729927538}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.43}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -9964,6 +10014,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224963544489202826
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1591355901390800}
+  m_LocalRotation: {x: 0, y: 0, z: -0.0473679, w: 0.9988775}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224455867312941770}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.43}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -77, y: -57.1}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224968406053400154
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -2157,7 +2157,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 20
-    m_Alignment: 4
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -4993,9 +4993,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 72.15319, y: 0}
   m_SizeDelta: {x: 144.30656, y: 28.978102}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 1.0000001, y: 0.5}
 --- !u!224 &224263342671351332
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Resource/XML/PlayerConfig.xml

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

Assets/Script/Manage/ManaCenter.cs

@@ -204,6 +204,14 @@ public class ManaCenter : Regist
             {
                 ManaReso.Get<Image>("C_DressRoom").material = null;
             }
+
+            if (ManaGarden.MyFlower >= 2 && Level_ >= 22)
+            {
+                if (ManaTutorial.TutorialE_)
+                {
+                    ManaTutorial.EnterE1();
+                }
+            }
         }
     }
     public static float Person
@@ -1141,27 +1149,4 @@ public class ManaCenter : Regist
             }
         }
     }
-}
-
-#region DebugList
-
-//离线期间的收入
-//{
-//  技能等级大于1时
-//  有单个临时加成时
-//  有单个永久加成时
-//  有多个临时加成时
-//  有多个永久加成时
-//}
-
-//离线期间的使用时间
-//离线期间的冷却时间
-//离线期间从使用变为冷却
-
-//技能的存档
-//技能的效果
-//技能的Reactive
-//技能升级后的效果
-//技能结束后的效果
-
-#endregion
+}

Assets/Script/Manage/ManaGarden.cs

@@ -65,7 +65,7 @@ public class ManaGarden : Regist
             ManaReso.SetText("F_FlowerLab", string.Format("{0}", MyFlower));
             ManaReso.SetText("G_CollectLab1", string.Format("{0}/{1}", MyFlower, TotalFlower));
 
-            if (MyFlower_ >= 2)
+            if (MyFlower_ >= 2 && ManaCenter.Level >= 22)
             {
                 if (ManaTutorial.TutorialE_)
                 {

Assets/Script/Manage/ManaMiniGame.cs

@@ -1178,7 +1178,7 @@ public class ManaMiniGame : Regist
         D_Operate3.SetActive(false);
 
         bool gameAvailibleB = ManaCenter.Level >= 18;
-        bool gameAvailibleC = ManaGarden.MyFlower >= 2;
+        bool gameAvailibleC = ManaGarden.MyFlower >= 2 && ManaCenter.Level >= 22;
 
         float thresholdA;
         float thresholdB;
@@ -1544,7 +1544,7 @@ public class ManaMiniGame : Regist
         D_Operate3.SetActive(true);
 
         ManaReso.SetActive("D_Begin", true);
-        ManaReso.SetActive("D_DescB", true);
+        ManaReso.SetActive("D_DescC", true);
 
         ManaReso.SetActive("D_FlowerBtn7", false);
         ManaReso.SetActive("D_FlowerBtn8", false);

Assets/Script/Manage/ManaTutorial.cs

@@ -1008,16 +1008,27 @@ public class ManaTutorial : Regist
                 {
                     ManaReso.Get("F_Manage").TweenBacGra();
 
-                    tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
+                    tweenRoot = ManaReso.Get("C_Main").GetTweenCG();
 
                     tweenRoot.AddEventOnetime
                     (
-                        EventType.BackwardFinish,
+                        EventType.ForwardStart,
                         () =>
                         {
                             EnterD2();
                         }
                     );
+
+                    //tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
+
+                    //tweenRoot.AddEventOnetime
+                    //(
+                    //    EventType.BackwardFinish,
+                    //    () =>
+                    //    {
+                    //        EnterD2();
+                    //    }
+                    //);
                 }
             );
         }
@@ -1029,38 +1040,58 @@ public class ManaTutorial : Regist
 
     public static void EnterD2()
     {
-        ManaReso.Get("B_SignIn0").TweenBacCG();
-
-        ManaReso.Get("C_Main2").TweenBacCG();
-
         ManaReso.SetActive("N_Tutorial", true);
 
         ManaReso.Get("N_Mask").TweenForGra();
 
+        Tutorial.HightScreen(ManaReso.Get("C_DressRoomArrow"), ManaReso.Get("C_DressRoom"));
+
+        ManaReso.AddButtonEventOnetime
+            (
+                "C_DressRoom",
+                () =>
+                {
+                    EndD();
+                }
+            );
+
         ManaReso.SetText("N_Lab", Language.GetStr("UI", "N_Lab"));
 
-        Tutorial.MaskLock = true;
+        Tutorial.ShowDescriptScreen(ManaReso.Get("C_DressRoomLabPos").position);
 
-        Tutorial.SetArea(ManaPlayer.Player.ChildDic["HighLightPos"], 0.1f, 0.2f);
 
-        Tutorial.SetUIButton(ManaPlayer.Player.ChildDic["HighLightPos"].position, 0.1f, 0.2f);
+        //ManaReso.Get("B_SignIn0").TweenBacCG();
 
-        Tutorial.ShowDescriptScene(ManaPlayer.Player.ChildDic["LabPos"].position);
+        //ManaReso.Get("C_Main2").TweenBacCG();
 
-        Tutorial.PointScene(ManaPlayer.Player.ChildDic["Arrow"].position, ManaPlayer.Player.transform);
+        //ManaReso.SetActive("N_Tutorial", true);
 
-        ManaReso.AddButtonEventOnetime
-        (
-            "N_Button",
-            () =>
-            {
-                ManaAudio.PlayClip(Clip.BtnClip);
+        //ManaReso.Get("N_Mask").TweenForGra();
 
-                ManaPlayer.Player.EnterDressRoom();
+        //ManaReso.SetText("N_Lab", Language.GetStr("UI", "N_Lab"));
 
-                EndD();
-            }
-        );
+        //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",
+        //    () =>
+        //    {
+        //        ManaAudio.PlayClip(Clip.BtnClip);
+
+        //        ManaPlayer.Player.EnterDressRoom();
+
+        //        EndD();
+        //    }
+        //);
     }
 
 

Assets/Script/Object/Player.cs

@@ -331,7 +331,32 @@ public class CloseUnit
                 },
                 StaticsManager.ItemID.解锁服装,
                 StaticsManager.ConsumeModule.Shop,
-                false
+                true,
+                false,
+                () =>
+                {
+                    ManaPlayer.Player.Reset();
+
+                    TweenRoot tweenRoot = ManaReso.Get("Pa_Info").TweenBacCG();
+
+                    tweenRoot.AddEventOnetime
+                        (
+                            EventType.BackwardFinish,
+                            () =>
+                            {
+                                ManaPlayer.Player.Return();
+                            }
+                        );
+
+                    ManaReso.Get("B_SignIn0").GetTweenCG().AddEventOnetime
+                        (
+                            EventType.ForwardFinish,
+                            () =>
+                            {
+                                ManaReso.Get("F_Manage0").TweenForVec();
+                            }
+                        );
+                }
             );
     }
 
@@ -684,6 +709,8 @@ public class Player : Regist , IPointerClickHandler
             return;
         }
 
+        ChildDic["ShadowParent"].SetActive(true);
+
         ManaReso.Get("B_SignIn0").TweenBacCG();
 
         InDressRoom = true;
@@ -710,7 +737,7 @@ public class Player : Regist , IPointerClickHandler
                         ManaGarden.PlantList[i].Flower.RetrieveElf();
                     }
 
-                    ChildDic["ShadowParent"].SetActive(true);
+                    //ChildDic["ShadowParent"].SetActive(true);
 
                     transform.SetParent(ManaReso.Get("DressRoom"));
 

Assets/Script/Tool/Auxiliary.cs

@@ -169,6 +169,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
+            //ManaTutorial.EnterD1();
+
             //ManaCenter.MiniTimer = 0;
         }
 

ProjectSettings/ProjectSettings.asset

@@ -122,7 +122,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.0.6
+  bundleVersion: 1.1.0
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1

ToList.txt

@@ -1,4 +1,4 @@
-//关闭调试按键
+//关闭调试按键和界面
 
 先开启Service再打包