Temp 4.19

Assets/Resource/Animations/人物动画/NewProject_ske.json.meta → Assets/Resource/Animations/人物动画/Closet_ske.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: ccf88a33052ce074b8b291f372b38399
-timeCreated: 1492495801
+guid: 0cad47e5fe7664c4889face32561e5f3
+timeCreated: 1492571900
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resource/Animations/人物动画/Closet_tex.json

@@ -0,0 +1 @@
+{"imagePath":"Closet_tex.png","SubTexture":[{"width":165,"y":680,"height":111,"name":"上衣1","x":649},{"width":165,"y":259,"height":111,"name":"上衣2","x":718},{"width":165,"y":793,"height":111,"name":"上衣3","x":649},{"width":264,"y":162,"height":95,"name":"眼睛1","x":718},{"y":906,"frameX":-8,"frameY":-12,"frameHeight":95,"width":231,"frameWidth":264,"height":77,"name":"眼睛2","x":765},{"y":985,"frameX":-14,"frameY":-10,"frameHeight":95,"width":220,"frameWidth":264,"height":78,"name":"眼睛3","x":765},{"width":646,"y":575,"height":391,"name":"脑壳1","x":1},{"width":548,"y":968,"height":424,"name":"脑壳2","x":1},{"width":487,"y":1,"height":572,"name":"脑壳3","x":1},{"y":968,"frameX":0,"frameY":-3,"frameHeight":142,"width":212,"frameWidth":212,"height":135,"name":"裙子1","x":551},{"y":956,"frameX":-22,"frameY":-12,"frameHeight":35,"width":12,"frameWidth":56,"height":10,"name":"嘴巴1","x":705},{"y":378,"frameX":-4,"frameY":0,"frameHeight":142,"width":203,"frameWidth":212,"height":135,"name":"裙子3","x":686},{"width":56,"y":906,"height":35,"name":"嘴巴2","x":649},{"y":943,"frameX":0,"frameY":-2,"frameHeight":35,"width":54,"frameWidth":56,"height":20,"name":"嘴巴3","x":649},{"y":259,"frameX":0,"frameY":-10,"frameHeight":48,"width":31,"frameWidth":44,"height":38,"name":"鞋子1","x":885},{"y":906,"frameX":-5,"frameY":0,"frameHeight":48,"width":39,"frameWidth":44,"height":48,"name":"鞋子2","x":707},{"y":540,"frameX":-3,"frameY":-18,"frameHeight":48,"width":26,"frameWidth":44,"height":30,"name":"鞋子3","x":490},{"width":226,"y":162,"height":214,"name":"头饰品1","x":490},{"width":194,"y":378,"height":160,"name":"头饰品2","x":490},{"width":383,"y":1,"height":159,"name":"头饰品3","x":490},{"y":540,"frameX":-4,"frameY":-4,"frameHeight":142,"width":203,"frameWidth":212,"height":138,"name":"裙子2","x":649}],"name":"Closet_ske"}

Assets/Resource/Animations/人物动画/NewProject_tex.json.meta → Assets/Resource/Animations/人物动画/Closet_tex.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 8358d57ba01f2ec469820eb24f85e6ba
-timeCreated: 1492495801
+guid: cf10bfe715240ea4e87102475ca55678
+timeCreated: 1492571900
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resource/Animations/人物动画/NewProject_tex.png.meta → Assets/Resource/Animations/人物动画/Closet_tex.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 3fc43ca9ad56145478d46b507f6f95e7
-timeCreated: 1492496076
+guid: 773f123d5662f934bbbc06578c4aa120
+timeCreated: 1492583280
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -74,6 +74,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: tvOS
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
     textureFormat: -1
@@ -82,6 +90,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

Assets/Resource/Animations/人物动画/NewProject_ske.json

@@ -1 +0,0 @@
-{"frameRate":24,"armature":[{"bone":[{"name":"root","transform":{}}],"animation":[{"duration":0,"frame":[],"slot":[],"bone":[{"frame":[{"duration":0,"tweenEasing":null,"transform":{}}],"name":"root"}],"ffd":[],"name":"newAnimation","playTimes":0}],"defaultActions":[{"gotoAndPlay":"newAnimation"}],"type":"Armature","frameRate":24,"slot":[{"color":{},"name":"脑壳2","parent":"root"}],"ik":[],"skin":[{"name":"","slot":[{"display":[{"type":"image","name":"脑壳2","transform":{"y":-188.0031,"x":125.3354}}],"name":"脑壳2"}]}],"name":"脑壳2","aabb":{"width":548,"y":-400.00310471661066,"height":424,"x":-148.6645968555929}},{"bone":[{"name":"root","transform":{}}],"animation":[{"duration":0,"frame":[],"slot":[],"bone":[{"frame":[{"duration":0,"tweenEasing":null,"transform":{}}],"name":"root"}],"ffd":[],"name":"newAnimation","playTimes":0}],"defaultActions":[{"gotoAndPlay":"newAnimation"}],"type":"Armature","frameRate":24,"slot":[{"color":{},"name":"脑壳3","parent":"root"}],"ik":[],"skin":[{"name":"","slot":[{"display":[{"type":"image","name":"脑壳3","transform":{}}],"name":"脑壳3"}]}],"name":"脑壳3","aabb":{"width":487,"y":-286,"height":572,"x":-243.5}}],"isGlobal":0,"name":"NewProject_ske","version":"5.0"}

Assets/Resource/Animations/人物动画/NewProject_tex.json

@@ -1 +0,0 @@
-{"name":"NewProject_ske","imagePath":"NewProject_tex.png","SubTexture":[{"width":548,"y":575,"height":424,"name":"脑壳2","x":1},{"width":487,"y":1,"height":572,"name":"脑壳3","x":1}]}

Assets/Resource/Animations/人物动画/stand_ske.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d9cae0096b575ad439815b89ff28bbf0
-timeCreated: 1492393298
+timeCreated: 1492574751
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resource/Animations/人物动画/stand_tex.json

@@ -1 +1 @@
-{"imagePath":"stand_tex.png","SubTexture":[{"width":45,"y":138,"height":188,"name":"腿2个提供1个","x":649},{"width":62,"y":1,"height":183,"name":"右手你的右手！！","x":951},{"y":1,"frameX":0,"frameHeight":142,"frameY":-3,"width":212,"frameWidth":212,"height":135,"name":"裙子1","x":649},{"width":86,"y":1,"height":182,"name":"左手看清左手你的左手！！","x":863},{"width":646,"y":1,"height":391,"name":"脑壳1","x":1},{"width":35,"y":138,"height":51,"name":"脖子","x":696},{"width":165,"y":394,"height":111,"name":"上衣1","x":267},{"y":138,"frameX":0,"frameHeight":48,"frameY":-10,"width":31,"frameWidth":44,"height":38,"name":"鞋子1","x":733},{"y":491,"frameX":-22,"frameHeight":35,"frameY":-12,"width":12,"frameWidth":56,"height":10,"name":"嘴巴1","x":1},{"width":264,"y":394,"height":95,"name":"眼睛1","x":1}],"name":"NewProject"}
+{"imagePath":"stand_tex.png","SubTexture":[{"width":646,"y":1,"height":391,"name":"脑壳1","x":1},{"width":45,"y":370,"height":188,"name":"腿2个提供1个","x":965},{"width":62,"y":185,"height":183,"name":"右手你的右手！！","x":915},{"y":217,"frameX":0,"frameHeight":142,"frameY":-3,"width":212,"frameWidth":212,"height":135,"name":"裙子1","x":649},{"width":86,"y":1,"height":182,"name":"左手看清左手你的左手！！","x":877},{"width":35,"y":185,"height":51,"name":"脖子","x":877},{"y":238,"frameX":0,"frameHeight":48,"frameY":-10,"width":31,"frameWidth":44,"height":38,"name":"鞋子1","x":863},{"y":217,"frameX":-22,"frameHeight":35,"frameY":-12,"width":12,"frameWidth":56,"height":10,"name":"嘴巴1","x":863},{"width":264,"y":354,"height":95,"name":"眼睛1","x":649},{"width":226,"y":1,"height":214,"name":"头饰品1","x":649},{"width":165,"y":394,"height":111,"name":"上衣1","x":1}],"name":"stand_ske"}

Assets/Resource/Animations/人物动画/stand_tex.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 05b6fcf2910d93d4886759a50c715ede
-timeCreated: 1492393298
+timeCreated: 1492574751
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resource/Animations/人物动画/stand_tex.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6c3bef5ff8a6c924e8dba0ef42c17e7d
-timeCreated: 1492393298
+timeCreated: 1492574751
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

Assets/Resource/DragonBones/Unity/src/DragonBones/unity/Editor/UnityEditor.cs

@@ -193,7 +193,7 @@ namespace DragonBones
             return false;
         }
 
-        private static void _changeArmatureData(UnityArmatureComponent _armatureComponent, string armatureName, string dragonBonesName)
+        public static void _changeArmatureData(UnityArmatureComponent _armatureComponent, string armatureName, string dragonBonesName)
         {
             Slot slot = null;
             if (_armatureComponent.armature != null)
@@ -201,7 +201,7 @@ namespace DragonBones
                 slot = _armatureComponent.armature.parent;
                 _armatureComponent.Dispose(false);
             }
-
+            
             _armatureComponent.armatureName = armatureName;
             _armatureComponent = UnityFactory.factory.BuildArmatureComponent(_armatureComponent.armatureName, dragonBonesName, null, null, _armatureComponent.gameObject);
 
@@ -376,7 +376,7 @@ namespace DragonBones
                         var armatureName = _armatureNames[_armatureIndex];
                         _changeArmatureData(_armatureComponent, armatureName, dragonBonesData.name);
                         _updateParameters();
-
+                        
                         _armatureComponent.gameObject.name = armatureName;
 
                         EditorUtility.SetDirty(_armatureComponent);

Assets/Resource/Prefab/Object/Rainbow.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1491544901
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: scene
   assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,7 +1,7 @@
 <PlayerConfig>
-  <Version value="78" />
-  <TutorialA value="1" />
-  <TutorialB value="1" />
+  <Version value="86" />
+  <TutorialA value="0" />
+  <TutorialB value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
 

Assets/Script/Interface/AnimationReceiver.cs

@@ -7,8 +7,8 @@ public class AnimationReceiver : MonoBehaviour
 {
     public void SaveAnim()
     {
-        ManaReso.Save(transform.parent);
-
         GetComponentInParent<Flower>().ElfList.Remove(transform);
+
+        ManaReso.Save(transform.parent);
     }
 }

Assets/Script/Manage/ManaData.cs

@@ -457,7 +457,7 @@ public class ManaData : Regist
 
             #endregion
 
-            SkillDic.Add(skillRoot._Name, skillRoot);
+            SkillDic.Add(skillRoot.ID, skillRoot);
             SkillList.Add(skillRoot);
         }
 

Assets/Script/Manage/ManaMiniGame.cs

@@ -592,7 +592,7 @@ public class ManaMiniGame : Regist
     public static float OpTime = 1.5f;
     public static float OpTimer;
     public static float GoldTimer;
-    public static float GameTime = 45;
+    public static float GameTime = 5;
     public static float PanaltyTime = 1;
     public static float PanaltyTimer;
     public static float DiamondTimer;

Assets/Script/Manage/ManaPlayer.cs

@@ -34,6 +34,9 @@ public class ManaPlayer : Regist
             ManaReso.TraDic.Add(tra.name, tra);
 
 
+            UnityFactory.factory.LoadTextureAtlasData(Bundle.Config.LoadAsset<TextAsset>("Closet_tex"), "Closet_tex");
+            UnityFactory.factory.LoadDragonBonesData(Bundle.Config.LoadAsset<TextAsset>("Closet_ske"));
+
             Player = tra.AddScript<Player>();
 
             if (player == "PlayerPink")
@@ -48,11 +51,6 @@ public class ManaPlayer : Regist
             {
                 Player.BuildBrown();
             }
-
-            //UnityFactory.factory.LoadTextureAtlasData(Bundle.Config.LoadAsset<TextAsset>("NewProject_tex"), "NewProject_tex");
-            //UnityFactory.factory.LoadDragonBonesData(Bundle.Config.LoadAsset<TextAsset>("NewProject_ske"));
-
-            //Player.UAC.armature.GetSlot("脑壳1").childArmature = UnityFactory.factory.BuildArmature("脑壳2");
         }
     }
 }

Assets/Script/Manage/ManaTutorial.cs

@@ -28,61 +28,51 @@ public class ManaTutorial : Regist
     {
         if (TutorialA || TutorialB)
         {
-            TutorialRegistC();
-        }
-        else
-        {
-            RegularRegistC();
-        }
-    }
-
-    private void TutorialRegistC()
-    {
-        ManaReso.Get("N_Mask").CreateTweenGra(0, 180 / 255f, 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").CreateTweenGra(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-
-        if (TutorialA)
-        {
-            ManaReso.SetActive("B_SignIn", false);
-            ManaReso.SetActive("N_Tutorial", true);
-
-            if (TutorialIndexA == 1)
-            {
-                PrepareStep1();
-            }
-            else if (TutorialIndexA == 2)
-            {
-                Garden.Instance.TutorialToRegular();
-
-                PrepareStep2();
-            }
-            else if (TutorialIndexA == 4)
-            {
-                Garden.Instance.TutorialToRegular();
-                ManaUI.Instance.TutorialToRegular();
-
-                ManaReso.Get("Tutorial").SetCollider(true);
+            ManaReso.Get("N_Mask").CreateTweenGra(0, 180 / 255f, 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").CreateTweenGra(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
-                ManaReso.SetActive("TutorialMask", true);
-                ManaReso.SetActive("TutorialCollider", true);
-
-                Tutorial.HightScene(0.1f, 0.075f, ManaReso.Get("SlotArrowA1"), ManaReso.Get("SlotA1"));
-            }
-            else if (TutorialIndexA == 6)
+            if (TutorialA)
             {
-                Garden.Instance.TutorialToRegular();
-                ManaUI.Instance.TutorialToRegular();
-
-                PrepareStep6();
+                ManaReso.SetActive("B_SignIn", false);
+                ManaReso.SetActive("N_Tutorial", true);
+
+                if (TutorialIndexA == 1)
+                {
+                    PrepareStep1();
+                }
+                else if (TutorialIndexA == 2)
+                {
+                    Garden.Instance.TutorialToRegular();
+
+                    PrepareStep2();
+                }
+                else if (TutorialIndexA == 4)
+                {
+                    Garden.Instance.TutorialToRegular();
+                    ManaUI.Instance.TutorialToRegular();
+
+                    ManaReso.Get("Tutorial").SetCollider(true);
+
+                    ManaReso.SetActive("TutorialMask", true);
+                    ManaReso.SetActive("TutorialCollider", true);
+
+                    Tutorial.HightScene(0.1f, 0.075f, ManaReso.Get("SlotArrowA1"), ManaReso.Get("SlotA1"));
+                }
+                else if (TutorialIndexA == 6)
+                {
+                    Garden.Instance.TutorialToRegular();
+                    ManaUI.Instance.TutorialToRegular();
+
+                    PrepareStep6();
+                }
             }
         }
-    }
-
-    private void RegularRegistC()
-    {
-        ManaReso.SetActive("N_Tutorial", false);
+        else
+        {
+            ManaReso.SetActive("N_Tutorial", false);
+        }
     }
 
 
@@ -188,7 +178,7 @@ public class ManaTutorial : Regist
                 Tutorial.Player.name = "Player";
                 Tutorial.Player.parent = ManaReso.Get("Garden");
 
-                ManaPlayer.Player = Tutorial.Player.AddScript<Player>();
+                ManaPlayer.Player = Tutorial.Player.GetComponent<Player>();
 
                 ManaReso.TraDic.Add(Tutorial.Player.name, Tutorial.Player);
 
@@ -228,7 +218,7 @@ public class ManaTutorial : Regist
             EventType.ForwardFinish, 
             () =>
             {
-                Tutorial.HightScreen(ManaReso.Get("C_MiniGameArrow"), ManaReso.Get("C_MiniGame"));
+                Tutorial.HightScreen(ManaReso.Get("C_MiniGameArrow0"), ManaReso.Get("C_MiniGameArrow1"), ManaReso.Get("C_MiniGame"));
             }
         );
 
@@ -309,6 +299,7 @@ public class ManaTutorial : Regist
             () =>
             {
                 ManaReso.Get("Tutorial").SetCollider(true);
+                ManaReso.Get<SpriteRenderer>("TutorialMask").material.SetColor("_Color", Color.white);
 
                 Tutorial.HightScene(0.1f, 0.075f, ManaReso.Get("SlotArrowA1"), ManaReso.Get("SlotA1"));
             }
@@ -482,8 +473,8 @@ public class ManaTutorial : Regist
         Transform item = ManaData.SkillDic["Ability2"].SkillItem;
         RectTransform scrr = ManaReso.Get<RectTransform>("Fa_Scrr");
 
-        Vector2 v1 = scrr.rect.center; 
-        Vector2 v2 = item.localPosition;
+        Vector2 v1 = scrr.position + new Vector3(0, scrr.rect.height/2, 0);
+        Vector2 v2 = item.position;
         Vector3 offset = v1 - v2;
 
         offset.x = 0;

Assets/Script/Manage/ManaUI.cs

@@ -33,24 +33,11 @@ public class ManaUI : Regist
 
     public override void RegistValueB()
     {
-        if (ManaTutorial.TutorialA)
-        {
-            TutorialRegistValueB();
-        }
-        else
+        if (!ManaServer.Connect)
         {
-            RegularRegistValueB();
+            ManaReso.SetActive("B_SignIn", false);
         }
-    }
-
-    public override void TutorialToRegular()
-    {
-        HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();
-        hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
-    }
 
-    private void TutorialRegistValueB()
-    {
         #region B
 
         ManaReso.SetText("Ba_Lab");
@@ -490,6 +477,8 @@ public class ManaUI : Regist
 
         #region E
 
+        #region E_Show
+
         ManaReso.SetButtonEvent
         (
             "E_ShowBtn",
@@ -510,6 +499,8 @@ public class ManaUI : Regist
             }
         );
 
+        #endregion
+
         #region E_PauseBtn
 
         ManaReso.AddButtonEvent
@@ -1277,1248 +1268,20 @@ public class ManaUI : Regist
         };
 
         #endregion
-    }
-
-    private void RegularRegistValueB()
-    {
-        if (!ManaServer.Connect)
-        {
-            ManaReso.SetActive("B_SignIn", false);
-        }
-
-        #region B
-
-        ManaReso.SetText("Ba_Lab");
-        ManaReso.SetText("Ba_ConfirmLab");
-
-        ManaReso.SetText("Bb_Title");
-        ManaReso.SetText("Bb_GetLab");
-        ManaReso.SetText("Bb_ConfirmLab");
-
-        #region B_SignIn
-
-        Tween tween = ManaReso.Get("B_SignIn").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            ManaData.MainDepth++;
-        };
-
-        tween.OnBackwardFinish += () =>
-        {
-            ManaData.MainDepth--;
-        };
-
-        #endregion
-
-        #region Ba_Confirm
-
-        ManaReso.AddButtonEvent
-        (
-            "Ba_Confirm",
-            () =>
-            {
-                ManaReso.Get("Bb_SignIn").TweenForCG();
-
-                ManaReso.SetActive("Ba_Notice", false);
-            }
-        );
-
-        #endregion
-
-        #region Bb_Get
-
-        ManaReso.AddButtonEvent
-        (
-            "Bb_Get",
-            () =>
-            {
-                ManaSign.Get();
-
-                ManaReso.SetActive("Bb_Get", false);
-                ManaReso.SetActive("Bb_Info", true);
-                ManaReso.SetActive("Bb_Rotate", true);
-                ManaReso.SetActive("Bb_Confirm", true);
-            }
-        );
-
-        #endregion
-
-        #region Bb_SignIn
-
-        ManaReso.Get("Bb_SignIn").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        #region Bb_Confirm
-
-        ManaReso.AddButtonEvent
-        (
-            "Bb_Confirm",
-            () =>
-            {
-                ManaReso.Get("B_SignIn").TweenBacCG();
-            }
-        );
-
-        #endregion
-
-        #endregion
-
-        #region C
-
-        ManaLan.Add(ManaReso.Get<Text>("C_MiniGameLab"), new LanStr("UI", "C_MiniGameLab"));
-
-        #region C_Main
-
-        tween = ManaReso.Get("C_Main").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            ManaData.MainDepth = -1;
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            ManaData.MainDepth = 0;
-        };
-
-        #endregion
-
-        #region C_Manage
-
-        ManaReso.AddButtonEvent
-        (
-            "C_Manage",
-            () =>
-            {
-                ManaReso.Get("F_Manage0").TweenForVec();
-            }
-        );
-
-        #endregion
-
-        #region C_MiniGame
-
-        tween = ManaReso.Get("C_MiniGame").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
-        tween.OnForwardStart += () =>
+        if (!ManaTutorial.TutorialA)
         {
+            HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();
 
-        };
-
-        ManaReso.AddButtonEvent
-        (
-            "C_MiniGame",
-            () =>
-            {
-                ManaReso.Get("GardenMini").TweenForVec();
+            hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
+        }
+    }
 
-                ManaReso.Get("D_MiniGame").TweenForCG();
-            }
-        );
 
+    public override void TutorialToRegular()
+    {
         HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();
 
         hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
-
-        #endregion
-
-
-        #region C_Setting
-
-        ManaReso.SetButtonEvent
-        (
-            "C_Setting",
-            () =>
-            {
-                ManaReso.Get("L_Setting").TweenForCG();
-            }
-        );
-
-        #endregion
-
-        #region C_Achieve
-
-        ManaReso.AddButtonEvent
-        (
-            "C_Achieve",
-            () =>
-            {
-                ManaReso.Get("M_Achieve0").TweenForVec();
-            }
-        );
-
-        #endregion
-
-        #endregion
-
-        #region D
-
-        ManaReso.SetText("D_ScoreTit");
-        ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
-        ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab0"));
-
-        ManaLan.Add(ManaReso.Get<Text>("Da_Lab"), new LanStr("UI", "Da_Lab"));
-        ManaLan.Add(ManaReso.Get<Text>("Da_ScoreTit"), new LanStr("UI", "Da_ScoreTit"));
-        ManaLan.Add(ManaReso.Get<Text>("Da_QuitLab"), new LanStr("UI", "Da_QuitLab"));
-        ManaLan.Add(ManaReso.Get<Text>("Da_CancelLab"), new LanStr("UI", "Da_CancelLab"));
-        ManaLan.Add(ManaReso.Get<Text>("Da_GetAwardLab"), new LanStr("UI", "Da_GetAwardLab"));
-
-        #region D_Rip
-
-        ManaReso.AddButtonEvent
-        (
-            "D_Rip2",
-            () =>
-            {
-                ManaMiniGame.Operate(OpType.Rip);
-
-                ManaReso.Get("D_Rip2").TweenForScale();
-            }
-        );
-
-        tween = ManaReso.Get("D_Rip2").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.2f, 1.2f, 1.2f), 0.1f, true, true, Curve.EaseOutQuad);
-
-        tween.OnForwardFinish += () =>
-        {
-            ManaReso.Get("D_Rip2").TweenBacScale();
-        };
-
-        #endregion
-
-        #region D_Quit
-
-        ManaReso.AddButtonEvent
-        (
-            "D_Quit",
-            () =>
-            {
-                FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random();
-
-                Vector2 newSize = flowerInfo.Sprite.rect.size;
-                newSize.x *= 0.2f;
-                newSize.y *= 0.2f;
-
-                ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Sprite;
-                ManaReso.Get<Image>("Da_FlowerIcon").rectTransform.sizeDelta = newSize;
-
-                ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID));
-
-
-                ManaReso.SetText("Da_Tit", Language.GetStr("UI", "Da_Tit0"));
-
-                ManaReso.SetActive("Da_Lab", true);
-                ManaReso.SetActive("Da_HGroup", false);
-                ManaReso.SetActive("Da_ScoreTit", false);
-
-                ManaReso.Get("Da_Info").TweenForCG();
-
-                ManaReso.SetActive("Da_Quit", true);
-                ManaReso.SetActive("Da_Cancel", true);
-                ManaReso.SetActive("Da_GetAward", false);
-
-                ManaMiniGame.Pause = true;
-
-                Auxiliary.Instance.DelayCall
-                (
-                    () =>
-                    {
-                        ManaReso.Get<Text>("Da_FlowerLab").SetLayoutDirty();
-                    },
-                    1
-                );
-            }
-        );
-
-        #endregion
-
-        #region D_Begin
-
-        ManaReso.AddButtonEvent
-        (
-            "D_Begin",
-            () =>
-            {
-                ManaMiniGame.Prepare = true;
-            }
-        );
-
-        #endregion
-
-        #region D_Water
-
-        ManaReso.AddButtonEvent
-        (
-            "D_Water2",
-            () =>
-            {
-                ManaMiniGame.Operate(OpType.Water);
-
-                ManaReso.Get("D_Water2").TweenForScale();
-            }
-        );
-
-        tween = ManaReso.Get("D_Water2").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.2f, 1.2f, 1.2f), 0.1f, true, true, Curve.EaseOutQuad);
-
-        tween.OnForwardFinish += () =>
-        {
-            ManaReso.Get("D_Water2").TweenBacScale();
-        };
-
-        #endregion
-
-        #region D_Fertilize
-
-        ManaReso.AddButtonEvent
-        (
-            "D_Fertilize2",
-
-            () =>
-            {
-                ManaMiniGame.Operate(OpType.Fertilize);
-
-                ManaReso.Get("D_Fertilize2").TweenForScale();
-            }
-        );
-
-        tween = ManaReso.Get("D_Fertilize2").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.2f, 1.2f, 1.2f), 0.1f, true, true, Curve.EaseOutQuad);
-
-        tween.OnForwardFinish += () =>
-        {
-            ManaReso.Get("D_Fertilize2").TweenBacScale();
-        };
-
-        #endregion
-
-        #region D_MiniGame
-
-        tween = ManaReso.Get("D_MiniGame").CreateTweenCG(0, 1, 0.5f, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            ManaReso.SetText("D_ScoreTit");
-            ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
-            ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab0"));
-
-            ManaReso.Get("C_Main").TweenBacCG();
-
-            ManaReso.Get("MusicTheme").TweenBacAudio();
-
-            //ManaReso.SetActive("E_Debug", false);
-
-            ManaData.MainDepth++;
-
-            ManaReso.SetActive("Da_Quit", true);
-            ManaReso.SetActive("Da_Cancel", true);
-            ManaReso.SetActive("Da_GetAward", false);
-        };
-
-        tween.OnForwardFinish += () =>
-        {
-            ManaReso.Get("MusicMini").TweenForAudio();
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
-
-            ManaReso.Get("MusicMini").TweenBacAudio();
-        };
-
-        tween.OnBackwardFinish += () =>
-        {
-            ManaReso.Get("MusicTheme").TweenForAudio();
-
-            //ManaReso.SetActive("E_Debug", true);
-        };
-
-        #endregion
-
-
-        #region Da_Quit
-
-        ManaReso.AddButtonEvent
-        (
-            "Da_Quit",
-            () =>
-            {
-                ManaReso.Get("C_Main").TweenForCG();
-
-                ManaReso.Get("D_MiniGame").TweenBacCG();
-
-                ManaReso.Get("GardenMini").TweenBacVec();
-
-                ManaReso.Get("Da_Info").TweenBacCG();
-
-                ManaMiniGame.GameEnd();
-            }
-        );
-
-        #endregion
-
-        #region Da_Star
-
-        ManaReso.Get("Da_Star1").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
-        ManaReso.Get("Da_Star2").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
-        ManaReso.Get("Da_Star3").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        #region Da_Info
-
-        ManaReso.Get("Da_Info").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        #region Da_Cancel
-
-        ManaReso.AddButtonEvent
-        (
-            "Da_Cancel",
-            () =>
-            {
-                ManaReso.Get("Da_Info").TweenBacCG();
-
-                ManaMiniGame.Pause = false;
-            }
-        );
-
-        #endregion
-
-        #region Da_Score
-
-        ManaReso.Get("Da_ScoreTit").CreateTweenText(1, 25, 0.25f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        #region Da_GetAward
-
-        ManaReso.AddButtonEvent
-        (
-            "Da_GetAward",
-            () =>
-            {
-                ManaReso.Get("C_Main").TweenForCG();
-
-                ManaReso.Get("D_MiniGame").TweenBacCG();
-
-                ManaReso.Get("GardenMini").TweenBacVec();
-
-                ManaReso.Get("Da_Info").TweenBacCG();
-
-                ManaReso.Get("Da_VGroup").GetComponent<VerticalLayoutGroup>().enabled = true;
-                ManaReso.Get<CanvasGroup>("Da_VGroup").alpha = 0;
-                ManaReso.SetActive("Da_HGroup", false);
-                ManaReso.Get("Da_Info").GetTweenCG().OnForwardFinish = () =>
-                {
-
-                };
-            }
-        );
-
-        #endregion
-
-        ManaReso.Get("Da_GetAward").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-
-        ManaReso.Get("Da_CoinGroup").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
-        ManaReso.Get("Da_FlowerGroup").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
-        ManaReso.Get("Da_DiamondGroup").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        #region E
-
-        #region E_Show
-
-        ManaReso.SetButtonEvent
-        (
-            "E_ShowBtn",
-            () =>
-            {
-                if (ManaReso.Get("E_Group").gameObject.activeSelf)
-                {
-                    ManaReso.SetActive("E_Group", false);
-
-                    ManaReso.SetText("E_ShowLab", "显示");
-                }
-                else
-                {
-                    ManaReso.SetActive("E_Group", true);
-
-                    ManaReso.SetText("E_ShowLab", "隐藏");
-                }
-            }
-        );
-
-        #endregion
-
-        #region E_PauseBtn
-
-        ManaReso.AddButtonEvent
-        (
-            "E_PauseBtn",
-            () =>
-            {
-                ManaDebug.LockBtn();
-            }
-        );
-
-        #endregion
-
-        #region E_CentralBtn
-
-        ManaReso.AddButtonEvent
-        (
-            "E_CentralBtn",
-            () =>
-            {
-                ManaReso.SetActive("Ea_Central", true);
-            }
-        );
-
-        #endregion
-
-
-        #region Ea_Cool
-
-        ManaReso.AddButtonEvent
-        (
-            "Ea_Cool",
-            () =>
-            {
-                for (int i = 0; i < ManaData.SkillList.Count; i++)
-                {
-                    ManaData.SkillList[i].ReceiveCool(1, true, true);
-                }
-            }
-        );
-
-        #endregion
-
-        #region Ea_Save
-
-        ManaReso.AddButtonEvent
-        (
-            "Ea_Save",
-            () =>
-            {
-                Data.SavePlayerConfig();
-            }
-        );
-
-        #endregion
-
-        #region Ea_Close
-
-        ManaReso.AddButtonEvent
-        (
-            "Ea_Close",
-            () =>
-            {
-                ManaReso.SetActive("Ea_Central", false);
-            }
-        );
-
-        #endregion
-
-        #region Ea_Reset
-
-        ManaReso.AddButtonEvent
-        (
-            "Ea_Reset",
-            () =>
-            {
-                Data.ResetPlayerConfig();
-            }
-        );
-
-        #endregion
-
-        #region Ea_Current
-
-        ManaReso.AddButtonEvent
-        (
-            "Ea_Current",
-            () =>
-            {
-                //ManaData.Coin += 1000;
-                //ManaData.Diamond += 1000;
-                ManaData.Free = true;
-            }
-        );
-
-        #endregion
-
-        #region Ea_Upgrade
-
-        ManaReso.AddButtonEvent
-        (
-            "Ea_Upgrade",
-            () =>
-            {
-                ManaData.Level += 20;
-            }
-        );
-
-        #endregion
-
-        #endregion
-
-        #region F
-
-        ManaLan.Add(ManaReso.Get<Text>("F_ElfLab"), new LanStr("UI", "F_ElfLab"));
-        ManaLan.Add(ManaReso.Get<Text>("F_StoreLab"), new LanStr("UI", "F_StoreLab"));
-        ManaLan.Add(ManaReso.Get<Text>("F_MagicLab"), new LanStr("UI", "F_MagicLab"));
-        ManaLan.Add(ManaReso.Get<Text>("F_GardenLab"), new LanStr("UI", "F_GardenLab"));
-
-        ManaLan.Add(ManaReso.Get<Text>("Fg_Tit"), new LanStr("UI", "Fg_Tit"));
-        ManaLan.Add(ManaReso.Get<Text>("Fg_Lab"), new LanStr("UI", "Fg_Lab"));
-        ManaLan.Add(ManaReso.Get<Text>("Fg_BtnLab"), new LanStr("UI", "Fg_BtnLab"));
-
-        #region F_Close
-
-        ManaReso.AddButtonEvent
-        (
-            "F_Close",
-            () =>
-            {
-                ManaReso.Get("F_Manage").TweenBacGra();
-            }
-        );
-
-        #endregion
-
-        #region F_Flower
-
-        ManaReso.AddButtonEvent
-        (
-            "F_Flower",
-            () =>
-            {
-                ManaReso.Get("G_Flower").TweenForCG();
-            }
-        );
-
-        #endregion
-
-        #region F_TabBtn
-
-        ManaReso.Get("F_Elf").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
-        ManaReso.Get("F_Store").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
-        ManaReso.Get("F_Magic").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
-        ManaReso.Get("F_Garden").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
-
-        ManaReso.AddButtonEvent
-        (
-            "F_Elf",
-            () =>
-            {
-                ManaReso.Get("F_Elf").TweenForScale();
-                ManaReso.Get("F_Store").TweenConBacScale();
-                ManaReso.Get("F_Magic").TweenConBacScale();
-                ManaReso.Get("F_Garden").TweenConBacScale();
-
-                ManaReso.Get("F_Elf").SetAsLastSibling();
-                ManaReso.Get("F_Store").SetSiblingIndex(0);
-                ManaReso.Get("F_Magic").SetSiblingIndex(1);
-                ManaReso.Get("F_Garden").SetSiblingIndex(2);
-
-                ManaReso.Get<Button>("F_Elf").interactable = false;
-                ManaReso.Get<Button>("F_Store").interactable = true;
-                ManaReso.Get<Button>("F_Magic").interactable = true;
-                ManaReso.Get<Button>("F_Garden").interactable = true;
-
-                ManaReso.SetActive("Fd_Elf", true);
-                ManaReso.SetActive("Fc_Store", false);
-                ManaReso.SetActive("Fb_Magic", false);
-                ManaReso.SetActive("Fa_Garden", false);
-
-                ManaReso.SetActive("F_ElfIcon", true);
-                ManaReso.SetActive("F_StoreIcon", false);
-                ManaReso.SetActive("F_MagicIcon", false);
-                ManaReso.SetActive("F_GardenIcon", false);
-
-                ManaReso.SetActive("Ff_SkillBar", false);
-            }
-        );
-
-        ManaReso.AddButtonEvent
-        (
-            "F_Store",
-            () =>
-            {
-                ManaReso.Get("F_Elf").TweenConBacScale();
-                ManaReso.Get("F_Store").TweenForScale();
-                ManaReso.Get("F_Magic").TweenConBacScale();
-                ManaReso.Get("F_Garden").TweenConBacScale();
-
-                ManaReso.Get("F_Elf").SetSiblingIndex(1);
-                ManaReso.Get("F_Store").SetAsLastSibling();
-                ManaReso.Get("F_Magic").SetSiblingIndex(0);
-                ManaReso.Get("F_Garden").SetSiblingIndex(2);
-
-                ManaReso.Get<Button>("F_Elf").interactable = true;
-                ManaReso.Get<Button>("F_Store").interactable = false;
-                ManaReso.Get<Button>("F_Magic").interactable = true;
-                ManaReso.Get<Button>("F_Garden").interactable = true;
-
-                ManaReso.SetActive("Fd_Elf", false);
-                ManaReso.SetActive("Fc_Store", true);
-                ManaReso.SetActive("Fb_Magic", false);
-                ManaReso.SetActive("Fa_Garden", false);
-
-                ManaReso.SetActive("F_ElfIcon", false);
-                ManaReso.SetActive("F_StoreIcon", true);
-                ManaReso.SetActive("F_MagicIcon", false);
-                ManaReso.SetActive("F_GardenIcon", false);
-
-                ManaReso.SetActive("Ff_SkillBar", false);
-            }
-        );
-
-        ManaReso.AddButtonEvent
-        (
-            "F_Magic",
-            () =>
-            {
-                ManaReso.Get("F_Elf").TweenConBacScale();
-                ManaReso.Get("F_Store").TweenConBacScale();
-                ManaReso.Get("F_Magic").TweenForScale();
-                ManaReso.Get("F_Garden").TweenConBacScale();
-
-                ManaReso.Get("F_Elf").SetSiblingIndex(1);
-                ManaReso.Get("F_Store").SetSiblingIndex(0);
-                ManaReso.Get("F_Magic").SetAsLastSibling();
-                ManaReso.Get("F_Garden").SetSiblingIndex(2);
-
-                ManaReso.Get<Button>("F_Elf").interactable = true;
-                ManaReso.Get<Button>("F_Store").interactable = true;
-                ManaReso.Get<Button>("F_Magic").interactable = false;
-                ManaReso.Get<Button>("F_Garden").interactable = true;
-
-                ManaReso.SetActive("Fd_Elf", false);
-                ManaReso.SetActive("Fc_Store", false);
-                ManaReso.SetActive("Fb_Magic", true);
-                ManaReso.SetActive("Fa_Garden", false);
-
-                ManaReso.SetActive("F_ElfIcon", false);
-                ManaReso.SetActive("F_StoreIcon", false);
-                ManaReso.SetActive("F_MagicIcon", true);
-                ManaReso.SetActive("F_GardenIcon", false);
-
-                ManaReso.SetActive("Ff_SkillBar", false);
-            }
-        );
-
-        ManaReso.AddButtonEvent
-        (
-            "F_Garden",
-            () =>
-            {
-                ManaReso.Get("F_Elf").TweenConBacScale();
-                ManaReso.Get("F_Store").TweenConBacScale();
-                ManaReso.Get("F_Magic").TweenConBacScale();
-                ManaReso.Get("F_Garden").TweenForScale();
-
-                ManaReso.Get("F_Elf").SetSiblingIndex(2);
-                ManaReso.Get("F_Store").SetSiblingIndex(0);
-                ManaReso.Get("F_Magic").SetSiblingIndex(1);
-                ManaReso.Get("F_Garden").SetAsLastSibling();
-
-                ManaReso.Get<Button>("F_Elf").interactable = true;
-                ManaReso.Get<Button>("F_Store").interactable = true;
-                ManaReso.Get<Button>("F_Magic").interactable = true;
-                ManaReso.Get<Button>("F_Garden").interactable = false;
-
-                ManaReso.SetActive("Fd_Elf", false);
-                ManaReso.SetActive("Fc_Store", false);
-                ManaReso.SetActive("Fb_Magic", false);
-                ManaReso.SetActive("Fa_Garden", true);
-
-                ManaReso.SetActive("F_ElfIcon", false);
-                ManaReso.SetActive("F_StoreIcon", false);
-                ManaReso.SetActive("F_MagicIcon", false);
-                ManaReso.SetActive("F_GardenIcon", true);
-
-                if (ManaData.SkillBarValid)
-                {
-                    ManaReso.SetActive("Ff_SkillBar", true);
-                }
-            }
-        );
-
-        #endregion
-
-        #region F_Manage
-
-        tween = ManaReso.Get("F_Manage").CreateTweenGra(new Color(0, 0, 0, 180 / 255f), 0.5f, true, true, Curve.EaseOutQuad);
-
-        var tween1 = tween;
-        tween.OnForwardStart += () =>
-        {
-            tween1.Duration = 0.5f;
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            tween1.Duration = 0.25f;
-        };
-
-        tween.OnBackwardFinish += () =>
-        {
-            ManaReso.Get("F_Manage0").TweenBacVec();
-        };
-
-        tween = ManaReso.Get("F_Manage0").CreateTweenVec2D(ManaReso.Get("F_PosTra").position, 0.5f, false, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            ManaReso.Get("C_Main").TweenBacCG();
-
-            ManaReso.SetActive("F_Manage", true);
-
-            ManaData.MainDepth++;
-        };
-
-        tween.OnForwardFinish += () =>
-        {
-            ManaReso.Get("F_Manage").TweenForGra();
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            ManaData.MainDepth--;
-        };
-
-        tween.OnBackwardFinish += () =>
-        {
-            ManaReso.Get("C_Main").TweenForCG();
-
-            ManaReso.SetActive("F_Manage", false);
-            ManaReso.SetActive("F_Manage0", false);
-        };
-
-        #endregion
-
-
-        #region Fa_Scrr
-
-        RectTransform rectTra1 = ManaReso.Get<RectTransform>("Fa_Scrr");
-        RectTransform rectTra2 = ManaReso.Get<RectTransform>("Ff_SkillBar");
-
-        rectTra1.CreateTweenRect(rectTra1.rect.size + new Vector2(0, -rectTra2.rect.height), 0.25f, true, true, Curve.EaseOutQuad);
-
-        #endregion
-
-
-        #region Fe_Info
-
-        ManaReso.Get("Fe_Info").CreateTweenCG(0f, 1f, 0.1f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        #region Fe_Close
-
-        ManaReso.AddButtonEvent
-        (
-            "Fe_Close",
-            () =>
-            {
-                ManaReso.Get("Fe_Info").TweenBacCG();
-            }
-        );
-
-        #endregion
-
-
-        #region Fg_Btn
-
-        ManaReso.AddButtonEvent
-        (
-            "Fg_Btn",
-            () =>
-            {
-                ManaServer.Connect = true;
-                ManaReso.Get("Fg_Reconnect").TweenBacCG();
-            }
-        );
-
-        #endregion
-
-        #region Fg_Close
-
-        ManaReso.AddButtonEvent
-        (
-            "Fg_Close",
-            () =>
-            {
-                ManaReso.Get("Fg_Reconnect").TweenBacCG();
-            }
-        );
-
-        #endregion
-
-        #region Fg_Reconnect
-
-        ManaReso.Get("Fg_Reconnect").CreateTweenCG(0f, 1f, 0.1f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        #endregion
-
-        #region G
-
-        ManaLan.Add(ManaReso.Get<Text>("G_Tit"), new LanStr("UI", "G_Tit"));
-        ManaLan.Add(ManaReso.Get<Text>("G_SpecialLab"), new LanStr("UI", "G_SpecialLab"));
-        ManaLan.Add(ManaReso.Get<Text>("G_RegularLab"), new LanStr("UI", "G_RegularLab"));
-        ManaLan.Add(ManaReso.Get<Text>("G_RetrieveLab"), new LanStr("UI", "G_RetrieveLab"));
-
-        #region G_Close
-
-        ManaReso.AddButtonEvent
-        (
-            "G_Close",
-            () =>
-            {
-                ManaReso.Get("G_Flower").TweenBacCG();
-            }
-        );
-
-        #endregion
-
-        #region G_Flower
-
-        tween = ManaReso.Get("G_Flower").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            if (ManaData.MainDepth == -1)
-            {
-                ManaReso.Get("C_Main").TweenBacCG();
-            }
-
-            ManaData.MainDepth++;
-
-            if (ManaGarden.MyFlowerSpec == 0)
-            {
-                ManaReso.SetActive("G_Special", false);
-            }
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            ManaData.MainDepth--;
-        };
-
-        #endregion
-
-        #region G_Special
-
-        ManaReso.AddButtonEvent
-        (
-            "G_Special",
-            () =>
-            {
-                ManaReso.SetActive("G_SpecialScrr", true);
-                ManaReso.SetActive("G_RegularScrr", false);
-
-                ManaReso.Get<Button>("G_Special").interactable = false;
-                ManaReso.Get<Button>("G_Regular").interactable = true;
-            }
-        );
-
-        #endregion
-
-        #region G_Regular
-
-        ManaReso.Get("G_Regular").CreateTweenVec2D(ManaReso.Get("G_PosTraL").position, ManaReso.Get("G_PosTraR").position, 0.25f, false, true, true, Curve.EaseOutQuad);
-
-        ManaReso.AddButtonEvent
-        (
-            "G_Regular",
-            () =>
-            {
-                ManaReso.SetActive("G_SpecialScrr", false);
-                ManaReso.SetActive("G_RegularScrr", true);
-
-                ManaReso.Get<Button>("G_Special").interactable = true;
-                ManaReso.Get<Button>("G_Regular").interactable = false;
-            }
-        );
-
-        #endregion
-
-        #region G_Retrieve
-
-        ManaReso.AddButtonEvent
-        (
-            "G_Retrieve",
-            () =>
-            {
-                ManaReso.Get("G_Flower").TweenBacCG();
-
-                ManaGarden.RetriveFlowerAll();
-            }
-        );
-
-        #endregion
-
-        #endregion
-
-        #region H
-
-        ManaLan.Add(ManaReso.Get<Text>("H_RetrieveLab"), new LanStr("UI", "H_RetrieveLab"));
-
-        #region H_Close
-
-        ManaReso.AddButtonEvent
-        (
-            "H_Close",
-            () =>
-            {
-                ManaReso.Get("H_FlowerCard").TweenBacCG();
-            }
-        );
-
-        #endregion
-
-        #region H_Retrieve
-
-        ManaReso.AddButtonEvent
-        (
-            "H_Retrieve",
-
-            () =>
-            {
-                ManaReso.Get("H_FlowerCard").TweenBacCG();
-
-                ManaGarden.RetriveFlower();
-            }
-        );
-
-        #endregion
-
-        #region H_FlowerCard
-
-        tween = ManaReso.Get("H_FlowerCard").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            if (ManaData.MainDepth == -1)
-            {
-                ManaReso.Get("C_Main").TweenBacCG();
-            }
-
-            ManaData.MainDepth++;
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            ManaData.MainDepth--;
-        };
-
-        #endregion
-
-        #endregion
-
-        #region I
-
-        ManaReso.Get("I_BlackMask").CreateTweenGra(new Color(0, 0, 0, 0), 0.5f, true, false, Curve.EaseOutQuad);
-
-        ManaReso.Get("I_BlackMask").TweenForGra();
-
-        #endregion
-
-        #region K
-
-        ManaReso.Get("K_QuitGame").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-
-        ManaReso.AddButtonEvent
-        (
-            "K_Cancel",
-            () =>
-            {
-                ManaReso.Get("K_QuitGame").TweenBacCG();
-            }
-        );
-
-        ManaReso.AddButtonEvent
-        (
-            "K_Confirm",
-            () =>
-            {
-                Application.Quit();
-            }
-        );
-
-        #endregion
-
-        #region L
-
-        ManaLan.Add(ManaReso.Get<Text>("L_UserTit"), new LanStr("UI", "L_UserTit"));
-        ManaLan.Add(ManaReso.Get<Text>("L_ChangeLab"), new LanStr("UI", "L_ChangeLab"));
-        ManaLan.Add(ManaReso.Get<Text>("L_AudioTit"), new LanStr("UI", "L_AudioTit"));
-        ManaLan.Add(ManaReso.Get<Text>("L_MusicLab"), new LanStr("UI", "L_MusicLab"));
-        ManaLan.Add(ManaReso.Get<Text>("L_AudioLab"), new LanStr("UI", "L_AudioLab"));
-        ManaLan.Add(ManaReso.Get<Text>("L_ReportTit"), new LanStr("UI", "L_ReportTit"));
-        ManaLan.Add(ManaReso.Get<Text>("L_ReportLab"), new LanStr("UI", "L_ReportLab"));
-        ManaLan.Add(ManaReso.Get<Text>("L_ConfirmLab"), new LanStr("UI", "L_ConfirmLab"));
-        ManaLan.Add(ManaReso.Get<Text>("L_LanguageTit"), new LanStr("UI", "L_LanguageTit"));
-        ManaLan.Add(ManaReso.Get<Text>("L_TraChiLab"), new LanStr("UI", "L_TraChiLab"));
-        ManaLan.Add(ManaReso.Get<Text>("L_EnglishLab"), new LanStr("UI", "L_EnglishLab"));
-        ManaLan.Add(ManaReso.Get<Text>("L_SimChiLab"), new LanStr("UI", "L_SimChiLab"));
-
-        tween = ManaReso.Get("L_Setting").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            ManaReso.Get("C_Main").TweenBacCG();
-
-            ManaData.MainDepth++;
-        };
-
-        tween.OnBackwardFinish += () =>
-        {
-            ManaReso.Get("C_Main").TweenForCG();
-        };
-
-        ManaReso.SetButtonEvent
-        (
-            "L_Confirm",
-            () =>
-            {
-                ManaReso.Get("L_Setting").TweenBacCG();
-            }
-        );
-
-        ManaReso.SetButtonEvent
-        (
-            "L_MusicBtn",
-            ManaAudio.Instance.MusicSwitch
-        );
-
-        ManaReso.SetButtonEvent
-        (
-            "L_AudioBtn",
-            ManaAudio.Instance.AudioSwitch
-        );
-
-        ManaReso.SetButtonEvent
-        (
-            "L_TraChi",
-            () =>
-            {
-                ManaReso.Get<Button>("L_TraChi").interactable = false;
-                ManaReso.Get<Button>("L_SimChi").interactable = true;
-                ManaReso.Get<Button>("L_English").interactable = true;
-
-                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.Orange;
-                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
-            }
-        );
-
-        ManaReso.SetButtonEvent
-        (
-            "L_SimChi",
-            () =>
-            {
-                ManaReso.Get<Button>("L_TraChi").interactable = true;
-                ManaReso.Get<Button>("L_SimChi").interactable = false;
-                ManaReso.Get<Button>("L_English").interactable = true;
-
-                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.Orange;
-                ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
-
-                ManaLan.SwitchLanguage("ChineseSimplified");
-            }
-        );
-
-        ManaReso.SetButtonEvent
-        (
-            "L_English",
-            () =>
-            {
-                ManaReso.Get<Button>("L_TraChi").interactable = true;
-                ManaReso.Get<Button>("L_SimChi").interactable = true;
-                ManaReso.Get<Button>("L_English").interactable = false;
-
-                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_English").image.color = ManaColor.Orange;
-
-                ManaLan.SwitchLanguage("English");
-            }
-        );
-
-        #endregion
-
-        #region M
-
-        #region M_Close
-
-        ManaLan.Add(ManaReso.Get<Text>("M_Tit"), new LanStr("UI", "M_Tit"));
-
-        ManaReso.AddButtonEvent
-        (
-            "M_Close",
-            () =>
-            {
-                ManaReso.Get("M_Achieve").TweenBacGra();
-            }
-        );
-
-        #endregion
-
-        tween = ManaReso.Get("M_Achieve").CreateTweenGra(new Color(0, 0, 0, 180 / 255f), 0.5f, true, true, Curve.EaseOutQuad);
-
-        var tween2 = tween;
-        tween.OnForwardStart += () =>
-        {
-            tween2.Duration = 0.5f;
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            tween2.Duration = 0.25f;
-        };
-
-        tween.OnBackwardFinish += () =>
-        {
-            ManaReso.Get("M_Achieve0").TweenBacVec();
-        };
-
-        tween = ManaReso.Get("M_Achieve0").CreateTweenVec2D(ManaReso.Get("M_PosTra").position, 0.5f, false, false, true, Curve.EaseOutQuad);
-
-        tween.OnForwardStart += () =>
-        {
-            ManaReso.Get("C_Main").TweenBacCG();
-
-            ManaReso.SetActive("M_Achieve", true);
-
-            ManaData.MainDepth++;
-        };
-
-        tween.OnForwardFinish += () =>
-        {
-            ManaReso.Get("M_Achieve").TweenForGra();
-        };
-
-        tween.OnBackwardStart += () =>
-        {
-            ManaData.MainDepth--;
-        };
-
-        tween.OnBackwardFinish += () =>
-        {
-            ManaReso.Get("C_Main").TweenForCG();
-
-            ManaReso.SetActive("M_Achieve", false);
-            ManaReso.SetActive("M_Achieve0", false);
-        };
-
-        #endregion
     }
 }

Assets/Script/Object/Player.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 using System.Collections;
 using System.Collections.Generic;
-
+using DragonBones = DragonBones.DragonBones;
 using Transform = UnityEngine.Transform;
 
 public class Player : Regist 
@@ -20,14 +20,14 @@ public class Player : Regist
     private string RightShoe;
     private string HeadWear;
 
-    private DragonBones.Slot EyeSlot;
-    private DragonBones.Slot TopSlot;
-    private DragonBones.Slot HeadSlot;
-    private DragonBones.Slot DressSlot;
-    private DragonBones.Slot MouseSlot;
-    private DragonBones.Slot LeftShoeSlot;
-    private DragonBones.Slot RightShoeSlot;
-    //private DragonBones.Slot HeadWearSlot;
+    private UnityArmatureComponent EyeUac;
+    private UnityArmatureComponent TopUac;
+    private UnityArmatureComponent HeadUac;
+    private UnityArmatureComponent DressUac;
+    private UnityArmatureComponent MouseUac;
+    private UnityArmatureComponent LeftShoeUac;
+    private UnityArmatureComponent RightShoeUac;
+    private UnityArmatureComponent HeadWearUac;
 
     private List<string> EyeList = new List<string>();
     private List<string> TopList = new List<string>();
@@ -35,7 +35,7 @@ public class Player : Regist
     private List<string> HeadList = new List<string>();
     private List<string> DressList = new List<string>();
     private List<string> MouseList = new List<string>();
-    //private List<string> HeadWearList = new List<string>();
+    private List<string> HeadWearList = new List<string>();
 
     public UnityArmatureComponent UAC;
 
@@ -65,48 +65,106 @@ public class Player : Regist
         UAC.transform.localPosition = new Vector3();
 
         UAC.animation.Play("newAnimation");
-        
+
+
         Eye = "眼睛1";
         Top = "上衣1";
         Shoe = "鞋子1";
         Head = "脑壳1";
         Dress = "裙子1";
         Mouse = "嘴巴1";
-        //HeadWear = "";
-
-        EyeSlot = UAC.armature.GetSlot(Eye);
-        TopSlot = UAC.armature.GetSlot(Top);
-        HeadSlot = UAC.armature.GetSlot(Head);
-        DressSlot = UAC.armature.GetSlot(Dress);
-        MouseSlot = UAC.armature.GetSlot(Mouse);
-        LeftShoeSlot = UAC.armature.GetSlot(Shoe);
-        RightShoeSlot = UAC.armature.GetSlot(Shoe + "1");
-        //HeadWearSlot = UAC.armature.GetSlot("");
-
-        EyeList.Add("Armature");
-        TopList.Add("Armature");
-        ShoeList.Add("Armature");
-        HeadList.Add("Armature");
-        DressList.Add("Armature");
-        MouseList.Add("Armature");
-        //HeadWearList.Add("");
+        HeadWear = "头饰品1";
+
+        UAC.armature.GetSlot("眼睛").childArmature = UnityFactory.factory.BuildArmature(Eye);
+        UAC.armature.GetSlot("上衣").childArmature = UnityFactory.factory.BuildArmature(Top);
+        UAC.armature.GetSlot("脑壳").childArmature = UnityFactory.factory.BuildArmature(Head);
+        UAC.armature.GetSlot("裙子").childArmature = UnityFactory.factory.BuildArmature(Dress);
+        UAC.armature.GetSlot("嘴巴").childArmature = UnityFactory.factory.BuildArmature(Mouse);
+        UAC.armature.GetSlot("鞋子左").childArmature = UnityFactory.factory.BuildArmature(Shoe);
+        UAC.armature.GetSlot("鞋子右").childArmature = UnityFactory.factory.BuildArmature(Shoe);
+        UAC.armature.GetSlot("头饰品").childArmature = UnityFactory.factory.BuildArmature(HeadWear);
+
+        EyeUac = transform.FindChild("Armature/眼睛1").GetComponent<UnityArmatureComponent>();
+        TopUac = transform.FindChild("Armature/上衣1").GetComponent<UnityArmatureComponent>();
+        HeadUac = transform.FindChild("Armature/脑壳1").GetComponent<UnityArmatureComponent>();
+        DressUac = transform.FindChild("Armature/裙子1").GetComponent<UnityArmatureComponent>();
+        MouseUac = transform.FindChild("Armature/嘴巴1").GetComponent<UnityArmatureComponent>();
+        LeftShoeUac = transform.FindChild("Armature/鞋子1").GetComponent<UnityArmatureComponent>();
+        HeadWearUac = transform.FindChild("Armature/头饰品1").GetComponent<UnityArmatureComponent>();
+        RightShoeUac = transform.FindChild("Armature").GetChild(transform.FindChild("Armature/鞋子1").GetSiblingIndex() + 1).GetComponent<UnityArmatureComponent>();
+
+        EyeList.Add("眼睛1");
+        TopList.Add("上衣1");
+        ShoeList.Add("鞋子1");
+        HeadList.Add("脑壳1");
+        DressList.Add("裙子1");
+        MouseList.Add("嘴巴1");
+        HeadWearList.Add("头饰品1");
+
+        EyeList.Add("眼睛2");
+        TopList.Add("上衣2");
+        ShoeList.Add("鞋子2");
+        HeadList.Add("脑壳2");
+        DressList.Add("裙子2");
+        MouseList.Add("嘴巴2");
+        HeadWearList.Add("头饰品2");
+
+        EyeList.Add("眼睛3");
+        TopList.Add("上衣3");
+        ShoeList.Add("鞋子3");
+        HeadList.Add("脑壳3");
+        DressList.Add("裙子3");
+        MouseList.Add("嘴巴3");
+        HeadWearList.Add("头饰品3");
 
         return UAC;
     }
 
     public UnityArmatureComponent BuildPink()
     {
-        return Build();
+        Build();
+
+        NextEye();
+        NextTop();
+        NextShoe();
+        NextHead();
+        NextDress();
+        NextMouse();
+        NextHeadWear();
+
+        NextEye();
+        NextTop();
+        NextShoe();
+        NextHead();
+        NextDress();
+        NextMouse();
+        NextHeadWear();
+
+        return UAC;
     }
 
     public UnityArmatureComponent BuildBlond()
     {
-        return Build();
+        Build();
+
+        ResetDepth();
+
+        return UAC;
     }
 
     public UnityArmatureComponent BuildBrown()
     {
-        return Build();
+        Build();
+
+        NextEye();
+        NextTop();
+        NextShoe();
+        NextHead();
+        NextDress();
+        NextMouse();
+        NextHeadWear();
+
+        return UAC;
     }
 
 
@@ -114,64 +172,78 @@ public class Player : Regist
     {
         int index = EyeList.IndexOf(Eye);
 
-        EyeSlot.childArmature = UnityFactory.factory.BuildArmature(EyeList.Prev(index));
-
         Eye = EyeList.Prev(index);
+
+        ChangeClose(EyeUac, Eye);
+
+        ResetDepth();
     }
 
     public void PrevTop()
     {
         int index = TopList.IndexOf(Top);
 
-        TopSlot.childArmature = UnityFactory.factory.BuildArmature(TopList.Prev(index));
-
         Top = TopList.Prev(index);
+
+        ChangeClose(TopUac, Top);
+
+        ResetDepth();
     }
 
     public void PrevShoe()
     {
         int index = ShoeList.IndexOf(Shoe);
 
-        LeftShoeSlot.childArmature = UnityFactory.factory.BuildArmature(ShoeList.Prev(index));
-        RightShoeSlot.childArmature = UnityFactory.factory.BuildArmature(ShoeList.Prev(index));
-
         Shoe = ShoeList.Prev(index);
+
+        ChangeClose(LeftShoeUac, Shoe);
+        ChangeClose(RightShoeUac, Shoe);
+
+        ResetDepth();
     }
 
     public void PrevHead()
     {
         int index = HeadList.IndexOf(Head);
 
-        HeadSlot.childArmature = UnityFactory.factory.BuildArmature(HeadList.Prev(index));
-
         Head = HeadList.Prev(index);
+
+        ChangeClose(HeadUac, Head);
+
+        ResetDepth();
     }
 
     public void PrevDress()
     {
         int index = DressList.IndexOf(Dress);
 
-        DressSlot.childArmature = UnityFactory.factory.BuildArmature(DressList.Prev(index));
-
         Dress = DressList.Prev(index);
+
+        ChangeClose(DressUac, Dress);
+
+        ResetDepth();
     }
 
     public void PrevMouse()
     {
         int index = MouseList.IndexOf(Mouse);
 
-        MouseSlot.childArmature = UnityFactory.factory.BuildArmature(MouseList.Prev(index));
-
         Mouse = MouseList.Prev(index);
+
+        ChangeClose(MouseUac, Mouse);
+
+        ResetDepth();
     }
 
     public void PrevHeadWear()
     {
-        //int index = HeadWearList.IndexOf(HeadWear);
+        int index = HeadWearList.IndexOf(HeadWear);
+
+        HeadWear = HeadWearList.Prev(index);
 
-        //HeadWearSlot.childArmature = UnityFactory.factory.BuildArmature(HeadWearList.Prev(index));
+        ChangeClose(HeadWearUac, HeadWear);
 
-        //HeadWear = HeadWearList.Prev(index);
+        ResetDepth();
     }
 
 
@@ -179,64 +251,118 @@ public class Player : Regist
     {
         int index = EyeList.IndexOf(Eye);
 
-        EyeSlot.childArmature = UnityFactory.factory.BuildArmature(EyeList.Next(index));
-
         Eye = EyeList.Next(index);
+
+        ChangeClose(EyeUac, Eye);
+
+        ResetDepth();
     }
 
     public void NextTop()
     {
         int index = TopList.IndexOf(Top);
 
-        TopSlot.childArmature = UnityFactory.factory.BuildArmature(TopList.Next(index));
-
         Top = TopList.Next(index);
+
+        ChangeClose(TopUac, Top);
+
+        ResetDepth();
     }
 
     public void NextShoe()
     {
         int index = ShoeList.IndexOf(Shoe);
 
-        LeftShoeSlot.childArmature = UnityFactory.factory.BuildArmature(ShoeList.Next(index));
-        RightShoeSlot.childArmature = UnityFactory.factory.BuildArmature(ShoeList.Next(index));
-
         Shoe = ShoeList.Next(index);
+
+        ChangeClose(LeftShoeUac, Shoe);
+        ChangeClose(RightShoeUac, Shoe);
+
+        ResetDepth();
     }
 
     public void NextHead()
     {
         int index = HeadList.IndexOf(Head);
 
-        HeadSlot.childArmature = UnityFactory.factory.BuildArmature(HeadList.Next(index));
-
         Head = HeadList.Next(index);
+
+        ChangeClose(HeadUac, Head);
+
+        ResetDepth();
     }
 
     public void NextDress()
     {
         int index = DressList.IndexOf(Dress);
 
-        DressSlot.childArmature = UnityFactory.factory.BuildArmature(DressList.Next(index));
-
         Dress = DressList.Next(index);
+
+        ChangeClose(DressUac, Dress);
+
+        ResetDepth();
     }
 
     public void NextMouse()
     {
         int index = MouseList.IndexOf(Mouse);
 
-        MouseSlot.childArmature = UnityFactory.factory.BuildArmature(MouseList.Next(index));
-
         Mouse = MouseList.Next(index);
+
+        ChangeClose(MouseUac, Mouse);
+
+        ResetDepth();
     }
 
     public void NextHeadWear()
     {
-        //int index = HeadWearList.IndexOf(HeadWear);
+        int index = HeadWearList.IndexOf(HeadWear);
+
+        HeadWear = HeadWearList.Next(index);
 
-        //HeadWearSlot.childArmature = UnityFactory.factory.BuildArmature(HeadWearList.Next(index));
+        ChangeClose(HeadWearUac, HeadWear);
 
-        //HeadWear = HeadWearList.Next(index);
+        ResetDepth();
+    }
+
+
+    public void ResetDepth()
+    {
+        HeadUac.transform.SetLZ(0);
+        EyeUac.transform.SetLZ(-0.001f);
+        TopUac.transform.SetLZ(-0.003f);
+        DressUac.transform.SetLZ(-0.002f);
+        MouseUac.transform.SetLZ(-0.001f);
+        LeftShoeUac.transform.SetLZ(-0.001f);
+        RightShoeUac.transform.SetLZ(-0.001f);
+        HeadWearUac.transform.SetLZ(-0.001f);
+
+        transform.FindChild("Armature/左腿").SetLZ(0);
+        transform.FindChild("Armature/右腿").SetLZ(0);
+        transform.FindChild("Armature/脖子").SetLZ(0);
+        transform.FindChild("Armature/左手").SetLZ(-0.001f);
+        transform.FindChild("Armature/右手").SetLZ(-0.001f);
+    }
+
+    public void ChangeClose(UnityArmatureComponent uac, string armatureName)
+    {
+        global::DragonBones.Slot slot = null;
+        if (uac.armature != null)
+        {
+            slot = uac.armature.parent;
+            uac.Dispose(false);
+        }
+
+        uac.armatureName = armatureName;
+        uac = UnityFactory.factory.BuildArmatureComponent(uac.armatureName, "Closet_ske", null, null, uac.gameObject);
+
+        if (slot != null)
+        {
+            slot.childArmature = uac.armature;
+        }
+
+        uac.sortingLayerName = uac.sortingLayerName;
+        uac.sortingOrder = uac.sortingOrder;
     }
 
     #endregion

Assets/Script/Object/Skill/Ability.cs

@@ -13,6 +13,11 @@ public class Ability : SkillRoot
 
     #region 配置
 
+    public override string ID
+    {
+        get { return "Ability" + ID_; }
+    }
+
     protected float Person;
     protected float SkillCD;
     protected float CoinPerson;
@@ -83,7 +88,7 @@ public class Ability : SkillRoot
             {
                 ItemBtn.interactable = true;
 
-                ManaLan.Add(ItemTit, new LanStr("SkillName", _Name), " ", Level .ToString());
+                ManaLan.Add(ItemTit, new LanStr("SkillName", ID), " ", Level .ToString());
                 ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab2"));
             }
             else
@@ -101,11 +106,10 @@ public class Ability : SkillRoot
     {
         #region 配置
 
-        ID = int.Parse(attribute[0].Value);
+        ID_ = int.Parse(attribute[0].Value);
         Icon = attribute[20].Value;
         Anim = attribute[21].Value;
         Label = attribute[22].Value;
-        _Name = "Ability" + ID;
 
         UnlockPos = attribute[12].Value;
         UpgradeCD = attribute[18].Value;
@@ -142,7 +146,7 @@ public class Ability : SkillRoot
 
     public override void Annul()
     {
-        if (_Name == "Ability1")
+        if (ID == "Ability1")
         {
             ManaData.Person -= NewPerson;
             ManaData.CoinPerson -= NewCoinPerson;
@@ -187,7 +191,7 @@ public class Ability : SkillRoot
         NewCoinPerson = CoinPerson;
         NewUpgradeAmt = UpgradeAmt;
 
-        ManaLan.Add(ItemTit, new LanStr("SkillName", _Name));
+        ManaLan.Add(ItemTit, new LanStr("SkillName", ID));
 
         ItemLab.text = Description(0);
 
@@ -271,7 +275,7 @@ public class Ability : SkillRoot
 
     protected void Upgrade()
     {
-        if (ManaTutorial.TutorialA)
+        if (ManaTutorial.TutorialA || (ManaTutorial.TutorialA && ManaData.Level >= 200))
         {
             TutorialUpgrade();
         }
@@ -552,7 +556,7 @@ public class Ability : SkillRoot
 
     private void TutorialUpgrade()
     {
-        if (_Name == "Ability1")
+        if (ID == "Ability1")
         {
             Level += 20;
             ManaData.Level += 20;
@@ -575,7 +579,7 @@ public class Ability : SkillRoot
         UpgradeValue(ref NewSkillCdBuff, UpgradeCD, 1);
         UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
 
-        ManaLan.Add(ItemTit, new LanStr("SkillName", _Name), " ", Level.ToString());
+        ManaLan.Add(ItemTit, new LanStr("SkillName", ID), " ", Level.ToString());
 
         ItemLab.text = Description(0);
         ManaReso.SetText("Fe_Lab0", Description(0));
@@ -585,15 +589,15 @@ public class Ability : SkillRoot
         ManaDebug.Log(string.Format("<color=red>{0}</color> 升级 : {1}", Name, Level));
 
         UseConti();
-
+        
         if (ValidAnim == false)
         {
             ValidAnim = true;
-
+            
             if (!string.IsNullOrEmpty(Anim))
             {
                 string[] strings = Anim.Split(',');
-
+                
                 if (strings.Length == 1)
                 {
                     if (ManaGarden.PlantList.Count == 0)
@@ -623,7 +627,7 @@ public class Ability : SkillRoot
                 else if (strings.Length > 1)
                 {
                     ManaReso.Get<Button>("F_Close").onClick.Invoke();
-
+                    
                     ManaReso.Get("MainCamera").CreateZoom2D();
 
                     Tween tween0 = ManaReso.Get(strings[0]).CreateTweenSr(0, 1, 1, true, true, Curve.EaseOutQuad, false, true);
@@ -655,7 +659,7 @@ public class Ability : SkillRoot
                 UseConti();
             }
 
-            if (_Name == "Ability1")
+            if (ID == "Ability1")
             {
                 ManaData.Level+= 20;
             }
@@ -677,7 +681,7 @@ public class Ability : SkillRoot
             UpgradeValue(ref NewSkillCdBuff, UpgradeCD, 1);
             UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
 
-            ManaLan.Add(ItemTit, new LanStr("SkillName", _Name), " ", Level.ToString());
+            ManaLan.Add(ItemTit, new LanStr("SkillName", ID), " ", Level.ToString());
 
             ItemLab.text = Description(0);
             ManaReso.SetText("Fe_Lab0", Description(0));
@@ -687,15 +691,15 @@ public class Ability : SkillRoot
             ManaDebug.Log(string.Format("<color=red>{0}</color> 升级 : {1}", Name, Level));
 
             UseConti();
-
+            
             if (ValidAnim == false)
             {
                 ValidAnim = true;
-
+                
                 if (!string.IsNullOrEmpty(Anim))
                 {
                     string[] strings = Anim.Split(',');
-
+                    
                     if (strings.Length == 1)
                     {
                         if (ManaGarden.PlantList.Count == 0)
@@ -725,7 +729,7 @@ public class Ability : SkillRoot
                     else if (strings.Length > 1)
                     {
                         ManaReso.Get<Button>("F_Close").onClick.Invoke();
-
+                        
                         Tween tween0 = ManaReso.Get(strings[0]).CreateTweenSr(0, 1, 1, true, true, Curve.EaseOutQuad, false, true);
 
                         tween0.InOrigin = true;

Assets/Script/Object/Skill/BigSkill.cs

@@ -86,7 +86,7 @@ public class BigSkill : Skill
             }
             else if (_ItemStatus == SkillStatus.Upgrade)
             {
-                ManaLan.Add(ItemTit, new LanStr("SkillName", _Name), " ", Level.ToString());
+                ManaLan.Add(ItemTit, new LanStr("SkillName", ID), " ", Level.ToString());
 
                 ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab2"));
             }
@@ -222,7 +222,7 @@ public class BigSkill : Skill
         }
         else
         {
-            ManaLan.Add(ItemTit, new LanStr("SkillName", _Name));
+            ManaLan.Add(ItemTit, new LanStr("SkillName", ID));
             ItemLab.text = Description(0);
 
             ItemBtn.onClick.AddListener(OnClick);
@@ -631,7 +631,7 @@ public class BigSkill : Skill
         UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, 1);
         UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
 
-        ManaLan.Add(ItemTit, new LanStr("SkillName", _Name), " ", Level.ToString());
+        ManaLan.Add(ItemTit, new LanStr("SkillName", ID), " ", Level.ToString());
         ItemLab.text = Description(0);
         ManaReso.SetText("Fe_Lab0", Description(0));
         ManaReso.SetText("Fe_Lab1", Description(1));
@@ -678,7 +678,7 @@ public class BigSkill : Skill
             UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, 1);
             UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
 
-            ManaLan.Add(ItemTit, new LanStr("SkillName", _Name), " ", Level.ToString());
+            ManaLan.Add(ItemTit, new LanStr("SkillName", ID), " ", Level.ToString());
             ItemLab.text = Description(0);
             ManaReso.SetText("Fe_Lab0", Description(0));
             ManaReso.SetText("Fe_Lab1", Description(1));

Assets/Script/Object/Skill/Pack.cs

@@ -12,6 +12,11 @@ public class Pack : SkillRoot
 
     #region 配置
 
+    public override string ID
+    {
+        get { return "Pack" + ID_; }
+    }
+
     protected int MinUseLv;
     protected int MaxUseLv;
 
@@ -67,11 +72,10 @@ public class Pack : SkillRoot
     {
         #region 配置
 
-        ID = int.Parse(attribute[0].Value);
+        ID_ = int.Parse(attribute[0].Value);
         Icon = attribute[14].Value;
         Anim = attribute[15].Value;
         Label = attribute[16].Value;
-        _Name = "Pack" + ID;
         Flower = attribute[9].Value;
 
         ClassID = IntParse(attribute[3].Value);
@@ -100,7 +104,7 @@ public class Pack : SkillRoot
 
         _ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
 
-        ManaLan.Add(ItemTit, new LanStr("SkillName", _Name));
+        ManaLan.Add(ItemTit, new LanStr("SkillName", ID));
 
         ItemLab.text = Description(0);
         ItemBtn.onClick.AddListener(OnClick);

Assets/Script/Object/Skill/Skill.cs

@@ -14,6 +14,11 @@ public class Skill : SkillRoot
 
     #region 配置
 
+    public override string ID
+    {
+        get { return "Skill" + ID_; }
+    }
+
     protected float CD;
     protected float Person;
     protected float SkillCD;
@@ -118,11 +123,10 @@ public class Skill : SkillRoot
     {
         #region 配置
 
-        ID = int.Parse(attribute[0].Value);
+        ID_ = int.Parse(attribute[0].Value);
         Icon = attribute[30].Value;
         Anim = attribute[31].Value;
         Label = attribute[32].Value;
-        _Name ="Skill" +ID;
 
         UnlockPos = attribute[18].Value;
         UpgradeCD = attribute[28].Value;
@@ -279,7 +283,7 @@ public class Skill : SkillRoot
         NewUpgradeAmt = UpgradeAmt;
         NewCoinOnceBuff = CoinOnceBuff;
 
-        ManaLan.Add(ItemTit, new LanStr("SkillName", _Name));
+        ManaLan.Add(ItemTit, new LanStr("SkillName", ID));
         ItemLab.text = Description(0);
 
         ItemBtn.onClick.AddListener(OnClick);

Assets/Script/Object/Skill/SkillRoot.cs

@@ -2,9 +2,9 @@
 using UnityEngine.UI;
 
 using System;
+using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
-using System.Xml;
 
 public enum Current
 {
@@ -37,8 +37,8 @@ public enum SkillStatus
 {
     Buy,
     Use,
-    Cool,
     Lock,
+    Cool,
     UnLock,
     Upgrade,
 }
@@ -53,23 +53,24 @@ public abstract class SkillRoot
     {
         get
         {
-            return Language.GetStr("SkillDesc", _Name);
+            return Language.GetStr("SkillDesc", ID);
         }
-        set { _Desc = value; }
     }
     public string Name
     {
         get
         {
-            return Language.GetStr("SkillName", _Name);
+            return Language.GetStr("SkillName", ID);
         }
-        set { _Name = value; }
     }
 
-    public string _Desc;
-    public string _Name;
+    public virtual string ID
+    {
+        get { throw new Exception(); }
+    }
+
+    public int ID_;
 
-    public int ID;
     public int ClassID;
     public string Icon;
 

Assets/Script/Object/Tutorial.cs

@@ -3,7 +3,9 @@ using UnityEngine.EventSystems;
 
 using System.Collections;
 using System.Collections.Generic;
+using DragonBones;
 using UnityEngine.UI;
+using Transform = UnityEngine.Transform;
 
 public class Tutorial : Regist, IPointerClickHandler
 {
@@ -48,12 +50,17 @@ public class Tutorial : Regist, IPointerClickHandler
 
     public static List<Transform> HighLightList = new List<Transform>();
 
+    public static DragonBonesData data;
+
     #endregion
 
     public override void Instantiate()
     {
         if (ManaTutorial.TutorialA && ManaTutorial.TutorialIndexA == 1)
         {
+            UnityFactory.factory.LoadTextureAtlasData(Bundle.Config.LoadAsset<TextAsset>("Closet_tex"), "Closet_tex");
+            UnityFactory.factory.LoadDragonBonesData(Bundle.Config.LoadAsset<TextAsset>("Closet_ske"));
+
             PlayerBrown = ManaReso.Get("PlayerBrown", Folder.Scene, false, ManaReso.Get("PlayerBk1"), false);
 
             PlayerBlond = ManaReso.Get("PlayerBlond", Folder.Scene, false, ManaReso.Get("PlayerBk2"), false);
@@ -74,9 +81,9 @@ public class Tutorial : Regist, IPointerClickHandler
         if (ManaTutorial.TutorialA || ManaTutorial.TutorialB)
         {
             ManaReso.Get("Tutorial").CreateTweenSr(0, 1, 1f, true, true, Curve.EaseOutQuad, false, true);
-            ManaReso.Get("PlayerBk1").CreateTweenScale(new Vector3(0.8f, 0.8f, 0.8f), new Vector3(0.95f, 0.95f, 0.95f), 0.25f, true, true, Curve.EaseOutQuad);
-            ManaReso.Get("PlayerBk2").CreateTweenScale(new Vector3(0.8f, 0.8f, 0.8f), new Vector3(0.95f, 0.95f, 0.95f), 0.25f, true, true, Curve.EaseOutQuad);
-            ManaReso.Get("PlayerBk3").CreateTweenScale(new Vector3(0.8f, 0.8f, 0.8f), new Vector3(0.95f, 0.95f, 0.95f), 0.25f, true, true, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk1").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 0.25f, true, true, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk2").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 0.25f, true, true, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk3").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 0.25f, true, true, Curve.EaseOutQuad);
             ManaReso.Get("TutorialMask").CreateTweenSr(0, 180 / 255f, 0.25f, false, true, Curve.EaseOutQuad);
 
             ManaReso.Get("TutorialMask").AddScript<SceneMask>();

Assets/Script/Tool/Anim/TweenSr.cs

@@ -158,7 +158,7 @@ public class TweenSr : Tween
             Renderer[] renderers = Target.GetComponentsInChildren<Renderer>();
 
             Targets = new Material[renderers.Length];
-
+            
             for (int i = 0; i < renderers.Length; i++)
             {
                 Targets[i] = renderers[i].material;

Assets/Script/Tool/Data.cs

@@ -144,7 +144,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = skill._Name;
+                xmlAttribute.Value = skill.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = skill.SkillType.ToString();
@@ -174,7 +174,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = pack._Name;
+                xmlAttribute.Value = pack.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = pack.SkillType.ToString();
@@ -198,7 +198,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = ability._Name;
+                xmlAttribute.Value = ability.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = ability.SkillType.ToString();
@@ -222,7 +222,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = bigSkill._Name;
+                xmlAttribute.Value = bigSkill.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = bigSkill.SkillType.ToString();
@@ -350,7 +350,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = skill._Name;
+                xmlAttribute.Value = skill.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = skill.SkillType.ToString();
@@ -380,7 +380,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = pack._Name;
+                xmlAttribute.Value = pack.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = pack.SkillType.ToString();
@@ -404,7 +404,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = ability._Name;
+                xmlAttribute.Value = ability.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = ability.SkillType.ToString();
@@ -428,7 +428,7 @@ public class Data
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = bigSkill._Name;
+                xmlAttribute.Value = bigSkill.ID_.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = bigSkill.SkillType.ToString();

Assets/Script/Tool/Extension.cs

@@ -661,6 +661,21 @@ public static class Extension
         tra.position = new Vector3(tra.position.x, tra.position.y, z);
     }
 
+    public static void SetLX(this Transform tra, float x)
+    {
+        tra.localPosition = new Vector3(x, tra.localPosition.y, tra.localPosition.z);
+    }
+
+    public static void SetLY(this Transform tra, float y)
+    {
+        tra.localPosition = new Vector3(tra.localPosition.x, y, tra.localPosition.z);
+    }
+
+    public static void SetLZ(this Transform tra, float z)
+    {
+        tra.localPosition = new Vector3(tra.localPosition.x, tra.localPosition.y, z);
+    }
+
     public static void SetEX(this Transform tra, float x)
     {
         tra.eulerAngles = new Vector3(x, tra.eulerAngles.y, tra.eulerAngles.z);

Assets/Script/Tool/SceneMask.cs

@@ -24,7 +24,7 @@ public class SceneMask : Regist
         Vector3 screenPos = Camera.main.WorldToScreenPoint(tra.position);
 
         screenPos = new Vector3(screenPos.x / Screen.width, screenPos.y / Screen.height, 0);
-
+        
         if (Tutorial.UIMask)
         {
             Tutorial.Material.SetFloat("_RadiusX", radiusX);

MyLovelyGarden.sln

@@ -1,9 +1,9 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2008
+
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,16 +11,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

ToList.txt

@@ -1,6 +1,6 @@
-ManaTutorial
+Skill
 
-新手教程修改 换装
+小游戏时间
 
 
 切换后台