Temp-试衣间

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e2d62becad3f170428db59673f313354
+timeCreated: 1499663011
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: discard
+  assetBundleVariant: 

Assets/Resource/Prefab/PrefabUI/GroupE.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 718ebdaed223e93409d6dc7e53a23167
+timeCreated: 1499654821
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/保存按钮.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: cde66b70acacf1a47b8a81614f11dcfb
+timeCreated: 1499655993
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/商店大背景.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 4b2aa598a8b767740afbd328b6a4f6af
-timeCreated: 1487721800
+timeCreated: 1499654454
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -39,8 +39,8 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
+  spriteBorder: {x: 140, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 240
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1

Assets/Resource/Sprite/SpriteUI/商店试衣间.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 2c0424b19cb668548af1dcb7f3265393
+timeCreated: 1499655890
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/物品格子.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 449ce50a86305da45b1ca77fd0c6716c
+timeCreated: 1499658843
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/翅膀其他用之前的看参考.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: cc406256d3e6c6544af7f91fee3855cd
+timeCreated: 1499657458
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/还原按钮.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 787176d36456ad840ba878659cabcea0
+timeCreated: 1499656001
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -0,0 +1,32 @@
+<data>
+  <item id="1" jump_frequency="5" name="" type="" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" />
+  <comment>
+    <id>
+id
+</id>
+    <jump_frequency>
+每过多久必然跳且只跳一次
+</jump_frequency>
+    <name>
+资源名字
+</name>
+    <type>
+类型
+</type>
+    <level>
+可以购买等级
+</level>
+    <buy_currency>
+购买货币类型
+</buy_currency>
+    <buy_amt>
+购买消耗值
+</buy_amt>
+    <buy_advance_currency>
+提前购买货币类型
+</buy_advance_currency>
+    <buy_advance_amt>
+提前购买消耗值
+</buy_advance_amt>
+  </comment>
+</data>

Assets/Resource/XML/Config/dressRoom_config.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f38b94956f16c64f9bd76a51d82dc3f
+timeCreated: 1499673332
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -83,6 +83,11 @@
     <M_Tit desc=""><![CDATA[成就]]></M_Tit>
     <J_Info0 desc=""><![CDATA[获得]]></J_Info0>
     <J_Info1 desc=""><![CDATA[使用技能:]]></J_Info1>
+    <P_HairLab desc=""><![CDATA[发型]]></P_HairLab>
+    <P_TopLab desc=""><![CDATA[上衣]]></P_TopLab>
+    <P_DressLab desc=""><![CDATA[下装]]></P_DressLab>
+    <P_DecaratorLab desc=""><![CDATA[饰品]]></P_DecaratorLab>
+    <P_WingLab desc=""><![CDATA[翅膀]]></P_WingLab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -49,8 +49,8 @@
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解鎖]]></H_BtnLab2>
-    <H_BtnLab3 desc=""><![CDATA[]]></H_BtnLab3>
-    <H_BtnLab4 desc=""><![CDATA[]]></H_BtnLab4>
+    <H_BtnLab3 desc=""><![CDATA[完成小遊戲或購買禮包可以解鎖]]></H_BtnLab3>
+    <H_BtnLab4 desc=""><![CDATA[放置]]></H_BtnLab4>
     <Ba_Lab desc=""><![CDATA[離開期間獲得]]></Ba_Lab>
     <Ba_Lab2 desc=""><![CDATA[已達到最大離線收益，記得多上線哦！]]></Ba_Lab2>
     <Ba_ConfirmLab desc=""><![CDATA[確定]]></Ba_ConfirmLab>
@@ -83,6 +83,11 @@
     <M_Tit desc=""><![CDATA[成就]]></M_Tit>
     <J_Info0 desc=""><![CDATA[獲得]]></J_Info0>
     <J_Info1 desc=""><![CDATA[使用技能:]]></J_Info1>
+    <P_HairLab desc=""><![CDATA[發型]]></P_HairLab>
+    <P_TopLab desc=""><![CDATA[上衣]]></P_TopLab>
+    <P_DressLab desc=""><![CDATA[下裝]]></P_DressLab>
+    <P_DecaratorLab desc=""><![CDATA[飾品]]></P_DecaratorLab>
+    <P_WingLab desc=""><![CDATA[翅膀]]></P_WingLab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/English.xml

@@ -49,8 +49,8 @@
     <G_RetrieveLab desc=""><![CDATA[Take all back]]></G_RetrieveLab>
     <H_BtnLab1 desc=""><![CDATA[Take back]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[Locked]]></H_BtnLab2>
-    <H_BtnLab3 desc=""><![CDATA[]]></H_BtnLab3>
-    <H_BtnLab4 desc=""><![CDATA[]]></H_BtnLab4>
+    <H_BtnLab3 desc=""><![CDATA[Play minigame or buy pack to unlock]]></H_BtnLab3>
+    <H_BtnLab4 desc=""><![CDATA[Place]]></H_BtnLab4>
     <Ba_Lab desc=""><![CDATA[During absence acquired ]]></Ba_Lab>
     <Ba_Lab2 desc=""><![CDATA[Offline reward max. Remember to play the game!]]></Ba_Lab2>
     <Ba_ConfirmLab desc=""><![CDATA[Get]]></Ba_ConfirmLab>
@@ -83,6 +83,11 @@
     <M_Tit desc=""><![CDATA[Achievement]]></M_Tit>
     <J_Info0 desc=""><![CDATA[Get]]></J_Info0>
     <J_Info1 desc=""><![CDATA[Use skill:]]></J_Info1>
+    <P_HairLab desc=""><![CDATA[Hair]]></P_HairLab>
+    <P_TopLab desc=""><![CDATA[Top]]></P_TopLab>
+    <P_DressLab desc=""><![CDATA[Dress]]></P_DressLab>
+    <P_DecaratorLab desc=""><![CDATA[Accessory]]></P_DecaratorLab>
+    <P_WingLab desc=""><![CDATA[Wing]]></P_WingLab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>

Assets/Resource/Xlsx/dressRoom_config.xlsx.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ec016f18371037458ae6542f3ca7488
+timeCreated: 1499672397
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Editor/EditorAuxiliary.cs

@@ -69,6 +69,11 @@ public class EditorAuxiliary : Editor
             ChangePrefix();
         }
 
+        if (GUILayout.Button("ReplaceFromTo"))
+        {
+            ReplaceFromTo();
+        }
+
         if (GUILayout.Button("CopyCurve"))
         {
             //EditorCurveBinding[] bindings = AnimationUtility.GetCurveBindings(Script.ClipOrigin);
@@ -172,7 +177,7 @@ public class EditorAuxiliary : Editor
 
         for (int i = 0; i < transforms.Length; i++)
         {
-            transforms[i].name = transforms[i].name + Script.String;
+            transforms[i].name = transforms[i].name + Script.String1;
         }
     }
 
@@ -182,7 +187,7 @@ public class EditorAuxiliary : Editor
 
         for (int i = 0; i < transforms.Length; i++)
         {
-            transforms[i].name = Script.String + transforms[i].name;
+            transforms[i].name = Script.String1 + transforms[i].name;
         }
     }
 
@@ -194,7 +199,17 @@ public class EditorAuxiliary : Editor
         {
             int index = transforms[i].name.IndexOf('_');
 
-            transforms[i].name = Script.String + transforms[i].name.Remove(0, index + 1);
+            transforms[i].name = Script.String1 + transforms[i].name.Remove(0, index + 1);
+        }
+    }
+
+    private void ReplaceFromTo()
+    {
+        Transform[] transforms = Script.Go.GetComponentsInChildren<Transform>(true);
+
+        for (int i = 0; i < transforms.Length; i++)
+        {
+            transforms[i].name = transforms[i].name.Replace(Script.String1, Script.String2);
         }
     }
 }

Assets/Script/Manage/ManaAchieve.cs

@@ -285,7 +285,7 @@ public class Achieve
 
         Button.interactable = false;
 
-        Button.image.material = Shortcut.GrayMat;
+        Button.image.material = Lib.GrayMat;
 
         ManaAchieve.UpdateHint();
 

Assets/Script/Manage/ManaCenter.cs

@@ -266,7 +266,8 @@ public class ManaCenter : Regist
             
             ManaReso.SetText("F_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));
             ManaReso.SetText("C_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));
-            
+            ManaReso.SetText("P_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));
+
             ManaAchieve.UpdateStatus(AchieveType.CurrentCoin, Coin_);
         }
     }
@@ -278,6 +279,7 @@ public class ManaCenter : Regist
             Diamond_ = value;
 
             ManaReso.SetText("F_DiamondLab", Auxiliary.ShrinkNumberStr(Diamond_, 0));
+            ManaReso.SetText("P_DiamondLab", Auxiliary.ShrinkNumberStr(Diamond_, 0));
         }
     }
 
@@ -295,6 +297,7 @@ public class ManaCenter : Regist
     public static bool OfflineLock;
     public static bool ReactiveLock;
     public static bool DownloadLock;
+    public static bool SceneSwitchLock;
 
     public static bool Complete;
     public static bool FirstFrame = true;

Assets/Script/Manage/ManaData.cs

@@ -660,6 +660,19 @@ public class ManaData : Regist
         return xmlNode.Attributes;
     }
 
+    public static XmlAttributeCollection GetDressRoomConfig()
+    {
+        TextAsset textAsset = ManaReso.Load<TextAsset>("dressRoom_config", Folder.Config);
+
+        XmlDocument xmlDoc = new XmlDocument();
+
+        xmlDoc.LoadXml(textAsset.text);
+
+        XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
+
+        return xmlNode.Attributes;
+    }
+
     public static List<XmlAttributeCollection> GetSkillConfig()
     {
         TextAsset textAsset;

Assets/Script/Manage/ManaGarden.cs

@@ -115,7 +115,7 @@ public class ManaGarden : Regist
 
     public void FixedUpdate()
     {
-        if (ManaTutorial.TutorialA)
+        if (ManaTutorial.TutorialA || Player.InDressRoom)
         {
             return;
         }
@@ -370,7 +370,7 @@ public class ManaGarden : Regist
 
         Image image = ManaReso.Get<Image>("H_Icon2");
 
-        image.material = Shortcut.GrayMat;
+        image.material = Lib.GrayMat;
 
         image.sprite = flowerInfo.Icon;
 
@@ -381,7 +381,7 @@ public class ManaGarden : Regist
         {
             ManaReso.SetText("H_BtnLab", Language.GetStr("UI", "H_BtnLab2"));
 
-            ManaReso.Get<Image>("H_Btn").material = Shortcut.GrayMat;
+            ManaReso.Get<Image>("H_Btn").material = Lib.GrayMat;
 
             ManaReso.SetButtonEvent
                 (

Assets/Script/Manage/ManaMiniGame.cs

@@ -899,11 +899,11 @@ public class ManaMiniGame : Regist
         {
             int uiIndex = IndexMap(IndexList[0]);
 
-            ManaReso.Get<Image>("D_FlowerBtn" + uiIndex).material = Shortcut.GrayMat;
+            ManaReso.Get<Image>("D_FlowerBtn" + uiIndex).material = Lib.GrayMat;
 
             ManaReso.Get<Button>("D_FlowerBtn" + uiIndex).interactable = false;
 
-            ManaReso.Get<Image>("D_FlowerIcon" + uiIndex).material = Shortcut.GrayMat;
+            ManaReso.Get<Image>("D_FlowerIcon" + uiIndex).material = Lib.GrayMat;
 
             ManaReso.SetActive("D_FlowerTick" + uiIndex, true);
 

Assets/Script/Manage/ManaPlayer.cs

@@ -21,6 +21,7 @@ public class ManaPlayer : Regist
     public static Transform SeleTra;
 
     public static Player Player;
+    public static Transform DressRoom;
     public static Transform PlayerPink;
     public static Transform PlayerBlond;
     public static Transform PlayerBrown;
@@ -30,6 +31,8 @@ public class ManaPlayer : Regist
 
     public override void Instantiate()
     {
+        #region Player
+
         if (!Complete)
         {
             UnityFactory.factory.LoadDragonBonesData(ManaReso.Load<TextAsset>("stand_ske", Folder.Config));
@@ -75,11 +78,25 @@ public class ManaPlayer : Regist
             SelePlayer = "PlayerBlond";
             SeleTra = PlayerBlond;
         }
+
+        #endregion
+
+        #region DressRoom
+
+        DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
+
+        XmlAttributeCollection attribute = ManaData.GetDressRoomConfig();
+
+        Player.JumpFrequency = float.Parse(attribute[1].Value);
+
+        #endregion
     }
 
     public override void RegistValueA()
     {
         Instance = this;
+
+        ManaReso.Get("DressRoom").CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
     }
 
 

Assets/Script/Manage/ManaReso.cs

@@ -39,12 +39,14 @@ public enum ObjType
     Flower,
     Garden,
     Tutorial,
+    DressRoom,
 
     Canvas,
     GroupA,
     GroupB,
     GroupC,
     GroupD,
+    GroupE,
     EventSystem,
     MainCamera,
 

Assets/Script/Manage/ManaUI.cs

@@ -56,6 +56,9 @@ public class ManaUI : Regist
         tra = ManaReso.Get("GroupC", Folder.UI, true, Canvas, false, ObjType.GroupC);
         tra.SetActive(true);
 
+        tra = ManaReso.Get("GroupE", Folder.UI, true, Canvas, false, ObjType.GroupE);
+        tra.SetActive(true);
+
         tra = ManaReso.Get("GroupD", Folder.UI, true, Canvas, false, ObjType.GroupD);
         tra.SetActive(true);
 
@@ -355,11 +358,18 @@ public class ManaUI : Regist
             "C_Visit",
             () =>
             {
+                if (ManaCenter.SceneSwitchLock)
+                {
+                    return;
+                }
+
                 ManaCenter.Pay
                 (
                     "", ManaVisit.Cost, Current.Coin,
                     () =>
                     {
+                        ManaCenter.SceneSwitchLock = true;
+
                         ManaVisit.LoadComplete = false;
                         ManaVisit.TweenComplete = false;
 
@@ -387,10 +397,7 @@ public class ManaUI : Regist
                         }
 
 
-                        tween = ManaReso.Get("I_BlackMask").GetTweenCG();
-
-                        tween.Duration = 0.5f;
-                        tween.StartBackward();
+                        tween = ManaReso.Get("I_BlackMask").TweenBacCG();
 
                         tween.AddEventOnetime
                         (
@@ -1541,7 +1548,16 @@ public class ManaUI : Regist
 
         #region I
 
-        ManaReso.Get("I_BlackMask").CreateTweenCG(1, 0, 2.5f, true, false, Curve.EaseOutQuad);
+        tweenRoot = ManaReso.Get("I_BlackMask").CreateTweenCG(1, 0, 1.5f, true, false, Curve.EaseOutQuad);
+
+        tweenRoot.AddEventOnetime
+            (
+            EventType.ForwardFinish,
+                () =>
+                {
+                    tweenRoot.Duration = 0.5f;
+                }
+            );
 
         #endregion
 
@@ -1718,9 +1734,9 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_SimChi").interactable = true;
                 ManaReso.Get<Button>("L_English").interactable = true;
 
-                ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.Orange;
-                ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
-                ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
+                ManaReso.Get<Button>("L_TraChi").image.color = Lib.Orange;
+                ManaReso.Get<Button>("L_SimChi").image.color = Lib.LightGray;
+                ManaReso.Get<Button>("L_English").image.color = Lib.LightGray;
 
                 ManaLan.SwitchLanguage(Lan.ChineseTraditional);
             }
@@ -1741,9 +1757,9 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_SimChi").interactable = false;
                 ManaReso.Get<Button>("L_English").interactable = true;
 
-                ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
-                ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.Orange;
-                ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
+                ManaReso.Get<Button>("L_TraChi").image.color = Lib.LightGray;
+                ManaReso.Get<Button>("L_SimChi").image.color = Lib.Orange;
+                ManaReso.Get<Button>("L_English").image.color = Lib.LightGray;
 
                 ManaLan.SwitchLanguage(Lan.ChineseSimplified);
             }
@@ -1764,9 +1780,9 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_SimChi").interactable = true;
                 ManaReso.Get<Button>("L_English").interactable = false;
 
-                ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
-                ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
-                ManaReso.Get<Button>("L_English").image.color = Shortcut.Orange;
+                ManaReso.Get<Button>("L_TraChi").image.color = Lib.LightGray;
+                ManaReso.Get<Button>("L_SimChi").image.color = Lib.LightGray;
+                ManaReso.Get<Button>("L_English").image.color = Lib.Orange;
 
                 ManaLan.SwitchLanguage(Lan.English);
             }
@@ -1939,6 +1955,250 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region P
+
+        ManaLan.Add(ManaReso.Get<Text>("P_HairLab"), new LanStr("UI", "P_HairLab"));
+        ManaLan.Add(ManaReso.Get<Text>("P_TopLab"), new LanStr("UI", "P_TopLab"));
+        ManaLan.Add(ManaReso.Get<Text>("P_DressLab"), new LanStr("UI", "P_DressLab"));
+        ManaLan.Add(ManaReso.Get<Text>("P_DecaratorLab"), new LanStr("UI", "P_DecaratorLab"));
+        ManaLan.Add(ManaReso.Get<Text>("P_WingLab"), new LanStr("UI", "P_WingLab"));
+
+
+        ManaReso.Get("P_DressRoom").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #region P_Save
+
+        ManaReso.SetButtonEvent
+            (
+                "P_Save",
+                () =>
+                {
+                    ManaPlayer.Player.Save();
+                }
+            );
+
+        #endregion
+
+        #region P_Reset
+
+        ManaReso.SetButtonEvent
+            (
+                "P_Reset",
+                () =>
+                {
+                    ManaPlayer.Player.Reset();
+                }
+            );
+
+        #endregion
+
+        #region P_TabBtn
+
+        ManaReso.Get("P_Hair").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("P_Top").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("P_Dress").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("P_Decarator").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("P_Wing").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
+
+        ManaReso.AddButtonEvent
+        (
+            "P_Hair",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaReso.Get("P_Hair").TweenForScale();
+                ManaReso.Get("P_Top").TweenBacScale();
+                ManaReso.Get("P_Dress").TweenBacScale();
+                ManaReso.Get("P_Decarator").TweenBacScale();
+                ManaReso.Get("P_Wing").TweenBacScale();
+
+                ManaReso.Get("P_Hair").SetAsLastSibling();
+                ManaReso.Get("P_Top").SetSiblingIndex(0);
+                ManaReso.Get("P_Dress").SetSiblingIndex(1);
+                ManaReso.Get("P_Decarator").SetSiblingIndex(2);
+                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+
+                ManaReso.Get<Button>("P_Hair").interactable = false;
+                ManaReso.Get<Button>("P_Top").interactable = true;
+                ManaReso.Get<Button>("P_Dress").interactable = true;
+                ManaReso.Get<Button>("P_Decarator").interactable = true;
+                ManaReso.Get<Button>("P_Wing").interactable = true;
+
+                ManaReso.SetActive("Pa_HairTab", true);
+                ManaReso.SetActive("Pb_TopTab", false);
+                ManaReso.SetActive("Pc_DressTab", false);
+                ManaReso.SetActive("Pd_DecaratorTab", false);
+                ManaReso.SetActive("Pe_WingTab", false);
+
+                ManaReso.SetActive("P_HairIcon", true);
+                ManaReso.SetActive("P_TopIcon", false);
+                ManaReso.SetActive("P_DressIcon", false);
+                ManaReso.SetActive("P_DecaratorIcon", false);
+                ManaReso.SetActive("P_WingIcon", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "P_Top",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaReso.Get("P_Hair").TweenBacScale();
+                ManaReso.Get("P_Top").TweenForScale();
+                ManaReso.Get("P_Dress").TweenBacScale();
+                ManaReso.Get("P_Decarator").TweenBacScale();
+                ManaReso.Get("P_Wing").TweenBacScale();
+
+                ManaReso.Get("P_Hair").SetSiblingIndex(0);
+                ManaReso.Get("P_Top").SetAsLastSibling();
+                ManaReso.Get("P_Dress").SetSiblingIndex(1);
+                ManaReso.Get("P_Decarator").SetSiblingIndex(2);
+                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+
+                ManaReso.Get<Button>("P_Hair").interactable = true;
+                ManaReso.Get<Button>("P_Top").interactable = false;
+                ManaReso.Get<Button>("P_Dress").interactable = true;
+                ManaReso.Get<Button>("P_Decarator").interactable = true;
+                ManaReso.Get<Button>("P_Wing").interactable = true;
+
+                ManaReso.SetActive("Pa_HairTab", false);
+                ManaReso.SetActive("Pb_TopTab", true);
+                ManaReso.SetActive("Pc_DressTab", false);
+                ManaReso.SetActive("Pd_DecaratorTab", false);
+                ManaReso.SetActive("Pe_WingTab", false);
+
+                ManaReso.SetActive("P_HairIcon", false);
+                ManaReso.SetActive("P_TopIcon", true);
+                ManaReso.SetActive("P_DressIcon", false);
+                ManaReso.SetActive("P_DecaratorIcon", false);
+                ManaReso.SetActive("P_WingIcon", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "P_Dress",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaReso.Get("P_Hair").TweenBacScale();
+                ManaReso.Get("P_Top").TweenBacScale();
+                ManaReso.Get("P_Dress").TweenForScale();
+                ManaReso.Get("P_Decarator").TweenBacScale();
+                ManaReso.Get("P_Wing").TweenBacScale();
+
+                ManaReso.Get("P_Hair").SetSiblingIndex(0);
+                ManaReso.Get("P_Top").SetSiblingIndex(1);
+                ManaReso.Get("P_Dress").SetAsLastSibling();
+                ManaReso.Get("P_Decarator").SetSiblingIndex(2);
+                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+
+                ManaReso.Get<Button>("P_Hair").interactable = true;
+                ManaReso.Get<Button>("P_Top").interactable = true;
+                ManaReso.Get<Button>("P_Dress").interactable = false;
+                ManaReso.Get<Button>("P_Decarator").interactable = true;
+                ManaReso.Get<Button>("P_Wing").interactable = true;
+
+                ManaReso.SetActive("Pa_HairTab", false);
+                ManaReso.SetActive("Pb_TopTab", false);
+                ManaReso.SetActive("Pc_DressTab", true);
+                ManaReso.SetActive("Pd_DecaratorTab", false);
+                ManaReso.SetActive("Pe_WingTab", false);
+
+                ManaReso.SetActive("P_HairIcon", false);
+                ManaReso.SetActive("P_TopIcon", false);
+                ManaReso.SetActive("P_DressIcon", true);
+                ManaReso.SetActive("P_DecaratorIcon", false);
+                ManaReso.SetActive("P_WingIcon", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "P_Decarator",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaReso.Get("P_Hair").TweenBacScale();
+                ManaReso.Get("P_Top").TweenBacScale();
+                ManaReso.Get("P_Dress").TweenBacScale();
+                ManaReso.Get("P_Decarator").TweenForScale();
+                ManaReso.Get("P_Wing").TweenBacScale();
+
+                ManaReso.Get("P_Hair").SetSiblingIndex(0);
+                ManaReso.Get("P_Top").SetSiblingIndex(1);
+                ManaReso.Get("P_Dress").SetSiblingIndex(2);
+                ManaReso.Get("P_Decarator").SetAsLastSibling();
+                ManaReso.Get("P_Wing").SetSiblingIndex(3);
+
+                ManaReso.Get<Button>("P_Hair").interactable = true;
+                ManaReso.Get<Button>("P_Top").interactable = true;
+                ManaReso.Get<Button>("P_Dress").interactable = true;
+                ManaReso.Get<Button>("P_Decarator").interactable = false;
+                ManaReso.Get<Button>("P_Wing").interactable = true;
+
+                ManaReso.SetActive("Pa_HairTab", false);
+                ManaReso.SetActive("Pb_TopTab", false);
+                ManaReso.SetActive("Pc_DressTab", false);
+                ManaReso.SetActive("Pd_DecaratorTab", true);
+                ManaReso.SetActive("Pe_WingTab", false);
+
+                ManaReso.SetActive("P_HairIcon", false);
+                ManaReso.SetActive("P_TopIcon", false);
+                ManaReso.SetActive("P_DressIcon", false);
+                ManaReso.SetActive("P_DecaratorIcon", true);
+                ManaReso.SetActive("P_WingIcon", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+            (
+                "P_Wing",
+                () =>
+                {
+                    ManaAudio.PlayClip(Clip.BtnClip);
+
+                    ManaReso.Get("P_Hair").TweenBacScale();
+                    ManaReso.Get("P_Top").TweenBacScale();
+                    ManaReso.Get("P_Dress").TweenBacScale();
+                    ManaReso.Get("P_Decarator").TweenBacScale();
+                    ManaReso.Get("P_Wing").TweenForScale();
+
+                    ManaReso.Get("P_Hair").SetSiblingIndex(0);
+                    ManaReso.Get("P_Top").SetSiblingIndex(1);
+                    ManaReso.Get("P_Dress").SetSiblingIndex(2);
+                    ManaReso.Get("P_Decarator").SetSiblingIndex(3);
+                    ManaReso.Get("P_Wing").SetAsLastSibling();
+
+                    ManaReso.Get<Button>("P_Hair").interactable = true;
+                    ManaReso.Get<Button>("P_Top").interactable = true;
+                    ManaReso.Get<Button>("P_Dress").interactable = true;
+                    ManaReso.Get<Button>("P_Decarator").interactable = true;
+                    ManaReso.Get<Button>("P_Wing").interactable = false;
+
+                    ManaReso.SetActive("Pa_HairTab", false);
+                    ManaReso.SetActive("Pb_TopTab", false);
+                    ManaReso.SetActive("Pc_DressTab", false);
+                    ManaReso.SetActive("Pd_DecaratorTab", false);
+                    ManaReso.SetActive("Pe_WingTab", true);
+
+                    ManaReso.SetActive("P_HairIcon", false);
+                    ManaReso.SetActive("P_TopIcon", false);
+                    ManaReso.SetActive("P_DressIcon", false);
+                    ManaReso.SetActive("P_DecaratorIcon", false);
+                    ManaReso.SetActive("P_WingIcon", true);
+                }
+            );
+
+        #endregion
+
+        #endregion
+
         if (!ManaTutorial.TutorialA)
         {
             HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();

Assets/Script/Manage/ManaVisit.cs

@@ -145,7 +145,17 @@ public class ManaVisit
 
     public static void Exit()
     {
-        ManaReso.Get("I_BlackMask").TweenForCG();
+        TweenRoot tweenRoot = ManaReso.Get("I_BlackMask").TweenForCG();
+
+        tweenRoot.AddEventOnetime
+            (
+                EventType.ForwardFinish,
+                () =>
+                {
+                    ManaCenter.SceneSwitchLock = false;
+                }
+            );
+
 
         ManaReso.SetActive("C_Visit", true);
         ManaReso.SetActive("C_Coin", true);

Assets/Script/Object/Flower.cs

@@ -492,16 +492,21 @@ public class Flower : Regist, IPointerClickHandler
 
         ManaReso.Save(this);
 
+        RetrieveElf();
+
+        Award_ = false;
+
+        ResetAward();
+    }
+
+    public void RetrieveElf()
+    {
         for (int i = 0; i < ElfList.Count; i++)
         {
             ManaReso.Save(ElfList[i]);
         }
 
         ElfList = new List<Transform>();
-
-        Award_ = false;
-
-        ResetAward();
     }
 
     public void PlayParticle()

Assets/Script/Object/Garden.cs

@@ -100,6 +100,12 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #endregion
 
+        #region Garden
+
+        transform.CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad, false, true);
+
+        #endregion
+
         #region GardenMini
 
         ManaReso.Get("GardenMini").CreateTweenVec2D

Assets/Script/Object/Player.cs

@@ -1,10 +1,12 @@
 using DragonBones;
 
 using UnityEngine;
+using UnityEngine.EventSystems;
 
+using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine.EventSystems;
+
 using Slot = DragonBones.Slot;
 using Transform = UnityEngine.Transform;
 
@@ -12,7 +14,15 @@ public class Player : Regist , IPointerClickHandler
 {
     #region 变量
 
-    public bool AnimLock;
+    public static bool InDressRoom;
+    public static float JumpFrequency;
+
+
+    public bool AnimLock1;
+    public bool AnimLock2;
+    public float JumpTime;
+    public float JumpTimer;
+
 
     private string Eye;
     private string Top;
@@ -57,13 +67,65 @@ public class Player : Regist , IPointerClickHandler
 
         Auxiliary.CompileDic(transform, ChildDic);
 
+        Vector3 bigShadowScale = new Vector3(1.820952f, 2.418199f, 1.820952f);
+        Vector3 smallShadowScale = new Vector3(1.081191f, 1.435807f, 1.081191f);
+
+        StreamScale streamScale = ChildDic["Shadow"].CreateStreamScale
+            (
+                new List<float>() {0, 0, 0},
+                new List<float>() {0.33f, 0.33f, 0.33f, 0.33f},
+                new List<VecPair>() {new VecPair(bigShadowScale, smallShadowScale), new VecPair(smallShadowScale, bigShadowScale), new VecPair(bigShadowScale, smallShadowScale), new VecPair(smallShadowScale, bigShadowScale)},
+                true,
+                true,
+                Curve.EaseOutQuad
+            );
+
+        streamScale.AddEventOnetime
+            (
+                EventType.ForwardFinish,
+                () =>
+                {
+                    if (!InDressRoom)
+                    {
+                        ManaPlayer.Player.ChildDic["Shadow"].SetActive(false);
+                    }
+                }
+            );
+
         return false;
     }
 
 
+    public void FixedUpdate()
+    {
+        if (InDressRoom)
+        {
+            JumpTimer += Time.fixedDeltaTime;
+
+            if (JumpTimer > JumpTime)
+            {
+                if (!AnimLock1 && !AnimLock2)
+                {
+                    PlayAnim("newAnimation1");
+                }
+
+                AnimLock2 = true;
+            }
+
+            if (JumpTimer > JumpFrequency)
+            {
+                AnimLock2 = false;
+
+                JumpTime = Mathf.Lerp(0, JumpFrequency, Random.Range(0f, 1f));
+                JumpTimer = 0;
+            }
+        }
+    }
+
+
     public void PlayAnim(string animName)
     {
-        if (AnimLock)
+        if (AnimLock1)
         {
             return;
         }
@@ -83,9 +145,116 @@ public class Player : Regist , IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        PlayAnim("newAnimation1");
+        EnterDressRoom();
+    }
+
+
+    public void Save()
+    {
+        ExitDressRoom();
+    }
+
+    public void Reset()
+    {
+        
+    }
+
+    public void ExitDressRoom()
+    {
+        ManaCenter.SceneSwitchLock = false;
+
+        TweenRoot tweenRoot = ManaReso.Get("I_BlackMask").TweenBacCG();
+
+        tweenRoot.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    ManaPlayer.Player.ChildDic["Shadow"].SetActive(false);
+
+                    ManaPlayer.Player.transform.position = ManaReso.Get("PlayerPosTra").position;
+                    ManaPlayer.Player.transform.localScale = ManaReso.Get("PlayerPosTra").lossyScale;
+
+                    ManaReso.Get("Garden").TweenForSr();
+                    ManaReso.Get("DressRoom").TweenBacSr();
+
+                    ManaReso.Get("C_Main").TweenForCG();
+                    ManaReso.Get("P_DressRoom").TweenBacCG();
+                }
+            );
+
+
+        tweenRoot = ManaReso.Get("P_DressRoom").GetTweenCG();
+
+        tweenRoot.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    SetAllCollider(true);
+
+                    InDressRoom = false;
+
+                    ManaReso.Get("I_BlackMask").TweenForCG();
+                }
+            );
     }
 
+    public void EnterDressRoom()
+    {
+        if (ManaCenter.SceneSwitchLock)
+        {
+            return;
+        }
+
+        InDressRoom = true;
+
+        JumpTime = Mathf.Lerp(0, JumpFrequency, Random.Range(0f, 1f));
+
+        ManaCenter.SceneSwitchLock = true;
+
+
+        ManaReso.Get("C_Main").TweenBacCG();
+
+
+        SetAllCollider(false);
+
+        TweenRoot tweenRoot = ManaReso.Get("I_BlackMask").TweenBacCG();
+
+        tweenRoot.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    for (int i = 0; i < ManaGarden.PlantList.Count; i++)
+                    {
+                        ManaGarden.PlantList[i].Flower.RetrieveElf();
+                    }
+
+                    ManaPlayer.Player.ChildDic["Shadow"].SetActive(true);
+
+                    ManaPlayer.Player.transform.position = ManaReso.Get("P_PlayerPos").position;
+                    ManaPlayer.Player.transform.localScale = ManaReso.Get("P_PlayerPos").lossyScale;
+
+                    ManaReso.Get("Garden").TweenBacSr();
+                    ManaReso.Get("DressRoom").TweenForSr();
+
+                    ManaReso.Get("P_DressRoom").TweenForCG();
+                }
+            );
+
+
+        tweenRoot = ManaReso.Get("P_DressRoom").GetTweenCG();
+
+        tweenRoot.AddEventOnetime
+            (
+                EventType.ForwardFinish,
+                () =>
+                {
+                    ManaReso.Get("I_BlackMask").TweenForCG();
+                }
+            );
+    }
 
     #region 换装
 
@@ -143,6 +312,15 @@ public class Player : Regist , IPointerClickHandler
         Mouse = MouseList[0];
         HeadWear = HeadWearList[0];
 
+
+        List<List<TextureAtlasData>> textureAtlasDatalist = UnityFactory.factory.GetAllTextureAtlasData().Values.ToList();
+
+        for (int i = 0; i < textureAtlasDatalist.Count; i++)
+        {
+            Debug.Log(textureAtlasDatalist[i][0].imagePath);
+        }
+        
+
         return UAC;
     }
 
@@ -204,7 +382,7 @@ public class Player : Regist , IPointerClickHandler
         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>();
@@ -265,7 +443,9 @@ public class Player : Regist , IPointerClickHandler
     {
         if (eventObject.animationState.name == "newAnimation1")
         {
-            AnimLock = true;
+            ChildDic["Shadow"].StreamReForScale();
+
+            AnimLock1 = true;
 
             UAC.armature.GetSlot("眼睛").childArmature = UnityFactory.factory.BuildArmature("眼睛表情1");
 
@@ -273,7 +453,7 @@ public class Player : Regist , IPointerClickHandler
         }
         else if (eventObject.animationState.name == "newAnimation")
         {
-            AnimLock = false;
+            AnimLock1 = false;
 
             UAC.armature.GetSlot("眼睛").childArmature = UnityFactory.factory.BuildArmature(Eye);
 
@@ -475,7 +655,7 @@ public class Player : Regist , IPointerClickHandler
         //GameObject go = uac.gameObject;
 
         //uac = UnityFactory.factory.BuildArmatureComponent(armatureName, "Closet_ske", null, null, go);
-        
+
         //if (uac == null)
         //{
         //    uac = UnityFactory.factory.BuildArmatureComponent(armatureName, "stand_ske", null, null, go);

Assets/Script/Object/Skill/BigSkill.cs

@@ -184,7 +184,7 @@ public class BigSkill : Skill
         UseTimer = float.Parse(attribute[6].Value);
         CoolTimer = float.Parse(attribute[5].Value);
         
-        BarBk1.material = Shortcut.GrayMat;
+        BarBk1.material = Lib.GrayMat;
 
         BarStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[3].Value);
         ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);

Assets/Script/Tool/Auxiliary.cs

@@ -50,7 +50,8 @@ public class Auxiliary : Regist
 {
     #region 变量
 
-    public string String;
+    public string String1;
+    public string String2;
 
     public Font Font;
     public GameObject Go;
@@ -116,7 +117,6 @@ public class Auxiliary : Regist
         //gameObject.AddComponent<ManaAnim>().RegistImmed();
     }
 
-    MaterialUnit materialUnit;
     private void Update()
     {
         #region 调试

Assets/Script/Tool/Bundle.cs

@@ -294,6 +294,7 @@ public class Bundle : MonoBehaviour
             ManaReso.AddAsyncLoad("GroupA", 1, Folder.UI, ObjType.GroupA, true);
             ManaReso.AddAsyncLoad("GroupB", 1, Folder.UI, ObjType.GroupB, true);
             ManaReso.AddAsyncLoad("GroupC", 1, Folder.UI, ObjType.GroupC, true);
+            ManaReso.AddAsyncLoad("GroupE", 1, Folder.UI, ObjType.GroupE, true);
             ManaReso.AddAsyncLoad("GroupD", 1, Folder.UI, ObjType.GroupD, true);
 
             ManaReso.AddAsyncLoad("EventSystem", 1, Folder.UI, ObjType.EventSystem);
@@ -324,6 +325,7 @@ public class Bundle : MonoBehaviour
 
             ManaReso.AddAsyncLoad("Page", 2, Folder.Scene, ObjType.Page);
             ManaReso.AddAsyncLoad("Garden", 1, Folder.Discard, ObjType.Garden);
+            ManaReso.AddAsyncLoad("DressRoom", 1, Folder.Discard, ObjType.DressRoom);
         }
 
         yield return LoadAudio();
@@ -347,6 +349,7 @@ public class Bundle : MonoBehaviour
             ManaReso.AddAsyncLoad<TextAsset>("flower_config", Folder.Config);
             ManaReso.AddAsyncLoad<TextAsset>("offline_config", Folder.Config);
             ManaReso.AddAsyncLoad<TextAsset>("signin_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("dressRoom_config", Folder.Config);
 
             ManaReso.AddAsyncLoad<TextAsset>("English", Folder.Config);
             ManaReso.AddAsyncLoad<TextAsset>("ChineseSimplified", Folder.Config);

Assets/Script/Tool/DashGame/Language.cs

@@ -65,9 +65,9 @@ public class Language
             ManaReso.Get<Button>("L_SimChi").interactable = true;
             ManaReso.Get<Button>("L_English").interactable = false;
 
-            ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
-            ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
-            ManaReso.Get<Button>("L_English").image.color = Shortcut.Orange;
+            ManaReso.Get<Button>("L_TraChi").image.color = Lib.LightGray;
+            ManaReso.Get<Button>("L_SimChi").image.color = Lib.LightGray;
+            ManaReso.Get<Button>("L_English").image.color = Lib.Orange;
         }
         else if (ManaLan.CurrentLan == Lan.ChineseSimplified)
         {
@@ -75,9 +75,9 @@ public class Language
             ManaReso.Get<Button>("L_SimChi").interactable = false;
             ManaReso.Get<Button>("L_English").interactable = true;
 
-            ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
-            ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.Orange;
-            ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
+            ManaReso.Get<Button>("L_TraChi").image.color = Lib.LightGray;
+            ManaReso.Get<Button>("L_SimChi").image.color = Lib.Orange;
+            ManaReso.Get<Button>("L_English").image.color = Lib.LightGray;
         }
         else if (ManaLan.CurrentLan == Lan.ChineseTraditional)
         {
@@ -85,9 +85,9 @@ public class Language
             ManaReso.Get<Button>("L_SimChi").interactable = true;
             ManaReso.Get<Button>("L_English").interactable = true;
 
-            ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.Orange;
-            ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
-            ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
+            ManaReso.Get<Button>("L_TraChi").image.color = Lib.Orange;
+            ManaReso.Get<Button>("L_SimChi").image.color = Lib.LightGray;
+            ManaReso.Get<Button>("L_English").image.color = Lib.LightGray;
         }
     }
 

Assets/Script/Tool/Shortcut.cs → Assets/Script/Tool/Lib.cs

@@ -3,7 +3,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-public class Shortcut
+public class Lib
 {
 
 	public static Color Orange = new Color(233/255f, 63/255f, 20/255f, 1);

Assets/Script/Tool/Shortcut.cs.meta → Assets/Script/Tool/Lib.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 8f27cad580d1d5f428b7fc6f6cc69a38
-timeCreated: 1490946359
+guid: c2d6c583d5070e74dac096289396907c
+timeCreated: 1499658170
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

Assets/Script/Tool/UI/ImagePlus.cs

@@ -50,47 +50,47 @@ public class ImagePlus : Image
                         );
                 }
             }
-        }
 
-        VerticesList = new List<UIVertex[]>();
+            VerticesList = new List<UIVertex[]>();
 
-        if (vertexList.Valid())
-        {
-            for (int i = 0; i < vertexList.Count; i += 4)
+            if (vertexList.Valid())
             {
-                UIVertex v0 = vertexList[i + 0];
-                UIVertex v1 = vertexList[i + 1];
-                UIVertex v2 = vertexList[i + 2];
-                UIVertex v3 = vertexList[i + 3];
+                for (int i = 0; i < vertexList.Count; i += 4)
+                {
+                    UIVertex v0 = vertexList[i + 0];
+                    UIVertex v1 = vertexList[i + 1];
+                    UIVertex v2 = vertexList[i + 2];
+                    UIVertex v3 = vertexList[i + 3];
+
+                    v0.color *= color;
+                    v1.color *= color;
+                    v2.color *= color;
+                    v3.color *= color;
+
+                    VerticesList.Add
+                        (
+                            new UIVertex[]
+                            {
+                                v0,
+                                v1,
+                                v2,
+                                v3
+                            }
+                        );
+                }
+            }
 
-                v0.color *= color;
-                v1.color *= color;
-                v2.color *= color;
-                v3.color *= color;
+            OnPopulateMesh(empty);
 
-                VerticesList.Add
+            Auxiliary.Instance.DelayCall
                 (
-                    new UIVertex[]
+                    () =>
                     {
-                    v0,
-                    v1,
-                    v2,
-                    v3
-                    }
+                        SetVerticesDirty();
+                    },
+                    2
                 );
-            }
         }
-
-        OnPopulateMesh(empty);
-
-        Auxiliary.Instance.DelayCall
-            (
-                () =>
-                {
-                    SetVerticesDirty();
-                },
-                2
-            );
     }
 
     protected override void OnPopulateMesh(VertexHelper toFill)

ToList.txt

@@ -1,6 +1,8 @@
-分享appid申请
+P的语言文档
+
+已购再打个绿颜色的勾
 
-VerticalBestfit计算次数太多时性能低
+DragoneBones的换装 动画事件 得到单个Sprite
 
 
 还原PlayerConfig
@@ -22,4 +24,14 @@ VerticalBestfit
 //更新版本号
 
 
-监督补上循环特效
+分享appid申请
+
+监督补上循环特效
+
+
+小任务 
+{
+  VerticalBestfit计算次数太多时性能低
+
+  Unity是如何实现不同图片也Batch的(看DragonBones源代码)
+}