Temp-试衣间

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

@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -83,7 +83,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

Assets/Extension.meta → Assets/Resource/Animations/人物动画/备份.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: b948198483a8b93419206e81215060f3
+guid: 046dd66766911d344bf9123ea9b0281f
 folderAsset: yes
-timeCreated: 1496150477
+timeCreated: 1500011334
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Resource/Animations/人物动画/备份/Closet_ske.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bccb2279cbdb53941b7e20b625e843d2
+timeCreated: 1500011345
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Animations/人物动画/备份/Closet_tex.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 49cd2fb2651558b48bdda33e1651ac75
+timeCreated: 1500011345
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Animations/人物动画/备份/Closet_tex.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: f7ec5bfaa08d6494a93522a4a9241b5f
+timeCreated: 1500011345
+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

@@ -1,20 +1,20 @@
 <data>
-  <item id="1" jump_frequency="10" name="" type="" index="" bodypart="" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" />
-  <item id="2" jump_frequency="" name="脑壳1" type="1" index="0" bodypart="1" level="0" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="120" />
-  <item id="3" jump_frequency="" name="脑壳2" type="1" index="1" bodypart="1" level="0" buy_currency="2" buy_amt="1000" buy_advance_currency="" buy_advance_amt="" pixelSize="105" />
-  <item id="4" jump_frequency="" name="脑壳3" type="1" index="2" bodypart="1" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="5" jump_frequency="" name="裙子1" type="3" index="0" bodypart="2" level="0" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="6" jump_frequency="" name="裙子2" type="3" index="1" bodypart="2" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="7" jump_frequency="" name="裙子3" type="3" index="2" bodypart="2" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="8" jump_frequency="" name="鞋子1" type="3" index="3" bodypart="3" level="0" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="40" />
-  <item id="9" jump_frequency="" name="鞋子2" type="3" index="4" bodypart="3" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" />
-  <item id="10" jump_frequency="" name="鞋子3" type="3" index="5" bodypart="3" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" />
-  <item id="11" jump_frequency="" name="头饰品1" type="4" index="0" bodypart="4" level="0" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="12" jump_frequency="" name="头饰品2" type="4" index="1" bodypart="4" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="13" jump_frequency="" name="头饰品3" type="4" index="2" bodypart="4" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="14" jump_frequency="" name="上衣1" type="2" index="0" bodypart="5" level="0" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="15" jump_frequency="" name="上衣2" type="2" index="1" bodypart="5" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
-  <item id="16" jump_frequency="" name="上衣3" type="2" index="2" bodypart="5" level="0" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" />
+  <item id="1" jump_frequency="10" type="" index="" bodypart="" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" spriteName="" armatureName="" />
+  <item id="2" jump_frequency="" type="1" index="0" bodypart="1" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="120" spriteName="脑壳1" armatureName="脑壳1" />
+  <item id="3" jump_frequency="" type="1" index="1" bodypart="1" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="105" spriteName="脑壳2" armatureName="脑壳2" />
+  <item id="4" jump_frequency="" type="1" index="2" bodypart="1" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="脑壳3" armatureName="脑壳3" />
+  <item id="5" jump_frequency="" type="3" index="0" bodypart="2" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="裙子1" armatureName="裙子1" />
+  <item id="6" jump_frequency="" type="3" index="1" bodypart="2" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="裙子2" armatureName="裙子2" />
+  <item id="7" jump_frequency="" type="3" index="2" bodypart="2" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="裙子3" armatureName="裙子3" />
+  <item id="8" jump_frequency="" type="3" index="3" bodypart="3" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="40" spriteName="鞋子1" armatureName="鞋子1" />
+  <item id="9" jump_frequency="" type="3" index="4" bodypart="3" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="40" spriteName="鞋子2" armatureName="鞋子2" />
+  <item id="10" jump_frequency="" type="3" index="5" bodypart="3" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="40" spriteName="鞋子3" armatureName="鞋子3" />
+  <item id="11" jump_frequency="" type="4" index="0" bodypart="4" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="头饰品1" armatureName="头饰品1" />
+  <item id="12" jump_frequency="" type="4" index="1" bodypart="4" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="头饰品2" armatureName="头饰品2" />
+  <item id="13" jump_frequency="" type="4" index="2" bodypart="4" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="头饰品3" armatureName="头饰品3" />
+  <item id="14" jump_frequency="" type="2" index="0" bodypart="5" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="上衣1" armatureName="上衣1" />
+  <item id="15" jump_frequency="" type="2" index="1" bodypart="5" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="上衣2" armatureName="上衣2" />
+  <item id="16" jump_frequency="" type="2" index="2" bodypart="5" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" spriteName="上衣3" armatureName="上衣3" />
   <comment>
     <id>
 id
@@ -22,9 +22,6 @@ id
     <jump_frequency>
 每过多久必然跳且只跳一次
 </jump_frequency>
-    <name>
-资源名字
-</name>
     <type>
 类型
 </type>
@@ -52,5 +49,11 @@ id
     <pixelSize>
 Sprite大小
 </pixelSize>
+    <spriteName>
+sprite名字
+</spriteName>
+    <armatureName>
+骨骼名字
+</armatureName>
   </comment>
 </data>

Assets/Script/Manage/ManaPlayer.cs

@@ -18,6 +18,7 @@ public class ManaPlayer : Regist
     #region 变量
 
     public static bool Complete;
+    public static bool DressRoomInitialized;
     public static Transform SeleTra;
 
     public static Player Player;
@@ -88,7 +89,37 @@ public class ManaPlayer : Regist
 
         #region DressRoom
 
-        #region Close
+        DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
+
+        List<int> dressList = ManaData.GetDressList();
+
+        for (int i = 0; i < dressList.Count; i++)
+        {
+            BoughtCloseList.Add(dressList[i]);
+        }
+
+        #endregion
+    }
+
+    public override void RegistValueA()
+    {
+        Instance = this;
+
+        ManaReso.Get("DressRoom").CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+    }
+
+
+    public static void InitializeDressRoom()
+    {
+        if (DressRoomInitialized)
+        {
+            return;
+        }
+
+        DressRoomInitialized = true;
+
+
+        #region Sprite
 
         List<List<TextureAtlasData>> textureAtlasDatalist = UnityFactory.factory.GetAllTextureAtlasData().Values.ToList();
 
@@ -116,8 +147,6 @@ public class ManaPlayer : Regist
 
         #endregion
 
-        DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
-
         List<XmlAttributeCollection> attributeList = ManaData.GetDressRoomConfig();
 
         Player.JumpFrequency = float.Parse(attributeList[0][1].Value);
@@ -127,23 +156,10 @@ public class ManaPlayer : Regist
             new CloseUnit(attributeList[i]);
         }
 
-        List<int> dressList = ManaData.GetDressList();
-
-        for (int i = 0; i < dressList.Count; i++)
+        for (int i = 0; i < BoughtCloseList.Count; i++)
         {
-            BoughtCloseList.Add(dressList[i]);
-
-            CloseUnitDic[dressList[i]].Unlock();
+            CloseUnitDic[BoughtCloseList[i]].Unlock();
         }
-
-        #endregion
-    }
-
-    public override void RegistValueA()
-    {
-        Instance = this;
-
-        ManaReso.Get("DressRoom").CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
     }
 
 

Assets/Script/Object/Player.cs

@@ -40,7 +40,7 @@ public class CloseUnit
 
     public string Description
     {
-        get { return Language.GetStr("DressRoom", CloseName); }
+        get { return Language.GetStr("DressRoom", ArmatureName); }
     }
 
     public int ID;
@@ -48,10 +48,10 @@ public class CloseUnit
     public int BuyLevel;
     public int PixelSize;
     public bool Bought;
-    public string CloseName;
+    public string ArmatureName;
 
     public Text BuyBtnLab;
-    public Sprite Sprite;
+    public Sprite[] Sprites;
     public Image Icon;
     public Button BuyBtn;
     public Button DressBtn;
@@ -71,19 +71,19 @@ public class CloseUnit
     public CloseUnit(XmlAttributeCollection attribute)
     {
         ID = Auxiliary.IntParse(attribute[0].Value, -1);
-        CloseName = attribute[2].Value;
-        Sprite = SpriteParse(attribute[2].Value);
-        Type = TypeParse(attribute[3].Value);
-        Index = Auxiliary.IntParse(attribute[4].Value, -1);
-        BodyPart = BodyPartParse(attribute[5].Value);
-        BuyLevel = Auxiliary.IntParse(attribute[6].Value, 0);
-        BuyCurrent = Auxiliary.CurrentParse(attribute[7].Value);
-        BuyAmt = Auxiliary.DoubleParse(attribute[8].Value, 0);
-        BuyAdvanceCurrent = Auxiliary.CurrentParse(attribute[9].Value);
-        BuyAdvanceAmt = Auxiliary.DoubleParse(attribute[10].Value, 0);
-        PixelSize = Auxiliary.IntParse(attribute[11].Value, 100);
-
-        ManaPlayer.CloseIDDic.Add(CloseName, ID);
+        Type = TypeParse(attribute[2].Value);
+        Index = Auxiliary.IntParse(attribute[3].Value, -1);
+        BodyPart = BodyPartParse(attribute[4].Value);
+        BuyLevel = Auxiliary.IntParse(attribute[5].Value, 0);
+        BuyCurrent = Auxiliary.CurrentParse(attribute[6].Value);
+        BuyAmt = Auxiliary.DoubleParse(attribute[7].Value, 0);
+        BuyAdvanceCurrent = Auxiliary.CurrentParse(attribute[8].Value);
+        BuyAdvanceAmt = Auxiliary.DoubleParse(attribute[9].Value, 0);
+        PixelSize = Auxiliary.IntParse(attribute[10].Value, 100);
+        Sprites = SpriteParse(attribute[11].Value);
+        ArmatureName = attribute[12].Value;
+
+        ManaPlayer.CloseIDDic.Add(ArmatureName, ID);
         ManaPlayer.CloseUnitDic.Add(ID, this);
 
         CreateItem();
@@ -129,7 +129,7 @@ public class CloseUnit
         BuyBtnLab = ChildDic["BuyBtnLab"].GetComponent<Text>();
 
 
-        Icon.sprite = Sprite;
+        Icon.sprite = Sprites[0];
 
         Icon.SetNativeSize();
 
@@ -148,7 +148,7 @@ public class CloseUnit
                     ManaReso.Get("Pa_Info").TweenForCG();
 
                     Image image = ManaReso.Get<Image>("Pa_Icon");
-                    image.sprite = Sprite;
+                    image.sprite = Sprites[0];
                     image.Resize(true, new Vector2(newSize, newSize));
 
                     ManaReso.SetText("Pa_Lab", Description);
@@ -168,14 +168,23 @@ public class CloseUnit
                 {
                     ManaAudio.PlayClip(Clip.BtnClip);
 
-                    ManaPlayer.Player.ChangeClose(BodyPart, CloseName);
+                    ManaPlayer.Player.ChangeClose(BodyPart, ArmatureName);
                 }
             );
     }
 
-    protected Sprite SpriteParse(string str)
+    protected Sprite[] SpriteParse(string str)
     {
-        return ManaPlayer.CloseSpriteDic[str];
+        string[] spriteNames = str.Split(',');
+
+        Sprite[] sprites = new Sprite[spriteNames.Length];
+
+        for (int i = 0; i < spriteNames.Length; i++)
+        {
+            sprites[i] = ManaPlayer.CloseSpriteDic[spriteNames[i]];
+        }
+
+        return sprites;
     }
 
     protected BodyPart BodyPartParse(string str)
@@ -345,6 +354,11 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
+    public void Update()
+    {
+
+    }
+
     public void FixedUpdate()
     {
         if (InDressRoom)
@@ -601,6 +615,8 @@ public class Player : Regist , IPointerClickHandler
                 EventType.ForwardFinish,
                 () =>
                 {
+                    ManaPlayer.InitializeDressRoom();
+
                     ManaReso.Get("I_BlackMask").TweenForCG();
                 }
             );

Assets/脑壳2+下（棕色）另一种发型.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: eafb9320c493ec245855e31ef3b0766f
+timeCreated: 1500003885
+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/脑壳2.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: d6848e1d0086b074d967ab70c8b8306c
+timeCreated: 1500003885
+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: 

ToList.txt

@@ -1,3 +1,8 @@
+Player要增加一个头发的Armature CloseItem和pa_Info要增加一个Icon
+
+合并存档
+
+
 还原PlayerConfig
 
 关闭调试界面