支持服装和花朵热更新

Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 786969225a8dc4e0eb4e00a91e7e1501
+folderAsset: yes
+timeCreated: 1502698138
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+    iOS:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Logo.unity

@@ -614,7 +614,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   AuditEdition: 0
   DebugMode: 0
-  CatchException: 1
+  CatchException: 0
   DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

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

Assets/Resource/Sprite/Editor/HotUpdate/NewDress.meta

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

Assets/Resource/Sprite/Editor/Dress/Dress_ske.json.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/Dress_ske.json.meta

@@ -4,5 +4,5 @@ timeCreated: 1516589539
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_ske
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/上衣14.png.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/上衣14_tex.json.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14_tex.json.meta

@@ -4,5 +4,5 @@ timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/下衣14.png.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/下衣14_tex.json.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14_tex.json.meta

@@ -4,5 +4,5 @@ timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/头发14（粉色）.png.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14（粉色）.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/头发14（粉色）_tex.json.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14（粉色）_tex.json.meta

@@ -4,5 +4,5 @@ timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/装饰14.png.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/装饰14_tex.json.meta → Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14_tex.json.meta

@@ -4,5 +4,5 @@ timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: dress
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -29,7 +29,6 @@
   <item id="28" jump_frequency="" type="1" index="26" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(紫)" spriteAlpha="" armatureName="头发8(紫)" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="29" jump_frequency="" type="1" index="27" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(绿)" spriteAlpha="" armatureName="头发8(绿)" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="30" jump_frequency="" type="1" index="28" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(黑)" spriteAlpha="" armatureName="头发8(黑)" extraBodypart="" extraArmatureName="" ignore="" />
-  <item id="31" jump_frequency="" type="1" index="29" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发14（粉色）" spriteAlpha="" armatureName="头发14（粉色）" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="401" jump_frequency="" type="6" index="0" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="402" jump_frequency="" type="6" index="1" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="403" jump_frequency="" type="6" index="2" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" ignore="" />
@@ -62,7 +61,6 @@
   <item id="215" jump_frequency="" type="3" index="14" bodypart="2" level="50" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子12" spriteAlpha="" armatureName="裙子12" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="216" jump_frequency="" type="3" index="15" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子13" spriteAlpha="" armatureName="裙子13" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="217" jump_frequency="" type="3" index="16" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子13(紫)" spriteAlpha="" armatureName="裙子13(紫)" extraBodypart="" extraArmatureName="" ignore="" />
-  <item id="218" jump_frequency="" type="3" index="17" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14" spriteAlpha="" armatureName="下衣14" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="601" jump_frequency="" type="4" index="0" bodypart="4" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰品1" spriteAlpha="" armatureName="头饰品1" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="602" jump_frequency="" type="4" index="1" bodypart="4" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰品2" spriteAlpha="" armatureName="头饰品2" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="603" jump_frequency="" type="4" index="2" bodypart="4" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰品3" spriteAlpha="" armatureName="头饰品3" extraBodypart="" extraArmatureName="" ignore="" />
@@ -75,7 +73,6 @@
   <item id="610" jump_frequency="" type="4" index="9" bodypart="4" level="40" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰10" spriteAlpha="" armatureName="头饰10" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="611" jump_frequency="" type="4" index="10" bodypart="4" level="50" buy_currency="2" buy_amt="350" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰11" spriteAlpha="" armatureName="头饰11" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="612" jump_frequency="" type="4" index="11" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰12" spriteAlpha="" armatureName="头饰12" extraBodypart="" extraArmatureName="" ignore="" />
-  <item id="613" jump_frequency="" type="4" index="12" bodypart="4" level="50" buy_currency="2" buy_amt="450" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="" icon2offset="" spriteName="装饰14" spriteAlpha="" armatureName="装饰14" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="801" jump_frequency="" type="2" index="0" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.32,19.11" icon2offset="53.41,16.68" spriteName="上衣1,上衣1袖子右,上衣1袖子左" spriteAlpha="" armatureName="上衣1" extraBodypart="10,9" extraArmatureName="短袖1右,短袖1左" ignore="" />
   <item id="802" jump_frequency="" type="2" index="1" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.26,18.83" icon2offset="52.58,17.45" spriteName="上衣2,上衣2袖子右,上衣2袖子左" spriteAlpha="" armatureName="上衣2" extraBodypart="10,9" extraArmatureName="短袖2右,短袖2左" ignore="" />
   <item id="803" jump_frequency="" type="2" index="2" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.26,18.83" icon2offset="52.58,17.45" spriteName="上衣3,上衣2袖子右,上衣2袖子左" spriteAlpha="" armatureName="上衣3" extraBodypart="10,9" extraArmatureName="短袖2右,短袖2左" ignore="" />
@@ -93,7 +90,6 @@
   <item id="815" jump_frequency="" type="2" index="14" bodypart="5" level="50" buy_currency="2" buy_amt="600" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-59.77,16.52" icon2offset="56.81,13.58" spriteName="上衣12,上衣12袖子右,上衣12袖子左" spriteAlpha="" armatureName="上衣12" extraBodypart="10,9" extraArmatureName="短袖12右,短袖12左" ignore="" />
   <item id="816" jump_frequency="" type="2" index="15" bodypart="5" level="50" buy_currency="2" buy_amt="650" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.77,36.31" icon2offset="57.8,33.83" spriteName="上衣13,上衣13袖子右,上衣13袖子左" spriteAlpha="" armatureName="上衣13" extraBodypart="10,9" extraArmatureName="短袖13右,短袖13左" ignore="" />
   <item id="817" jump_frequency="" type="2" index="16" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.77,36.31" icon2offset="57.8,33.83" spriteName="上衣13(紫),上衣13蓝袖子右,上衣13蓝袖子左" spriteAlpha="" armatureName="上衣13(紫)" extraBodypart="10,9" extraArmatureName="短袖13蓝右,短袖13蓝左" ignore="" />
-  <item id="818" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="750" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="" />
   <item id="1001" jump_frequency="" type="5" index="0" bodypart="6" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="禁止标志" spriteAlpha="0.75" armatureName="Empty" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="1002" jump_frequency="" type="5" index="1" bodypart="6" level="50" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀1" spriteAlpha="" armatureName="翅膀1" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="1003" jump_frequency="" type="5" index="2" bodypart="6" level="80" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀2" spriteAlpha="" armatureName="翅膀2" extraBodypart="" extraArmatureName="" ignore="" />

Assets/Resource/XML/Config/new_dressRoom_config.xml

@@ -0,0 +1,68 @@
+<data>
+  <item id="31" jump_frequency="" type="1" index="29" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发14（粉色）" spriteAlpha="" armatureName="头发14（粉色）" extraBodypart="" extraArmatureName="" ignore="1" />
+  <item id="218" jump_frequency="" type="3" index="17" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14" spriteAlpha="" armatureName="下衣14" extraBodypart="" extraArmatureName="" ignore="1" />
+  <item id="613" jump_frequency="" type="4" index="12" bodypart="4" level="50" buy_currency="2" buy_amt="450" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="" icon2offset="" spriteName="装饰14" spriteAlpha="" armatureName="装饰14" extraBodypart="" extraArmatureName="" ignore="1" />
+  <item id="818" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="750" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="1" />
+  <comment>
+    <id>
+id
+</id>
+    <jump_frequency>
+每过多久必然跳且只跳一次
+</jump_frequency>
+    <type>
+类型
+</type>
+    <index>
+位置
+</index>
+    <bodypart>
+换装部位
+</bodypart>
+    <level>
+可以购买等级
+</level>
+    <buy_currency>
+购买货币类型
+</buy_currency>
+    <buy_amt>
+购买消耗值
+</buy_amt>
+    <buy_advance_currency>
+提前购买货币类型
+</buy_advance_currency>
+    <buy_advance_amt>
+提前购买消耗值
+</buy_advance_amt>
+    <pixelSize>
+Sprite大小
+</pixelSize>
+    <iconOffset>
+三个sprite的偏移
+</iconOffset>
+    <icon1offset>
+第二个Sprite的额外偏移
+</icon1offset>
+    <icon2offset>
+第三个Sprite的额外偏移
+</icon2offset>
+    <spriteName>
+sprite名字
+</spriteName>
+    <spriteAlpha>
+sprite透明度
+</spriteAlpha>
+    <armatureName>
+骨骼名字
+</armatureName>
+    <extraBodypart>
+
+</extraBodypart>
+    <extraArmatureName>
+
+</extraArmatureName>
+    <ignore>
+暂时不使用
+</ignore>
+  </comment>
+</data>

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9d82c9e9e16ce184e9b9ef4fe8de4e2b
+timeCreated: 1516858370
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: new_dress_config
+  assetBundleVariant: 

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -14,7 +14,7 @@
     <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>
     <F_GardenLab desc=""><![CDATA[花园]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[参观人次]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[每分钟有这么多人来参观花园 [&value&]]]></F_PersonBtn1>
+    <F_PersonBtn1 desc=""><![CDATA[每分钟来参观花园的人 [&value&]]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[门票]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费 [&value&]]]></F_CoinPersonBtn1>
     <F_IncreaseSource desc=""><![CDATA[加成来源 [&value&]]]></F_IncreaseSource>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -14,10 +14,10 @@
     <F_ElfLab desc=""><![CDATA[精靈]]></F_ElfLab>
     <F_GardenLab desc=""><![CDATA[花園]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[參觀人次]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[每分鐘有這麼多人來參觀花園[&value&]]]></F_PersonBtn1>
+    <F_PersonBtn1 desc=""><![CDATA[每分鐘來參觀花園的人 [&value&]]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[門票]]></F_CoinPersonBtn0>
-    <F_CoinPersonBtn1 desc=""><![CDATA[每位來訪者參觀花費[&value&]]]></F_CoinPersonBtn1>
-    <F_IncreaseSource desc=""><![CDATA[加成來源[&value&]]]></F_IncreaseSource>
+    <F_CoinPersonBtn1 desc=""><![CDATA[每位來訪者參觀花費 [&value&]]]></F_CoinPersonBtn1>
+    <F_IncreaseSource desc=""><![CDATA[加成來源 [&value&]]]></F_IncreaseSource>
     <F_LinkButton desc=""><![CDATA[顯示所有]]></F_LinkButton>
     <F_Tip desc=""><![CDATA[這是一款健康遊戲，不在線上也可以持續獲得金幣。如果覺得暫時沒什麼可做的，可以過一段時間再來玩。]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[提前解鎖]]></Fe_BtnLab0>

Assets/Resource/XML/lan/English.xml

@@ -14,10 +14,10 @@
     <F_ElfLab desc=""><![CDATA[Elf]]></F_ElfLab>
     <F_GardenLab desc=""><![CDATA[Garden]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[Visitors]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[Visitors per minute[&value&]]]></F_PersonBtn1>
+    <F_PersonBtn1 desc=""><![CDATA[Visitors per minute [&value&]]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[Ticket]]></F_CoinPersonBtn0>
-    <F_CoinPersonBtn1 desc=""><![CDATA[Ticket per visitor[&value&]]]></F_CoinPersonBtn1>
-    <F_IncreaseSource desc=""><![CDATA[Source[&value&]]]></F_IncreaseSource>
+    <F_CoinPersonBtn1 desc=""><![CDATA[Ticket per visitor [&value&]]]></F_CoinPersonBtn1>
+    <F_IncreaseSource desc=""><![CDATA[From [&value&]]]></F_IncreaseSource>
     <F_LinkButton desc=""><![CDATA[Show all]]></F_LinkButton>
     <F_Tip desc=""><![CDATA[This is a healthy game, that means you can get coins when you are offline. If you feel tired, come to play after a rest.]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[Unlock Now]]></Fe_BtnLab0>

Assets/Resource/XML/lan/new_ChineseSimplified.xml

@@ -0,0 +1,8 @@
+<lan>
+  <DressRoom>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
+    <Armature218 desc=""><![CDATA[]]></Armature218>
+    <Armature613 desc=""><![CDATA[]]></Armature613>
+    <Armature818 desc=""><![CDATA[]]></Armature818>
+  </DressRoom>
+</lan>

Assets/Resource/XML/lan/new_ChineseSimplified.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5cc0ef6383647534e9a83fd5843938ed
+timeCreated: 1516860436
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: new_language_config
+  assetBundleVariant: 

Assets/Resource/XML/lan/new_ChineseTraditional.xml

@@ -0,0 +1,8 @@
+<lan>
+  <DressRoom>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
+    <Armature218 desc=""><![CDATA[]]></Armature218>
+    <Armature613 desc=""><![CDATA[]]></Armature613>
+    <Armature818 desc=""><![CDATA[]]></Armature818>
+  </DressRoom>
+</lan>

Assets/Resource/XML/lan/new_ChineseTraditional.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a79829841944453429626186870453f6
+timeCreated: 1516860437
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: new_language_config
+  assetBundleVariant: 

Assets/Resource/XML/lan/new_English.xml

@@ -0,0 +1,8 @@
+<lan>
+  <DressRoom>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
+    <Armature218 desc=""><![CDATA[]]></Armature218>
+    <Armature613 desc=""><![CDATA[]]></Armature613>
+    <Armature818 desc=""><![CDATA[]]></Armature818>
+  </DressRoom>
+</lan>

Assets/Resource/XML/lan/new_English.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4698881600aaf234a921ace52ac3c9b2
+timeCreated: 1516860436
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: new_language_config
+  assetBundleVariant: 

Assets/Resource/Xlsx/new_dressRoom_config.xlsx.meta

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

Assets/Resource/Xlsx/new_language_config.xlsx.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6f0ad9d7a7ec5ba46a2b66b253f37d2f
+timeCreated: 1516859360
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Editor/EditorBundle.cs

@@ -3,6 +3,8 @@ using UnityEngine;
 using UnityEngine.Events;
 
 using System.Collections;
+using System.Collections.Generic;
+using System.IO;
 
 [CustomEditor(typeof(Bundle))]
 public class EditorBundle : Editor 
@@ -137,7 +139,9 @@ public class EditorBundle : Editor
     {
         Tag();
 
-        BuildPipeline.BuildAssetBundles(Application.streamingAssetsPath + "/Bundle/Android", BuildAssetBundleOptions.None, BuildTarget.Android);
+        string prefix = Application.streamingAssetsPath + "/Bundle/Android";
+        BuildPipeline.BuildAssetBundles(prefix, BuildAssetBundleOptions.ForceRebuildAssetBundle, BuildTarget.Android);
+        Move(prefix);
     }
 
     [MenuItem("DashGame/Bundle/PackIOS")]
@@ -145,7 +149,9 @@ public class EditorBundle : Editor
     {
         Tag();
 
-        BuildPipeline.BuildAssetBundles(Application.streamingAssetsPath + "/Bundle/IOS", BuildAssetBundleOptions.None, BuildTarget.iOS);
+        string prefix = Application.streamingAssetsPath + "/Bundle/IOS";
+        BuildPipeline.BuildAssetBundles(prefix, BuildAssetBundleOptions.ForceRebuildAssetBundle, BuildTarget.iOS);
+        Move(prefix);
     }
 
     [MenuItem("DashGame/Bundle/PackWindows")]
@@ -153,6 +159,31 @@ public class EditorBundle : Editor
     {
         Tag();
 
-        BuildPipeline.BuildAssetBundles(Application.streamingAssetsPath + "/Bundle/Windows", BuildAssetBundleOptions.None, BuildTarget.StandaloneWindows64);
+        string prefix = Application.streamingAssetsPath + "/Bundle/Windows";
+        BuildPipeline.BuildAssetBundles(prefix, BuildAssetBundleOptions.ForceRebuildAssetBundle, BuildTarget.StandaloneWindows64);
+        Move(prefix);
+    }
+
+    private static void Move(string prefix)
+    {
+        List<string> names = new List<string>
+        {
+            "new_dress_tex",
+            "new_dress_ske",
+            "new_dress_config",
+            "new_language_config",
+        };
+        foreach (var name in names)
+        {
+            File.Delete($"{prefix}/HotUpdate/{name}");
+            File.Delete($"{prefix}/HotUpdate/{name}.meta");
+            File.Delete($"{prefix}/HotUpdate/{name}.manifest");
+            File.Delete($"{prefix}/HotUpdate/{name}.manifest.meta");
+            File.Move($"{prefix}/{name}", $"{prefix}/HotUpdate/{name}");
+            File.Move($"{prefix}/{name}.manifest", $"{prefix}/HotUpdate/{name}.manifest");
+            File.Move($"{prefix}/{name}.meta", $"{prefix}/HotUpdate/{name}.meta");
+            File.Move($"{prefix}/{name}.manifest.meta", $"{prefix}/HotUpdate/{name}.manifest.meta");
+        }
+        AssetDatabase.Refresh();
     }
 }

Assets/Script/Editor/EditorLanguageExport.cs

@@ -21,7 +21,8 @@ public class EditorLanguageExport : EditorWindow
 
     public List<string> nameArray = new List<string>();
 
-    private string defaultPath;
+    private List<string> defaultPathes;
+    private List<string> exportPathes;
     private bool shouldDelete = true;
     private bool isSuccess;
     private string text;
@@ -32,7 +33,12 @@ public class EditorLanguageExport : EditorWindow
 
     void Awake()
     {
-		defaultPath = Application.dataPath + @"/Resource/Xlsx/language_config.xlsx";
+        defaultPathes = new List<string>();
+		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/language_config.xlsx");
+		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/new_language_config.xlsx");
+        exportPathes = new List<string>();
+        exportPathes.Add(Application.dataPath + @"/Resource/xml/lan/" + "#NAME" + ".xml");
+        exportPathes.Add(Application.dataPath + @"/Resource/xml/lan/" + "new_#NAME" + ".xml");
     }
 
     void OnGUI()
@@ -78,8 +84,9 @@ public class EditorLanguageExport : EditorWindow
 //        }
 
 		foreach( string s in avaliableLan) {
-			CreateXml(s);
-		}
+			CreateXml(defaultPathes[0], exportPathes[0], s);
+			CreateXml(defaultPathes[1], exportPathes[1], s);
+        }
 
         if (isSuccess)
         {
@@ -93,12 +100,13 @@ public class EditorLanguageExport : EditorWindow
             ShowNotification(new GUIContent("文件有错误！"));
     }
 
-	private void CreateXml(string lan)
+	private void CreateXml(string xlsxPath, string xmlPath, string lan)
     {
         parentNodeDict = new Dictionary<string, XmlNode>();
 
-        string filepath = Application.dataPath + @"/Resource/xml/lan/" + lan + ".xml";
-	    text = "";
+        string filepath = xmlPath.Replace("#NAME", lan);
+        //string filepath = Application.dataPath + @"/Resource/xml/lan/" + lan + ".xml";
+        text = "";
 
         filepath = filepath.Replace("\\", "/");
         string[] pathArr = filepath.Split('/');
@@ -121,7 +129,7 @@ public class EditorLanguageExport : EditorWindow
 
             //try
             //{
-				FileStream stream = File.Open(defaultPath, FileMode.Open, FileAccess.Read);
+				FileStream stream = File.Open(xlsxPath, FileMode.Open, FileAccess.Read);
                 IExcelDataReader excelReader = ExcelReaderFactory.CreateOpenXmlReader(stream);
 
                 text += "\nexcelReader.ResultsCount is" + excelReader.ResultsCount + "\n";
@@ -275,7 +283,7 @@ public class EditorLanguageExport : EditorWindow
     private void CreatePhp(string fileName)
     {
         string realName = StringExtention.SplitWithString(fileName, "\\")[1];
-        string filepath = defaultPath + "/" + realName + ".php";
+        string filepath = defaultPathes + "/" + realName + ".php";
         text = "";
 
         filepath = filepath.Replace("\\", "/");

Assets/Script/Manage/HttpManager.cs

@@ -171,7 +171,7 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //GetConfigBySerialNumber("1801185524113894613", data => Debug.Log(data.ToJson()));
+        //GetConfigBySerialNumber("1801104863982007122", data => Debug.Log(data.ToJson()));
         //台式机 1709207727231988804
         //笔记本 1710065808151506837
         //阔达的网络 1709110751808885702 

Assets/Script/Manage/Initializer.cs

@@ -295,7 +295,7 @@ public class Initializer : MonoBehaviour
 
         Bundle.LoadAtlasSprites();
         DebugText.text = "Error code : 1-11";
-        Bundle.LoadAllDressBundleAssetsIntoDragonbone();
+        //Bundle.LoadAllDressBundleAssetsIntoDragonbone();
         DebugText.text = "Error code : 1-11-1";
 
         for (int i = 0; i < RegistList.Count; i++)
@@ -355,6 +355,13 @@ public class Initializer : MonoBehaviour
         }
 
         DebugText.text = "Error code : 7";
+
+        List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
+        attributeList.RemoveAt(0);
+        attributeList.AddRange(Bundle.NewDressroomConfigs);
+        PlayerManager.CreateCloseItems(attributeList);
+
+        DebugText.text = "Error code : 7-1";
         PlayerManager.InitDressRoom();
 
         DebugText.text = "Error code : 8";
@@ -402,6 +409,7 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
+        Language.Initialize();
         UIManager.Init(Instance.DebugMode);
         AudioManager.Init();
 

Assets/Script/Manage/PlayerManager.cs

@@ -212,18 +212,18 @@ public class PlayerManager : Regist
     }
 
 
-    public static void InitDressRoom()
+    public static void CreateCloseItems(List<XmlAttributeCollection> attributeList)
     {
-        List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
-
-        for (int i = 1; i < attributeList.Count; i++)
+        for (int i = 0; i < attributeList.Count; i++)
         {
             new CloseItem(attributeList[i]);
         }
+    }
 
+    public static void InitDressRoom()
+    {
         for (int i = 0; i < BoughtCloseIDs.Count; i++)
         {
-            //Debug.Log(BoughtCloseList[i]);
             CloseItemDictionary[BoughtCloseIDs[i]].Unlock();
         }
     }

Assets/Script/Manage/ResourceManager.cs

@@ -23,7 +23,6 @@ public enum Folder
     Config,
     Discard,
     PlazaRoom,
-    Dress,
 }
 
 public enum ObjType

Assets/Script/Manage/VisitManager.cs

@@ -230,6 +230,11 @@ public class VisitManager : Regist
         EnterVisiteeGarden();
 
         OnEnterVisteeGarden.SafeInvoke();
+
+        if (Application.isEditor)
+        {
+            Debug.Log(VisiteeSerialNumber);
+        }
     }
 
     public static void StartExitVisiteeGarden()

Assets/Script/Tool/Auxiliary.cs

@@ -146,35 +146,35 @@ public class Auxiliary : Regist
         //}
 
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            foreach (var skill in Manager.UsingSkillList)
-            {
-                skill.UseTimer = 0;
-            }
-            foreach (var skill in Manager.CoolSkillList)
-            {
-                skill.CoolTimer = 0;
-            }
-            //HttpManager.GetTargetConfig
-            //(
-            //    "1801203341708362776",
-            //    data =>
-            //    {
-            //        VisitManager.VisiteeSerialNumber = "1801169491424370642";
-            //        VisitManager.SavePulledConfig(data);
-            //    }
-            //);
-            //PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
-            //Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-            //Debug.Log(screenPosition);
-            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-            //DebugManager.ResetGardenLevel(22);
-            //DebugManager.ResetVisitTutorial();
-            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    foreach (var skill in Manager.UsingSkillList)
+        //    {
+        //        skill.UseTimer = 0;
+        //    }
+        //    foreach (var skill in Manager.CoolSkillList)
+        //    {
+        //        skill.CoolTimer = 0;
+        //    }
+        //    HttpManager.GetTargetConfig
+        //    (
+        //        "1801203341708362776",
+        //        data =>
+        //        {
+        //            VisitManager.VisiteeSerialNumber = "1801169491424370642";
+        //            VisitManager.SavePulledConfig(data);
+        //        }
+        //    );
+        //    PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+        //    Debug.Log(screenPosition);
+        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+        //    DebugManager.ResetGardenLevel(22);
+        //    DebugManager.ResetVisitTutorial();
+        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        //}
 
         //if (Input.GetKeyDown(KeyCode.A))
         //{
@@ -203,15 +203,15 @@ public class Auxiliary : Regist
         //    FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
         //}
 
-        if (Input.GetKeyDown(KeyCode.S))
-        {
-            Manager.CoinPerson = 10000050000;
-            //DebugManager.ResetGardenLevel(49);
-            //PlayerManager.Player.ChangeClose(BodyPart.Top, "上衣14");
-            //PlayerManager.Player.DisplayInScene();
-            //Manager.Coin = 0;
-            //Manager.Diamond = 0;
-        }
+        //if (Input.GetKeyDown(KeyCode.S))
+        //{
+        //    Manager.CoinPerson = 10000050000;
+        //    DebugManager.ResetGardenLevel(49);
+        //    PlayerManager.Player.ChangeClose(BodyPart.Top, "上衣14");
+        //    PlayerManager.Player.DisplayInScene();
+        //    Manager.Coin = 0;
+        //    Manager.Diamond = 0;
+        //}
 
         //if (Input.GetKeyDown(KeyCode.D))
         //{

Assets/Script/Tool/Bundle.cs

@@ -5,6 +5,7 @@ using UnityEngine.Events;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Xml;
 using DragonBones;
 #if UNITY_EDITOR
 using UnityEditor;
@@ -17,6 +18,9 @@ public class Bundle : MonoBehaviour
 {
     #region
 
+    public static List<XmlAttributeCollection> NewDressroomConfigs = new List<XmlAttributeCollection>();
+
+
     public static Bundle Instance;
 
     public static bool Complete;
@@ -31,7 +35,6 @@ public class Bundle : MonoBehaviour
     public static AssetBundle Config;
     public static AssetBundle Discard;
     public static AssetBundle PlazaRoom;
-    public static AssetBundle Dress;
 
     public Texture2D AtlasTexture;
     public Texture2D ExpressionTexture;
@@ -154,16 +157,16 @@ public class Bundle : MonoBehaviour
                     }
                 }
             }
-            else if (folder == Folder.Dress)
-            {
-                for (int i = 0; i < Instance.DressList.Count; i++)
-                {
-                    if (Instance.DressList[i].name == goName)
-                    {
-                        return (T)Instance.DressList[i];
-                    }
-                }
-            }
+            //else if (folder == Folder.Dress)
+            //{
+            //    for (int i = 0; i < Instance.DressList.Count; i++)
+            //    {
+            //        if (Instance.DressList[i].name == goName)
+            //        {
+            //            return (T)Instance.DressList[i];
+            //        }
+            //    }
+            //}
 
             #endregion
         }
@@ -207,10 +210,6 @@ public class Bundle : MonoBehaviour
             {
                 return PlazaRoom.LoadAsset<T>(goName);
             }
-            else if (folder == Folder.Dress)
-            {
-                return Dress.LoadAsset<T>(goName);
-            }
 
             #endregion
         }
@@ -285,39 +284,39 @@ public class Bundle : MonoBehaviour
         }
     }
 
-    public static void LoadAllDressBundleAssetsIntoDragonbone()
-    {
-        UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(DressLabel.Dress_ske, Folder.Dress));
-
-        foreach (var dressName in DressLabel.dressNames)
-        {
-            ResourceManager.Load<Texture2D>(dressName, Folder.Dress);
-            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(dressName + "_tex", Folder.Dress), dressName);
-        }
-
-        Sprite[] sprites = Dress.LoadAllAssets<Sprite>();
-
-        if (Initializer.Instance.DebugMode)
-        {
-            for (int i = 0; i < Instance.DressList.Count; i++)
-            {
-                Sprite sprite = Instance.DressList[i] as Sprite;
-                if (sprite != null)
-                {
-                    PlayerManager.CloseSpriteDictionary.Add(sprite.name, sprite);
-                    ResourceManager.ObjectDictionary.UniqueAdd(sprite.name, sprite);
-                }
-            }
-        }
-        else
-        {
-            for (int i = 0; i < sprites.Length; i++)
-            {
-                PlayerManager.CloseSpriteDictionary.Add(sprites[i].name, sprites[i]);
-                ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
-            }
-        }
-    }
+    //public static void LoadAllDressBundleAssetsIntoDragonbone()
+    //{
+    //    UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(DressLabel.Dress_ske, Folder.Dress));
+
+    //    foreach (var dressName in DressLabel.dressNames)
+    //    {
+    //        ResourceManager.Load<Texture2D>(dressName, Folder.Dress);
+    //        UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(dressName + "_tex", Folder.Dress), dressName);
+    //    }
+
+    //    Sprite[] sprites = Dress.LoadAllAssets<Sprite>();
+
+    //    if (Initializer.Instance.DebugMode)
+    //    {
+    //        for (int i = 0; i < Instance.DressList.Count; i++)
+    //        {
+    //            Sprite sprite = Instance.DressList[i] as Sprite;
+    //            if (sprite != null)
+    //            {
+    //                PlayerManager.CloseSpriteDictionary.Add(sprite.name, sprite);
+    //                ResourceManager.ObjectDictionary.UniqueAdd(sprite.name, sprite);
+    //            }
+    //        }
+    //    }
+    //    else
+    //    {
+    //        for (int i = 0; i < sprites.Length; i++)
+    //        {
+    //            PlayerManager.CloseSpriteDictionary.Add(sprites[i].name, sprites[i]);
+    //            ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
+    //        }
+    //    }
+    //}
 
 
     public static AssetBundleRequest LoadAsync<T>(string goName, Folder folder)
@@ -488,8 +487,6 @@ public class Bundle : MonoBehaviour
 
         yield return LoadAtlas();
         yield return LoadEffect();
-        yield return LoadDress();
-        //yield return LoadPlazaRoom();
 
         SpriteAsset.AddAllBundleSpriteInfo();
 
@@ -643,20 +640,4 @@ public class Bundle : MonoBehaviour
             Debug.Log(www.error);
         }
     }
-
-    public static IEnumerator LoadDress()
-    {
-        WWW www = new WWW(GetStreamPath() + "dress");
-
-        yield return www;
-
-        if (string.IsNullOrEmpty(www.error))
-        {
-            Dress = www.assetBundle;
-        }
-        else
-        {
-            Debug.Log(www.error);
-        }
-    }
 }

Assets/Script/Tool/DashGame/Language.cs

@@ -19,10 +19,11 @@ public class Language
 		Public
 	}
 
+    private static bool Inited;
+
 	public static string[] availableArr = new string[]{Enabled.ChineseSimplified.ToString(), Enabled.English.ToString(), Enabled.ChineseTraditional.ToString() };
 
 	private static SystemLanguage defaultLan = SystemLanguage.English;
-	public static XmlDocument xml;
 
 	public static string lan = SystemLanguage.English.ToString();
     public static string lanForUI = SystemLanguage.English.ToString();
@@ -43,30 +44,50 @@ public class Language
     }
     public static Dictionary<CurrentLanguage, TextAsset> languageDic;
 
-    public static Dictionary<CurrentLanguage, XmlDocument> XmlDocumentDictionary
+    public static Dictionary<CurrentLanguage, List<XmlDocument>> XmlDocumentDictionary
     {
         get
         {
             if (xmlDocumentDictionary == null)
             {
-                xmlDocumentDictionary = new Dictionary<CurrentLanguage, XmlDocument>();
-                XmlDocument xmlDocument = new XmlDocument();
-                xmlDocument.LoadXml(LanguageDic[CurrentLanguage.English].text);
-                xmlDocumentDictionary.Add(CurrentLanguage.English, xmlDocument);
-                xmlDocument = new XmlDocument();
-                xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
-                xmlDocumentDictionary.Add(CurrentLanguage.ChineseSimplified, xmlDocument);
-                xmlDocument = new XmlDocument();
-                xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseTraditional].text);
-                xmlDocumentDictionary.Add(CurrentLanguage.ChineseTraditional, xmlDocument);
+                InitLanguageDocument();
             }
             return xmlDocumentDictionary;
         }
     }
-    public static Dictionary<CurrentLanguage, XmlDocument> xmlDocumentDictionary;
+    public static Dictionary<CurrentLanguage, List<XmlDocument>> xmlDocumentDictionary;
+
+    public static void InitLanguageDocument()
+    {
+        xmlDocumentDictionary = new Dictionary<CurrentLanguage, List<XmlDocument>>();
+        XmlDocument xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.English].text);
+        xmlDocumentDictionary.Add(CurrentLanguage.English, new List<XmlDocument> { xmlDocument });
+        xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
+        xmlDocumentDictionary.Add(CurrentLanguage.ChineseSimplified, new List<XmlDocument> { xmlDocument });
+        xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseTraditional].text);
+        xmlDocumentDictionary.Add(CurrentLanguage.ChineseTraditional, new List<XmlDocument> { xmlDocument });
+    }
+
+    public static void AddLanguageDocument(CurrentLanguage language, XmlDocument document)
+    {
+        if (xmlDocumentDictionary == null)
+        {
+            InitLanguageDocument();
+        }
+
+        XmlDocumentDictionary[language].Add(document);
+    }
 
     public static void Initialize()
     {
+        if (Inited)
+        {
+            return;
+        }
+        Inited = true;
         LanguageManager.CurrentLanguage = ConfigManager.GetStringFormConfig("Language").ToEnum<CurrentLanguage>();
         if (Initializer.Instance.AuditEdition)
         {
@@ -89,8 +110,6 @@ public class Language
             }
         }
 
-        xml = XmlDocumentDictionary[LanguageManager.CurrentLanguage];
-
         if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
             ResourceManager.Get<Button>(CanvasLabel.L_TraChi).interactable = true;
@@ -127,10 +146,10 @@ public class Language
     {
         LanguageManager.CurrentLanguage = currentLanguage;
 
-        TextAsset textAsset = LanguageDic[currentLanguage];
+        //TextAsset textAsset = LanguageDic[currentLanguage];
 
-        xml = new XmlDocument();
-        xml.LoadXml(textAsset.text);
+        //xmls = new XmlDocument();
+        //xmls.LoadXml(textAsset.text);
     }
 
     //public static void Init(string lan)
@@ -153,17 +172,17 @@ public class Language
     //    xml.LoadXml(text);
     //}
 
-    public static bool initialized
-	{
-		get{
-			return xml != null;
-		}
-	}
+ //   public static bool initialized
+	//{
+	//	get{
+	//		return xmls != null;
+	//	}
+	//}
 
 	public static void LoadFromResource()
 	{
 		//TextAsset textasset = ResourcesManager.Instance.LoadConfig("xml/lan", lan);
-		xml = new XmlDocument ();
+		//xmls = new XmlDocument ();
 		//xml.LoadXml (textasset.text);
 	}
 
@@ -245,43 +264,26 @@ public class Language
     }
 
     public static string GetStr(string page, string id)
-	{
-		if(xml == null) 
-		{
-			Initialize();
-        }
-
-        try
-		{
-			XmlNode pageNode = xml.SelectSingleNode("lan/"+page);
-			XmlNode node = pageNode.SelectSingleNode(id);
-			if(node != null)
-				return node.InnerText.Replace("\\n", "\n");
-		}
-		catch(Exception e)
-		{
-			Debug.LogException(e);
-		}
-
-		string error = "Topic missing page["+page+"] id["+id+"]";
-		Debug.LogError(error);
-		return error;
-	}
+    {
+        return GetStr(page, id, LanguageManager.CurrentLanguage);
+    }
 
     public static string GetStr(string page, string id, CurrentLanguage language)
     {
-        XmlDocument xmlDocument = XmlDocumentDictionary[language];
+        List<XmlDocument> documents = XmlDocumentDictionary[language];
 
-        try
+        foreach (var document in documents)
         {
-            XmlNode pageNode = xmlDocument.SelectSingleNode("lan/" + page);
+            XmlNode pageNode = document.SelectSingleNode("lan/" + page);
+            if (pageNode == null)
+            {
+                continue;
+            }
             XmlNode node = pageNode.SelectSingleNode(id);
             if (node != null)
+            {
                 return node.InnerText.Replace("\\n", "\n");
-        }
-        catch (Exception e)
-        {
-            Debug.LogException(e);
+            }
         }
 
         string error = "Topic missing page[" + page + "] id[" + id + "]";
@@ -336,21 +338,21 @@ public class Language
 	private static Font defaultFont;
 	public static Font font; 
 
-    public static Font GetFont()
-    {
-		if (xml == null || font == null)
-        {
-			if(defaultFont == null)
-			{
-				Debug.LogError("Language not init");
-                defaultFont = Font.CreateDynamicFontFromOSFont("Arial", 20);
-            }
-            return defaultFont;
-        }
-		return font;
-        //return "Fonts/" + SystemLanguage.ChineseTraditional.ToString();
-        //return "Fonts/" + SystemLanguage.Chinese.ToString();
-    }
+  //  public static Font GetFont()
+  //  {
+		//if (xmls == null || font == null)
+  //      {
+		//	if(defaultFont == null)
+		//	{
+		//		Debug.LogError("Language not init");
+  //              defaultFont = Font.CreateDynamicFontFromOSFont("Arial", 20);
+  //          }
+  //          return defaultFont;
+  //      }
+		//return font;
+  //      //return "Fonts/" + SystemLanguage.ChineseTraditional.ToString();
+  //      //return "Fonts/" + SystemLanguage.Chinese.ToString();
+  //  }
 
     public static Font GetFont(Enabled font)
     {
@@ -402,10 +404,10 @@ public class Language
         return isIn;
     }
 
-    public static bool IsLanguageInit()
-    {
-        return (xml == null) ? false : true;
-    }
+    //public static bool IsLanguageInit()
+    //{
+    //    return (xmls == null) ? false : true;
+    //}
 
     public static string GetLanguagePath()
     {

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.4
+  bundleVersion: 1.2.5
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 16
+  AndroidBundleVersionCode: 17
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 10
+  iPhoneBuildNumber: 11
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

第五期.txt

@@ -1,6 +1,15 @@
 微信支付
 
-热更新要考虑到花朵配置 服装配置
+换装保存的问题
+
+访问可能会黑屏
+
+切换后台和退出游戏时存档
+
+回档的问题
+
+
+热更新要考虑到花朵配置 服装配置 语言配置 龙骨
 
 
 //关闭DebugMode 开启CatchException