新增-试衣间换头发

Assets/Extension.meta

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

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -1,20 +1,46 @@
 <data>
-  <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" />
+  <item id="1" jump_frequency="10" type="" index="" bodypart="" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" spriteName="" armatureName="" />
+  <item id="2" jump_frequency="" type="1" index="0" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" spriteName="脑壳1" armatureName="脑壳1" />
+  <item id="3" jump_frequency="" type="1" index="1" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" spriteName="脑壳1(棕色)" armatureName="脑壳1(棕色)" />
+  <item id="4" jump_frequency="" type="1" index="2" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" spriteName="脑壳1(粉色)" armatureName="脑壳1(粉色)" />
+  <item id="5" jump_frequency="" type="1" index="3" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2(黄色)" armatureName="脑壳2(黄色)" />
+  <item id="6" jump_frequency="" type="1" index="4" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2" armatureName="脑壳2(棕色)" />
+  <item id="7" jump_frequency="" type="1" index="5" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2(粉色)" armatureName="脑壳2(粉色)" />
+  <item id="8" jump_frequency="" type="1" index="6" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2(黄色),脑壳3+下（黄色）脑壳2——下" armatureName="脑壳2B(黄色)" />
+  <item id="9" jump_frequency="" type="1" index="7" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2,脑壳2+下（棕色）另一种发型" armatureName="脑壳2B(棕色)" />
+  <item id="10" jump_frequency="" type="1" index="8" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2(粉色),脑壳2+下（粉色）另一种发型" armatureName="脑壳2B(粉色)" />
+  <item id="11" jump_frequency="" type="1" index="9" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（粉色）,脑壳3+下（粉色）" armatureName="脑壳3(粉色)" />
+  <item id="12" jump_frequency="" type="1" index="10" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（紫色）,脑壳3+下（紫色）" armatureName="脑壳3(紫色)" />
+  <item id="13" jump_frequency="" type="1" index="11" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上（黄色）,脑壳3+下（黄色）脑壳2——下" armatureName="脑壳3(黄色)" />
+  <item id="14" jump_frequency="" type="1" index="12" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头发4（粉色）" armatureName="头发4（粉色）" />
+  <item id="15" jump_frequency="" type="1" index="13" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头发4（绿色）" armatureName="头发4（绿色）" />
+  <item id="16" jump_frequency="" type="1" index="14" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头发4（蓝色）" armatureName="头发4（蓝色）" />
+  <item id="17" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="头发5（棕色）" armatureName="头发5（棕色）" />
+  <item id="18" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="头发5（红色）" armatureName="头发5（红色）" />
+  <item id="19" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="头发5（黄色）" armatureName="头发5（黄色）" />
+  <item id="20" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="15" icon1offset="109.42,-91.88" spriteName="头发6+上（棕）,头发6+下（棕）" armatureName="头发6(棕)" />
+  <item id="21" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="15" icon1offset="109.42,-91.88" spriteName="头发6+上（粉）,头发6+下（粉）" armatureName="头发6(粉)" />
+  <item id="22" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="15" icon1offset="109.42,-91.88" spriteName="头发6+上（绿）,头发6+下（绿）" armatureName="头发6(绿)" />
+  <item id="23" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="15" icon1offset="109.42,-91.88" spriteName="头发6+上（黄）,头发6+下（黄）" armatureName="头发6(黄)" />
+  <item id="24" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="头发7(橙)" armatureName="头发7(橙)" />
+  <item id="25" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="头发7(米白)" armatureName="头发7(米白)" />
+  <item id="26" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="头发7(蓝色)" armatureName="头发7(蓝色)" />
+  <item id="27" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" spriteName="头发8(粉)" armatureName="头发8(粉)" />
+  <item id="28" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" spriteName="头发8(紫)" armatureName="头发8(紫)" />
+  <item id="29" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" spriteName="头发8(绿)" armatureName="头发8(绿)" />
+  <item id="30" jump_frequency="" type="1" index="15" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" spriteName="头发8(黑)" armatureName="头发8(黑)" />
+  <item id="31" jump_frequency="" type="3" index="0" bodypart="2" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="裙子1" armatureName="裙子1" />
+  <item id="32" jump_frequency="" type="3" index="1" bodypart="2" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="裙子2" armatureName="裙子2" />
+  <item id="33" jump_frequency="" type="3" index="2" bodypart="2" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="裙子3" armatureName="裙子3" />
+  <item id="34" jump_frequency="" type="3" index="3" bodypart="3" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" spriteName="鞋子1" armatureName="鞋子1" />
+  <item id="35" jump_frequency="" type="3" index="4" bodypart="3" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" spriteName="鞋子2" armatureName="鞋子2" />
+  <item id="36" jump_frequency="" type="3" index="5" bodypart="3" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" spriteName="鞋子3" armatureName="鞋子3" />
+  <item id="37" jump_frequency="" type="4" index="0" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰品1" armatureName="头饰品1" />
+  <item id="38" jump_frequency="" type="4" index="1" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰品2" armatureName="头饰品2" />
+  <item id="39" jump_frequency="" type="4" index="2" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰品3" armatureName="头饰品3" />
+  <item id="40" jump_frequency="" type="2" index="0" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣1" armatureName="上衣1" />
+  <item id="41" jump_frequency="" type="2" index="1" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣2" armatureName="上衣2" />
+  <item id="42" jump_frequency="" type="2" index="2" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣3" armatureName="上衣3" />
   <comment>
     <id>
 id
@@ -49,6 +75,12 @@ id
     <pixelSize>
 Sprite大小
 </pixelSize>
+    <iconOffset>
+两个sprite的偏移
+</iconOffset>
+    <icon1offset>
+第二个Sprite的额外偏移
+</icon1offset>
     <spriteName>
 sprite名字
 </spriteName>

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="670" />
+  <Version value="671" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -26,7 +26,7 @@
 
   <Player value="PlayerBlond" />
   <PlantList value =""/>
-  <DressList value ="2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"/>
+  <DressList value ="2 6 11 31 32 33 34 35 36 37 38 39 40 41 42"/>
   <FlowerList value="1" />
   <AchieveList value="" />
   <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse=""/>

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -93,6 +93,7 @@
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
+    <I_Lab desc=""><![CDATA[加载中]]></I_Lab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
@@ -392,20 +393,46 @@
     <ShareUrl desc=""><![CDATA[https://www.taptap.com/app/52648]]></ShareUrl>
   </Android>
   <DressRoom>
-    <脑壳1 desc=""><![CDATA[服装的说明]]></脑壳1>
-    <脑壳2 desc=""><![CDATA[服装的说明]]></脑壳2>
-    <脑壳3 desc=""><![CDATA[服装的说明]]></脑壳3>
-    <裙子1 desc=""><![CDATA[服装的说明]]></裙子1>
-    <裙子2 desc=""><![CDATA[服装的说明]]></裙子2>
-    <裙子3 desc=""><![CDATA[服装的说明]]></裙子3>
-    <鞋子1 desc=""><![CDATA[服装的说明]]></鞋子1>
-    <鞋子2 desc=""><![CDATA[服装的说明]]></鞋子2>
-    <鞋子3 desc=""><![CDATA[服装的说明]]></鞋子3>
-    <头饰品1 desc=""><![CDATA[服装的说明]]></头饰品1>
-    <头饰品2 desc=""><![CDATA[服装的说明]]></头饰品2>
-    <头饰品3 desc=""><![CDATA[服装的说明]]></头饰品3>
-    <上衣1 desc=""><![CDATA[服装的说明]]></上衣1>
-    <上衣2 desc=""><![CDATA[服装的说明]]></上衣2>
-    <上衣3 desc=""><![CDATA[服装的说明]]></上衣3>
+    <Armature2 desc=""><![CDATA[服装的说明]]></Armature2>
+    <Armature3 desc=""><![CDATA[服装的说明]]></Armature3>
+    <Armature4 desc=""><![CDATA[服装的说明]]></Armature4>
+    <Armature5 desc=""><![CDATA[服装的说明]]></Armature5>
+    <Armature6 desc=""><![CDATA[服装的说明]]></Armature6>
+    <Armature7 desc=""><![CDATA[服装的说明]]></Armature7>
+    <Armature8 desc=""><![CDATA[服装的说明]]></Armature8>
+    <Armature9 desc=""><![CDATA[服装的说明]]></Armature9>
+    <Armature10 desc=""><![CDATA[服装的说明]]></Armature10>
+    <Armature11 desc=""><![CDATA[服装的说明]]></Armature11>
+    <Armature12 desc=""><![CDATA[服装的说明]]></Armature12>
+    <Armature13 desc=""><![CDATA[服装的说明]]></Armature13>
+    <Armature14 desc=""><![CDATA[服装的说明]]></Armature14>
+    <Armature15 desc=""><![CDATA[服装的说明]]></Armature15>
+    <Armature16 desc=""><![CDATA[服装的说明]]></Armature16>
+    <Armature17 desc=""><![CDATA[服装的说明]]></Armature17>
+    <Armature18 desc=""><![CDATA[服装的说明]]></Armature18>
+    <Armature19 desc=""><![CDATA[服装的说明]]></Armature19>
+    <Armature20 desc=""><![CDATA[服装的说明]]></Armature20>
+    <Armature21 desc=""><![CDATA[服装的说明]]></Armature21>
+    <Armature22 desc=""><![CDATA[服装的说明]]></Armature22>
+    <Armature23 desc=""><![CDATA[服装的说明]]></Armature23>
+    <Armature24 desc=""><![CDATA[服装的说明]]></Armature24>
+    <Armature25 desc=""><![CDATA[服装的说明]]></Armature25>
+    <Armature26 desc=""><![CDATA[服装的说明]]></Armature26>
+    <Armature27 desc=""><![CDATA[服装的说明]]></Armature27>
+    <Armature28 desc=""><![CDATA[服装的说明]]></Armature28>
+    <Armature29 desc=""><![CDATA[服装的说明]]></Armature29>
+    <Armature30 desc=""><![CDATA[服装的说明]]></Armature30>
+    <Armature31 desc=""><![CDATA[服装的说明]]></Armature31>
+    <Armature32 desc=""><![CDATA[服装的说明]]></Armature32>
+    <Armature33 desc=""><![CDATA[服装的说明]]></Armature33>
+    <Armature34 desc=""><![CDATA[服装的说明]]></Armature34>
+    <Armature35 desc=""><![CDATA[服装的说明]]></Armature35>
+    <Armature36 desc=""><![CDATA[服装的说明]]></Armature36>
+    <Armature37 desc=""><![CDATA[服装的说明]]></Armature37>
+    <Armature38 desc=""><![CDATA[服装的说明]]></Armature38>
+    <Armature39 desc=""><![CDATA[服装的说明]]></Armature39>
+    <Armature40 desc=""><![CDATA[服装的说明]]></Armature40>
+    <Armature41 desc=""><![CDATA[服装的说明]]></Armature41>
+    <Armature42 desc=""><![CDATA[服装的说明]]></Armature42>
   </DressRoom>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -93,6 +93,7 @@
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
+    <I_Lab desc=""><![CDATA[加載中]]></I_Lab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
@@ -392,20 +393,46 @@
     <ShareUrl desc=""><![CDATA[]]></ShareUrl>
   </Android>
   <DressRoom>
-    <脑壳1 desc=""><![CDATA[]]></脑壳1>
-    <脑壳2 desc=""><![CDATA[]]></脑壳2>
-    <脑壳3 desc=""><![CDATA[]]></脑壳3>
-    <裙子1 desc=""><![CDATA[]]></裙子1>
-    <裙子2 desc=""><![CDATA[]]></裙子2>
-    <裙子3 desc=""><![CDATA[]]></裙子3>
-    <鞋子1 desc=""><![CDATA[]]></鞋子1>
-    <鞋子2 desc=""><![CDATA[]]></鞋子2>
-    <鞋子3 desc=""><![CDATA[]]></鞋子3>
-    <头饰品1 desc=""><![CDATA[]]></头饰品1>
-    <头饰品2 desc=""><![CDATA[]]></头饰品2>
-    <头饰品3 desc=""><![CDATA[]]></头饰品3>
-    <上衣1 desc=""><![CDATA[]]></上衣1>
-    <上衣2 desc=""><![CDATA[]]></上衣2>
-    <上衣3 desc=""><![CDATA[]]></上衣3>
+    <Armature2 desc=""><![CDATA[]]></Armature2>
+    <Armature3 desc=""><![CDATA[]]></Armature3>
+    <Armature4 desc=""><![CDATA[]]></Armature4>
+    <Armature5 desc=""><![CDATA[]]></Armature5>
+    <Armature6 desc=""><![CDATA[]]></Armature6>
+    <Armature7 desc=""><![CDATA[]]></Armature7>
+    <Armature8 desc=""><![CDATA[]]></Armature8>
+    <Armature9 desc=""><![CDATA[]]></Armature9>
+    <Armature10 desc=""><![CDATA[]]></Armature10>
+    <Armature11 desc=""><![CDATA[]]></Armature11>
+    <Armature12 desc=""><![CDATA[]]></Armature12>
+    <Armature13 desc=""><![CDATA[]]></Armature13>
+    <Armature14 desc=""><![CDATA[]]></Armature14>
+    <Armature15 desc=""><![CDATA[]]></Armature15>
+    <Armature16 desc=""><![CDATA[]]></Armature16>
+    <Armature17 desc=""><![CDATA[]]></Armature17>
+    <Armature18 desc=""><![CDATA[]]></Armature18>
+    <Armature19 desc=""><![CDATA[]]></Armature19>
+    <Armature20 desc=""><![CDATA[]]></Armature20>
+    <Armature21 desc=""><![CDATA[]]></Armature21>
+    <Armature22 desc=""><![CDATA[]]></Armature22>
+    <Armature23 desc=""><![CDATA[]]></Armature23>
+    <Armature24 desc=""><![CDATA[]]></Armature24>
+    <Armature25 desc=""><![CDATA[]]></Armature25>
+    <Armature26 desc=""><![CDATA[]]></Armature26>
+    <Armature27 desc=""><![CDATA[]]></Armature27>
+    <Armature28 desc=""><![CDATA[]]></Armature28>
+    <Armature29 desc=""><![CDATA[]]></Armature29>
+    <Armature30 desc=""><![CDATA[]]></Armature30>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
+    <Armature32 desc=""><![CDATA[]]></Armature32>
+    <Armature33 desc=""><![CDATA[]]></Armature33>
+    <Armature34 desc=""><![CDATA[]]></Armature34>
+    <Armature35 desc=""><![CDATA[]]></Armature35>
+    <Armature36 desc=""><![CDATA[]]></Armature36>
+    <Armature37 desc=""><![CDATA[]]></Armature37>
+    <Armature38 desc=""><![CDATA[]]></Armature38>
+    <Armature39 desc=""><![CDATA[]]></Armature39>
+    <Armature40 desc=""><![CDATA[]]></Armature40>
+    <Armature41 desc=""><![CDATA[]]></Armature41>
+    <Armature42 desc=""><![CDATA[]]></Armature42>
   </DressRoom>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -93,6 +93,7 @@
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[13级开放试衣间]]></N_Lab>
+    <I_Lab desc=""><![CDATA[Loading]]></I_Lab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>
@@ -392,20 +393,46 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <ShareUrl desc=""><![CDATA[]]></ShareUrl>
   </Android>
   <DressRoom>
-    <脑壳1 desc=""><![CDATA[]]></脑壳1>
-    <脑壳2 desc=""><![CDATA[]]></脑壳2>
-    <脑壳3 desc=""><![CDATA[]]></脑壳3>
-    <裙子1 desc=""><![CDATA[]]></裙子1>
-    <裙子2 desc=""><![CDATA[]]></裙子2>
-    <裙子3 desc=""><![CDATA[]]></裙子3>
-    <鞋子1 desc=""><![CDATA[]]></鞋子1>
-    <鞋子2 desc=""><![CDATA[]]></鞋子2>
-    <鞋子3 desc=""><![CDATA[]]></鞋子3>
-    <头饰品1 desc=""><![CDATA[]]></头饰品1>
-    <头饰品2 desc=""><![CDATA[]]></头饰品2>
-    <头饰品3 desc=""><![CDATA[]]></头饰品3>
-    <上衣1 desc=""><![CDATA[]]></上衣1>
-    <上衣2 desc=""><![CDATA[]]></上衣2>
-    <上衣3 desc=""><![CDATA[]]></上衣3>
+    <Armature2 desc=""><![CDATA[]]></Armature2>
+    <Armature3 desc=""><![CDATA[]]></Armature3>
+    <Armature4 desc=""><![CDATA[]]></Armature4>
+    <Armature5 desc=""><![CDATA[]]></Armature5>
+    <Armature6 desc=""><![CDATA[]]></Armature6>
+    <Armature7 desc=""><![CDATA[]]></Armature7>
+    <Armature8 desc=""><![CDATA[]]></Armature8>
+    <Armature9 desc=""><![CDATA[]]></Armature9>
+    <Armature10 desc=""><![CDATA[]]></Armature10>
+    <Armature11 desc=""><![CDATA[]]></Armature11>
+    <Armature12 desc=""><![CDATA[]]></Armature12>
+    <Armature13 desc=""><![CDATA[]]></Armature13>
+    <Armature14 desc=""><![CDATA[]]></Armature14>
+    <Armature15 desc=""><![CDATA[]]></Armature15>
+    <Armature16 desc=""><![CDATA[]]></Armature16>
+    <Armature17 desc=""><![CDATA[]]></Armature17>
+    <Armature18 desc=""><![CDATA[]]></Armature18>
+    <Armature19 desc=""><![CDATA[]]></Armature19>
+    <Armature20 desc=""><![CDATA[]]></Armature20>
+    <Armature21 desc=""><![CDATA[]]></Armature21>
+    <Armature22 desc=""><![CDATA[]]></Armature22>
+    <Armature23 desc=""><![CDATA[]]></Armature23>
+    <Armature24 desc=""><![CDATA[]]></Armature24>
+    <Armature25 desc=""><![CDATA[]]></Armature25>
+    <Armature26 desc=""><![CDATA[]]></Armature26>
+    <Armature27 desc=""><![CDATA[]]></Armature27>
+    <Armature28 desc=""><![CDATA[]]></Armature28>
+    <Armature29 desc=""><![CDATA[]]></Armature29>
+    <Armature30 desc=""><![CDATA[]]></Armature30>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
+    <Armature32 desc=""><![CDATA[]]></Armature32>
+    <Armature33 desc=""><![CDATA[]]></Armature33>
+    <Armature34 desc=""><![CDATA[]]></Armature34>
+    <Armature35 desc=""><![CDATA[]]></Armature35>
+    <Armature36 desc=""><![CDATA[]]></Armature36>
+    <Armature37 desc=""><![CDATA[]]></Armature37>
+    <Armature38 desc=""><![CDATA[]]></Armature38>
+    <Armature39 desc=""><![CDATA[]]></Armature39>
+    <Armature40 desc=""><![CDATA[]]></Armature40>
+    <Armature41 desc=""><![CDATA[]]></Armature41>
+    <Armature42 desc=""><![CDATA[]]></Armature42>
   </DressRoom>
 </lan>

Assets/Script/Manage/Initializer.cs

@@ -1,13 +1,13 @@
 using LitJson;
 
 using UnityEngine;
+using UnityEngine.UI;
 using UnityEngine.EventSystems;
 
 using System;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine.UI;
 
 public class Initializer : MonoBehaviour
 {

Assets/Script/Manage/ManaData.cs

@@ -850,15 +850,15 @@ public class ManaData : Regist
 
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        if (nativeVersion < 670)
+        if (nativeVersion < 671)
         {
-            To670(nativeDoc, defaultDoc);
+            To671(nativeDoc, defaultDoc);
         }
 
         return nativeDoc;
     }
 
-    public static XmlDocument To670(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument To671(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         string playerType = "";
         XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
@@ -899,7 +899,7 @@ public class ManaData : Regist
         }
 
 
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 670.ToString();
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 671.ToString();
 
         xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
         xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");

Assets/Script/Manage/ManaPlayer.cs

@@ -89,6 +89,11 @@ public class ManaPlayer : Regist
 
         #region DressRoom
 
+        List<XmlAttributeCollection> attributeList = ManaData.GetDressRoomConfig();
+
+        Player.JumpFrequency = float.Parse(attributeList[0][1].Value);
+
+
         DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
 
         List<int> dressList = ManaData.GetDressList();
@@ -149,8 +154,6 @@ public class ManaPlayer : Regist
 
         List<XmlAttributeCollection> attributeList = ManaData.GetDressRoomConfig();
 
-        Player.JumpFrequency = float.Parse(attributeList[0][1].Value);
-
         for (int i = 1; i < attributeList.Count; i++)
         {
             new CloseUnit(attributeList[i]);
@@ -160,6 +163,8 @@ public class ManaPlayer : Regist
         {
             CloseUnitDic[BoughtCloseList[i]].Unlock();
         }
+
+        ManaReso.SetActive("I_Lab", false);
     }
 
 

Assets/Script/Object/Player.cs

@@ -40,7 +40,7 @@ public class CloseUnit
 
     public string Description
     {
-        get { return Language.GetStr("DressRoom", ArmatureName); }
+        get { return Language.GetStr("DressRoom", "Armature" + ID); }
     }
 
     public int ID;
@@ -50,11 +50,14 @@ public class CloseUnit
     public bool Bought;
     public string ArmatureName;
 
+    public float IconOffset;
     public Text BuyBtnLab;
     public Sprite[] Sprites;
-    public Image Icon;
+    public Image Icon1;
+    public Image Icon2;
     public Button BuyBtn;
     public Button DressBtn;
+    public Vector2 Icon1Offset;
     public BodyPart BodyPart;
     public Transform Transform;
     public CloseType Type;
@@ -80,8 +83,10 @@ public class CloseUnit
         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;
+        IconOffset = Auxiliary.FloatParse(attribute[11].Value, 0);
+        Icon1Offset = Auxiliary.VectorParse(',', attribute[12].Value, new Vector3());
+        Sprites = SpriteParse(attribute[13].Value);
+        ArmatureName = attribute[14].Value;
 
         ManaPlayer.CloseIDDic.Add(ArmatureName, ID);
         ManaPlayer.CloseUnitDic.Add(ID, this);
@@ -123,18 +128,30 @@ public class CloseUnit
 
         Auxiliary.CompileDic(Transform, ChildDic);
 
-        Icon = ChildDic["Icon"].GetComponent<Image>();
+        Icon1 = ChildDic["Icon1"].GetComponent<Image>();
+        Icon2 = ChildDic["Icon2"].GetComponent<Image>();
         DressBtn = ChildDic["CloseItem"].GetComponent<Button>();
         BuyBtn = ChildDic["BuyBtn"].GetComponent<Button>();
         BuyBtnLab = ChildDic["BuyBtnLab"].GetComponent<Text>();
 
 
-        Icon.sprite = Sprites[0];
+        Icon2.sprite = Sprites[0];
 
-        Icon.SetNativeSize();
+        float newSize = PixelSize / Icon2.sprite.rect.width;
+        Icon2.Resize(true, new Vector2(newSize, newSize));
 
-        float newSize = PixelSize / Icon.sprite.rect.width;
-        Icon.Resize(true, new Vector2(newSize, newSize));
+        Icon2.transform.localPosition = new Vector2(0, IconOffset);
+
+        if (Sprites.Length > 1)
+        {
+            Icon1.SetActive(true);
+
+            Icon1.sprite = Sprites[1];
+
+            Icon1.Resize(true, new Vector2(newSize, newSize));
+
+            Icon1.transform.localPosition = Icon1Offset*newSize + new Vector2(0, IconOffset);
+        }
 
 
         BuyBtnLab.text = Language.GetStr("UI", "P_BtnLab1");
@@ -147,10 +164,25 @@ public class CloseUnit
 
                     ManaReso.Get("Pa_Info").TweenForCG();
 
-                    Image image = ManaReso.Get<Image>("Pa_Icon");
+                    Image image = ManaReso.Get<Image>("Pa_Icon2");
                     image.sprite = Sprites[0];
                     image.Resize(true, new Vector2(newSize, newSize));
 
+                    if (Sprites.Length > 1)
+                    {
+                        ManaReso.SetActive("Pa_Icon1", true);
+
+                        Image image1 = ManaReso.Get<Image>("Pa_Icon1");
+                        image1.sprite = Sprites[1];
+                        image1.Resize(true, new Vector2(newSize, newSize));
+
+                        image1.transform.position = image.transform.position + (Vector3) Icon1Offset*newSize;
+                    }
+                    else
+                    {
+                        ManaReso.SetActive("Pa_Icon1", false);
+                    }
+
                     ManaReso.SetText("Pa_Lab", Description);
                     ManaReso.SetText("Pa_BtnLab", Language.GetStr("UI", "Pa_BtnLab") + Auxiliary.ImageParse(BuyCurrent) + BuyAmt.ToString("0"));
 
@@ -354,11 +386,6 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
-    public void Update()
-    {
-
-    }
-
     public void FixedUpdate()
     {
         if (InDressRoom)
@@ -573,7 +600,7 @@ public class Player : Regist , IPointerClickHandler
 
         InDressRoom = true;
 
-        JumpTime = Mathf.Lerp(0, JumpFrequency, Random.Range(0.5f, 1f));
+        JumpTime = Mathf.Lerp(0, 10, Random.Range(0.5f, 1f));
 
         ManaCenter.SceneSwitchLock = true;
 
@@ -615,9 +642,26 @@ public class Player : Regist , IPointerClickHandler
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ManaPlayer.InitializeDressRoom();
+                    if (!ManaPlayer.DressRoomInitialized)
+                    {
+                        ManaReso.SetText("I_Lab", Language.GetStr("UI", "I_Lab"));
+                        ManaReso.SetActive("I_Lab", true);
 
-                    ManaReso.Get("I_BlackMask").TweenForCG();
+                        Auxiliary.Instance.DelayCall
+                        (
+                            () =>
+                            {
+                                ManaPlayer.InitializeDressRoom();
+
+                                ManaReso.Get("I_BlackMask").TweenForCG();
+                            },
+                            1
+                        );
+                    }
+                    else
+                    {
+                        ManaReso.Get("I_BlackMask").TweenForCG();
+                    }
                 }
             );
     }
@@ -722,19 +766,23 @@ public class Player : Regist , IPointerClickHandler
         
         transform.FindChild("Armature/" + Eye).SetLZ(-0.001f);
         transform.FindChild("Armature/" + Top).SetLZ(-0.003f);
-        transform.FindChild("Armature/" + Head).SetLZ(0);
         transform.FindChild("Armature/" + Dress).SetLZ(-0.002f);
         transform.FindChild("Armature/" + Mouse).SetLZ(-0.001f);
         transform.FindChild("Armature/" + HeadWear).SetLZ(-0.001f);
 
-        Transform shoeTra = transform.FindChild("Armature/" + Shoe);
-        shoeTra.SetLZ(-0.001f);
+        Transform tempTra = transform.FindChild("Armature/" + Head);
+
+        tempTra.SetLZ(0);
+        tempTra.GetChild(0).SetLZ(0.002f);
+
+        tempTra = transform.FindChild("Armature/" + Shoe);
+        tempTra.SetLZ(-0.001f);
 
-        transform.FindChild("Armature").GetChild(shoeTra.GetSiblingIndex() + 1).SetLZ(-0.001f);
+        transform.FindChild("Armature").GetChild(tempTra.GetSiblingIndex() + 1).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);
         transform.FindChild("Armature/右手").SetLZ(-0.001f);
     }

Assets/Script/Tool/Auxiliary.cs

@@ -898,6 +898,42 @@ public class Auxiliary : Regist
         }
     }
 
+    public static Vector3 VectorParse(char cah, string str, Vector3 defaultValue)
+    {
+        if (string.IsNullOrEmpty(str))
+        {
+            return defaultValue;
+        }
+        else
+        {
+            string[] strings = str.Split(',');
+
+            if (strings.Length == 2)
+            {
+                Vector2 result = new Vector2();
+
+                result.x = float.Parse(strings[0]);
+                result.y = float.Parse(strings[1]);
+
+                return result;
+            }
+            else if (strings.Length == 3)
+            {
+                Vector3 result = new Vector3();
+
+                result.x = float.Parse(strings[0]);
+                result.y = float.Parse(strings[1]);
+                result.z = float.Parse(strings[2]);
+
+                return result;
+            }
+            else
+            {
+                throw new Exception();
+            }
+        }
+    }
+
     public static List<int> IntListParse(char cah, string str, List<int> defaultValue)
     {
         if (string.IsNullOrEmpty(str))

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

@@ -1,68 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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,6 +1,6 @@
-Player要增加一个头发的Armature CloseItem和pa_Info要增加一个Icon
+成就的透明度
 
-合并存档
+直接把ClosetTexture设置为SpriteMultiple
 
 
 还原PlayerConfig