backup

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -51,8 +51,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 93a1da3798d4c6b44a5a139df98a95f3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  NewDressConfigList:
-  - {fileID: 4900000, guid: 9d82c9e9e16ce184e9b9ef4fe8de4e2b, type: 3}
   NewDressSkeList:
   - {fileID: 4900000, guid: 578290abd89616344820081776adb70a, type: 3}
   NewDressTexList:
@@ -70,19 +68,15 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 595ba4eea8a77cd488494ec8664afc81, type: 3}
   - {fileID: 21300000, guid: 9134c52440e84c94691416af2d76f4e6, type: 3}
   - {fileID: 21300000, guid: 5fa5bf8d920e02e478f5f48fd4a17c4d, type: 3}
-  NewLanguageList:
-  - {fileID: 4900000, guid: 5cc0ef6383647534e9a83fd5843938ed, type: 3}
-  - {fileID: 4900000, guid: a79829841944453429626186870453f6, type: 3}
-  - {fileID: 4900000, guid: 4698881600aaf234a921ace52ac3c9b2, type: 3}
-  - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
-  - {fileID: 4900000, guid: 2a6d8a1acd28b9b40acaa68244594b9d, type: 3}
-  - {fileID: 4900000, guid: d9f61a725b556c844a98ee0b486eabe7, type: 3}
-  NewFlowerConfigList:
-  - {fileID: 4900000, guid: 017f420931600084280cc54894830112, type: 3}
   NewFlowerSpriteList:
   - {fileID: 21300000, guid: 39300fd0e860ea143850d7c4ec94625d, type: 3}
   AtlasTexture: {fileID: 2800000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   ExpressionTexture: {fileID: 2800000, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  DefaultList:
+  - {fileID: 4900000, guid: bebfbae5c4c7bf2428d24381bef74d56, type: 3}
+  - {fileID: 4900000, guid: 9d54580916da3734495db9235ccd27d9, type: 3}
+  - {fileID: 4900000, guid: e438efaf3e160a84eb427989a9de29e4, type: 3}
+  - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   UiList:
   - {fileID: 21300006, guid: 20cc63257e52e564a874a929d22da1c2, type: 3}
   - {fileID: 21300072, guid: 20cc63257e52e564a874a929d22da1c2, type: 3}
@@ -325,8 +319,8 @@ MonoBehaviour:
   - {fileID: 4900000, guid: b9413a82e8f919e46b0c37372b491307, type: 3}
   - {fileID: 4900000, guid: ca67a0705396bba4b90fb3fc76541bf7, type: 3}
   - {fileID: 4900000, guid: 37bda6257ca3a7f4e82ee65e8fde6832, type: 3}
-  - {fileID: 4900000, guid: 9d54580916da3734495db9235ccd27d9, type: 3}
-  - {fileID: 4900000, guid: 3319e503eb3fdd54d8660318ae937604, type: 3}
-  - {fileID: 4900000, guid: e438efaf3e160a84eb427989a9de29e4, type: 3}
+  - {fileID: 4900000, guid: 2a6d8a1acd28b9b40acaa68244594b9d, type: 3}
+  - {fileID: 4900000, guid: d9f61a725b556c844a98ee0b486eabe7, type: 3}
+  - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   DiscardList: []
   PlazaRoomList: []

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -14294,6 +14294,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1799628466553676
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224205480760145378}
+  - component: {fileID: 222407071731414308}
+  - component: {fileID: 114205389451963658}
+  - component: {fileID: 114109641481820018}
+  m_Layer: 5
+  m_Name: Pg_RateButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1799805774684874
 GameObject:
   m_ObjectHideFlags: 1
@@ -15318,12 +15336,12 @@ GameObject:
   - component: {fileID: 114132938251684464}
   - component: {fileID: 114672937652122224}
   m_Layer: 5
-  m_Name: Pg_RateButton
+  m_Name: Pg_ResetRateButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1851504991155854
 GameObject:
   m_ObjectHideFlags: 1
@@ -16862,6 +16880,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1936015772750402
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224210425470604074}
+  - component: {fileID: 222633913128539738}
+  - component: {fileID: 114901489426913860}
+  - component: {fileID: 114908553372209234}
+  m_Layer: 5
+  m_Name: Pg_SubmitRateButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1936836492706634
 GameObject:
   m_ObjectHideFlags: 1
@@ -22444,6 +22480,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114109641481820018
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1799628466553676}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114205389451963658}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114109682410265778
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -23801,7 +23878,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 4d5fa9d87fc183a4fbb387bbbd4c7e82, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 59f813de7b93e3e46880218db4742ac3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -26364,6 +26441,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114205389451963658
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1799628466553676}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 98d5d0c5ba428664d8638ad2bb6389ef, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114206356956639732
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -28455,7 +28559,7 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
@@ -31264,7 +31368,7 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
@@ -35855,7 +35959,7 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
@@ -43256,7 +43360,7 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
@@ -53399,6 +53503,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114901489426913860
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1936015772750402}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 4d5fa9d87fc183a4fbb387bbbd4c7e82, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114901874679454304
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -53716,6 +53847,47 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 10000
+--- !u!114 &114908553372209234
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1936015772750402}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114901489426913860}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114909460787658900
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -54591,7 +54763,7 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
@@ -61882,6 +62054,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1936836492706634}
+--- !u!222 &222407071731414308
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1799628466553676}
 --- !u!222 &222407222331493336
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -63058,6 +63236,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1342527215314708}
+--- !u!222 &222633913128539738
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1936015772750402}
 --- !u!222 &222634831144849266
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -65429,14 +65613,13 @@ RectTransform:
   - {fileID: 224710786448844748}
   - {fileID: 224372126324214596}
   - {fileID: 224017774296844746}
-  - {fileID: 224968583071482216}
   - {fileID: 224507403836036812}
   m_Father: {fileID: 224960931067547470}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 141, y: -157.7}
+  m_AnchoredPosition: {x: 160.075, y: -157.7}
   m_SizeDelta: {x: 91.2, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224017774296844746
@@ -65448,7 +65631,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 224968583071482216}
   m_Father: {fileID: 224017257619151634}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -65488,14 +65672,13 @@ RectTransform:
   - {fileID: 224878618847088700}
   - {fileID: 224434463855966494}
   - {fileID: 224472375655804572}
-  - {fileID: 224440784350519234}
   - {fileID: 224136178386967628}
   m_Father: {fileID: 224960931067547470}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 141, y: -93.1}
+  m_AnchoredPosition: {x: 160.075, y: -93.1}
   m_SizeDelta: {x: 91.2, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224020951708833534
@@ -65897,7 +66080,7 @@ RectTransform:
   m_Children:
   - {fileID: 224793979785075918}
   m_Father: {fileID: 224647797067915046}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -66980,14 +67163,13 @@ RectTransform:
   - {fileID: 224053649072387254}
   - {fileID: 224207396228330418}
   - {fileID: 224974461694095156}
-  - {fileID: 224718472895011048}
   - {fileID: 224151863129943788}
   m_Father: {fileID: 224960931067547470}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 141, y: -60.8}
+  m_AnchoredPosition: {x: 160.075, y: -60.8}
   m_SizeDelta: {x: 91.2, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224086116989199640
@@ -67304,15 +67486,15 @@ RectTransform:
   m_GameObject: {fileID: 1850260907366974}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.93299997, y: 0.93299997, z: 0.93299997}
+  m_LocalScale: {x: 0.93299854, y: 0.93299854, z: 0.93299854}
   m_Children: []
   m_Father: {fileID: 224885158513677532}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -28.199951, y: -271.9}
-  m_SizeDelta: {x: 45.9, y: 42.7}
+  m_AnchoredPosition: {x: -33.35, y: -214.06}
+  m_SizeDelta: {x: 49.724, y: 48.688}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224100712321006736
 RectTransform:
@@ -67988,7 +68170,7 @@ RectTransform:
   m_Children:
   - {fileID: 224663464425933626}
   m_Father: {fileID: 224018782967614802}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -68210,7 +68392,7 @@ RectTransform:
   m_Children:
   - {fileID: 224855108839892190}
   m_Father: {fileID: 224085414907957848}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -68303,7 +68485,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224885158513677532}
-  m_RootOrder: 13
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -69075,6 +69257,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 120.2}
   m_SizeDelta: {x: 160, y: 20.7}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224205480760145378
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1799628466553676}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.93299997, y: 0.93299997, z: 0.93299997}
+  m_Children: []
+  m_Father: {fileID: 224885158513677532}
+  m_RootOrder: 13
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -33.35, y: -263.84}
+  m_SizeDelta: {x: 45, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224207396228330418
 RectTransform:
   m_ObjectHideFlags: 1
@@ -69112,6 +69312,24 @@ RectTransform:
   m_AnchoredPosition: {x: 153.93, y: -174}
   m_SizeDelta: {x: 189.15, y: 62}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224210425470604074
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1936015772750402}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.93299854, y: 0.93299854, z: 0.93299854}
+  m_Children: []
+  m_Father: {fileID: 224885158513677532}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -33.35, y: -263.84}
+  m_SizeDelta: {x: 46.809, y: 43.524}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224211928631904064
 RectTransform:
   m_ObjectHideFlags: 1
@@ -71226,7 +71444,7 @@ RectTransform:
   m_Children:
   - {fileID: 224086658508631542}
   m_Father: {fileID: 224885158513677532}
-  m_RootOrder: 17
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -71365,7 +71583,7 @@ RectTransform:
   m_Children:
   - {fileID: 224493273402513664}
   m_Father: {fileID: 224885158513677532}
-  m_RootOrder: 16
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -71774,14 +71992,13 @@ RectTransform:
   - {fileID: 224754161218516900}
   - {fileID: 224901528600402664}
   - {fileID: 224347060792975780}
-  - {fileID: 224517957578791934}
   - {fileID: 224824839871296710}
   m_Father: {fileID: 224960931067547470}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 141, y: -125.4}
+  m_AnchoredPosition: {x: 160.075, y: -125.4}
   m_SizeDelta: {x: 91.2, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224339529904918754
@@ -71907,7 +72124,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 224517957578791934}
   m_Father: {fileID: 224336931507979612}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -72188,7 +72406,7 @@ RectTransform:
   m_LocalScale: {x: 1.1662499, y: 1.1662499, z: 1.16625}
   m_Children: []
   m_Father: {fileID: 224885158513677532}
-  m_RootOrder: 12
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -73471,18 +73689,18 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1996732154522166}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224778511040953106}
-  m_Father: {fileID: 224018782967614802}
-  m_RootOrder: 3
+  m_Father: {fileID: 224472375655804572}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
   m_AnchoredPosition: {x: -5, y: 0}
-  m_SizeDelta: {x: -20, y: 0}
+  m_SizeDelta: {x: -20, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224441115434674478
 RectTransform:
@@ -74195,7 +74413,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 224440784350519234}
   m_Father: {fileID: 224018782967614802}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -74697,7 +74916,7 @@ RectTransform:
   m_Children:
   - {fileID: 224413326763452394}
   m_Father: {fileID: 224885158513677532}
-  m_RootOrder: 14
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -75129,7 +75348,7 @@ RectTransform:
   m_Children:
   - {fileID: 224718459226410208}
   m_Father: {fileID: 224017257619151634}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -75332,18 +75551,18 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1010854555023746}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224450348137520068}
-  m_Father: {fileID: 224336931507979612}
-  m_RootOrder: 3
+  m_Father: {fileID: 224347060792975780}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
   m_AnchoredPosition: {x: -5, y: 0}
-  m_SizeDelta: {x: -20, y: 0}
+  m_SizeDelta: {x: -20, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224517979276002744
 RectTransform:
@@ -75918,7 +76137,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 224721817571813916}
   m_Father: {fileID: 224647797067915046}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -78197,14 +78417,13 @@ RectTransform:
   - {fileID: 224568318270306962}
   - {fileID: 224647177364300900}
   - {fileID: 224542755603327244}
-  - {fileID: 224721817571813916}
   - {fileID: 224036280137341624}
   m_Father: {fileID: 224960931067547470}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 141, y: -28.5}
+  m_AnchoredPosition: {x: 160.075, y: -28.5}
   m_SizeDelta: {x: 91.2, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224648146568475860
@@ -79656,18 +79875,18 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1858831014692570}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224453872650531032}
-  m_Father: {fileID: 224085414907957848}
-  m_RootOrder: 3
+  m_Father: {fileID: 224974461694095156}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
   m_AnchoredPosition: {x: -5, y: 0}
-  m_SizeDelta: {x: -20, y: 0}
+  m_SizeDelta: {x: -20, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224719222753253058
 RectTransform:
@@ -79730,18 +79949,18 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1062493003892334}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224040890357742710}
-  m_Father: {fileID: 224647797067915046}
-  m_RootOrder: 3
+  m_Father: {fileID: 224542755603327244}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
   m_AnchoredPosition: {x: -5, y: 0}
-  m_SizeDelta: {x: -20, y: 0}
+  m_SizeDelta: {x: -20, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224722407934946502
 RectTransform:
@@ -81656,7 +81875,7 @@ RectTransform:
   m_Children:
   - {fileID: 224219307498916956}
   m_Father: {fileID: 224336931507979612}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -82482,7 +82701,7 @@ RectTransform:
   m_Children:
   - {fileID: 224576108990797244}
   m_Father: {fileID: 224885158513677532}
-  m_RootOrder: 15
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -82812,7 +83031,9 @@ RectTransform:
   - {fileID: 224660473004951796}
   - {fileID: 224150419401261650}
   - {fileID: 224050847681521176}
+  - {fileID: 224210425470604074}
   - {fileID: 224099813649884984}
+  - {fileID: 224205480760145378}
   - {fileID: 224371371791176818}
   - {fileID: 224156201515238646}
   - {fileID: 224490549550082212}
@@ -84354,8 +84575,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000061035156, y: 0.000015258789}
-  m_SizeDelta: {x: 182, y: 186.2}
+  m_AnchoredPosition: {x: -19.075005, y: 0.000015258789}
+  m_SizeDelta: {x: 220.15, y: 186.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224961117816331688
 RectTransform:
@@ -84605,18 +84826,18 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1417077785761284}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224453981789607646}
-  m_Father: {fileID: 224017257619151634}
-  m_RootOrder: 3
+  m_Father: {fileID: 224017774296844746}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
   m_AnchoredPosition: {x: -5, y: 0}
-  m_SizeDelta: {x: -20, y: 0}
+  m_SizeDelta: {x: -20, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224969943628316522
 RectTransform:
@@ -84682,7 +84903,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 224718472895011048}
   m_Father: {fileID: 224085414907957848}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/Sprite/Editor/SpriteUI/打分图标.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 98d5d0c5ba428664d8638ad2bb6389ef
+timeCreated: 1522650831
+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

@@ -29,11 +29,12 @@
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
-  <item id="32" 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="头发9-蓝" spriteAlpha="" armatureName="头发9-蓝" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="33" jump_frequency="" type="1" index="30" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9(白)" spriteAlpha="" armatureName="头发9(白)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="34" jump_frequency="" type="1" index="31" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-粉" spriteAlpha="" armatureName="头发9-粉" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="35" jump_frequency="" type="1" index="32" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-黄" spriteAlpha="" armatureName="头发9-黄" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="36" jump_frequency="" type="1" index="33" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="10" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="" icon0offset="" />
+  <item id="32" jump_frequency="" type="1" index="30" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-蓝" spriteAlpha="" armatureName="头发9-蓝" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="33" jump_frequency="" type="1" index="31" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9(白)" spriteAlpha="" armatureName="头发9(白)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="34" jump_frequency="" type="1" index="32" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-粉" spriteAlpha="" armatureName="头发9-粉" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="35" jump_frequency="" type="1" index="33" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-黄" spriteAlpha="" armatureName="头发9-黄" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="36" jump_frequency="" type="1" index="34" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="10" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
@@ -49,7 +50,8 @@
   <item id="413" jump_frequency="" type="6" index="12" bodypart="3" level="40" buy_currency="2" buy_amt="200" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="8" spriteAlpha="" armatureName="鞋子10" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <item id="414" jump_frequency="" type="6" index="13" bodypart="3" level="50" buy_currency="2" buy_amt="250" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="9" spriteAlpha="" armatureName="鞋子11" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <item id="415" jump_frequency="" type="6" index="14" bodypart="3" level="50" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="10" spriteAlpha="" armatureName="鞋子12" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="417" jump_frequency="" type="6" index="15" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="-35,0" icon2offset="" spriteName="鞋子15-1,鞋子15-2" spriteAlpha="" armatureName="鞋子17" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
+  <item id="416" jump_frequency="" type="6" index="15" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="-35,0" icon2offset="" spriteName="鞋子14-1,鞋子14-2" spriteAlpha="" armatureName="鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
+  <item id="417" jump_frequency="" type="6" index="16" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="-35,0" icon2offset="" spriteName="鞋子15-1,鞋子15-2" spriteAlpha="" armatureName="鞋子17" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
   <item id="201" jump_frequency="" type="3" index="0" bodypart="2" 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="" icon0offset="" />
   <item id="202" jump_frequency="" type="3" index="1" bodypart="2" 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="" icon0offset="" />
   <item id="203" jump_frequency="" type="3" index="2" bodypart="2" 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="" icon0offset="" />
@@ -67,7 +69,8 @@
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
-  <item id="219" 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="下衣15" spriteAlpha="" armatureName="裙子15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="" icon0offset="" />
+  <item id="219" jump_frequency="" type="3" index="18" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣15" spriteAlpha="" armatureName="裙子15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
@@ -80,7 +83,8 @@
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
-  <item id="614" jump_frequency="" type="4" index="12" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰15" spriteAlpha="" armatureName="头饰15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="" icon0offset="" />
+  <item id="614" jump_frequency="" type="4" index="13" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰15" spriteAlpha="" armatureName="头饰15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
@@ -98,7 +102,8 @@
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
-  <item id="819" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="71.85,2.89" icon2offset="-66.24,-0.4" spriteName="上衣15,上衣15(袖子)-1,上衣15(袖子)-2" spriteAlpha="" armatureName="上衣15" extraBodypart="10,9" extraArmatureName="上衣15（袖子）左,上衣15（袖子）右" ignore="" icon0offset="" />
+  <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="" icon0offset="" />
+  <item id="819" jump_frequency="" type="2" index="18" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="71.85,2.89" icon2offset="-66.24,-0.4" spriteName="上衣15,上衣15(袖子)-1,上衣15(袖子)-2" spriteAlpha="" armatureName="上衣15" extraBodypart="10,9" extraArmatureName="上衣15（袖子）左,上衣15（袖子）右" ignore="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />

Assets/Resource/XML/Config/flower_config.xml

@@ -34,6 +34,7 @@
   <item id="33" name="紫罗兰（紫）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower33" anim="" flower_coin_buff="0.82" />
   <item id="34" name="紫罗兰（蓝）" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower34" anim="" flower_coin_buff="0.83" />
   <item id="35" name="鸡冠花（红）" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower35" anim="" flower_coin_buff="0.84" />
+  <item id="36" name="鸡冠花（黄）" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" />
   <comment>
     <id>
 id

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

@@ -4,5 +4,5 @@ timeCreated: 1516858370
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: new_dress_config
+  assetBundleName: 
   assetBundleVariant: 

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

@@ -4,5 +4,5 @@ timeCreated: 1516869282
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: new_flower_config
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml.meta

@@ -4,5 +4,5 @@ timeCreated: 1490407010
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: config
+  assetBundleName: default
   assetBundleVariant: 

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -821,6 +821,7 @@
     <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>

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

@@ -4,5 +4,5 @@ timeCreated: 1517994040
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: new_language_config
+  assetBundleName: config
   assetBundleVariant: 

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -821,6 +821,7 @@
     <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>

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

@@ -4,5 +4,5 @@ timeCreated: 1491207123
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: new_language_config
+  assetBundleName: config
   assetBundleVariant: 

Assets/Resource/XML/lan/English.xml

@@ -820,6 +820,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature28 desc=""><![CDATA[Doll(Purple)]]></Armature28>
     <Armature29 desc=""><![CDATA[Doll(Green)]]></Armature29>
     <Armature30 desc=""><![CDATA[Doll(Black)]]></Armature30>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
     <Armature32 desc=""><![CDATA[]]></Armature32>
     <Armature33 desc=""><![CDATA[]]></Armature33>
     <Armature34 desc=""><![CDATA[]]></Armature34>

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

@@ -4,5 +4,5 @@ timeCreated: 1491207122
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: new_language_config
+  assetBundleName: config
   assetBundleVariant: 

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

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
 guid: 9d54580916da3734495db9235ccd27d9
-timeCreated: 1517988696
+timeCreated: 1522647833
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: config
+  assetBundleName: default
   assetBundleVariant: 

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

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
 guid: 3319e503eb3fdd54d8660318ae937604
-timeCreated: 1517988697
+timeCreated: 1522647834
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: config
+  assetBundleName: default
   assetBundleVariant: 

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

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
 guid: e438efaf3e160a84eb427989a9de29e4
-timeCreated: 1517988695
+timeCreated: 1522647832
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: config
+  assetBundleName: default
   assetBundleVariant: 

Assets/Resource/XML/lan/new_ChineseSimplified.xml

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

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

Assets/Resource/XML/lan/new_ChineseTraditional.xml

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

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

Assets/Resource/XML/lan/new_English.xml

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

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

Assets/Resource/Xlsx/new_dressRoom_config.xlsx.meta

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

Assets/Resource/Xlsx/new_flower_config.xlsx.meta

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

Assets/Resource/Xlsx/new_language_config.xlsx.meta

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

Assets/Script/Editor/EditorBundle.cs

@@ -168,11 +168,12 @@ public class EditorBundle : Editor
     {
         List<string> names = new List<string>
         {
+            "config",
             "new_dress_tex",
             "new_dress_ske",
-            "new_dress_config",
-            "new_language_config",
-            "new_flower_config",
+            //"new_dress_config",
+            //"new_language_config",
+            //"new_flower_config",
             "new_flower_tex",
         };
         foreach (var name in names)

Assets/Script/Editor/EditorLanguageExport.cs

@@ -34,12 +34,12 @@ public class EditorLanguageExport : EditorWindow
     void Awake()
     {
         defaultPathes = new List<string>();
-		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/language_config.xlsx");
-		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/new_language_config.xlsx");
-		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/default_language_config.xlsx");
+        defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/language_config.xlsx");
+        //defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/new_language_config.xlsx");
+        defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/default_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");
+        //exportPathes.Add(Application.dataPath + @"/Resource/xml/lan/" + "new_#NAME" + ".xml");
         exportPathes.Add(Application.dataPath + @"/Resource/xml/lan/" + "default_#NAME" + ".xml");
     }
 
@@ -87,8 +87,8 @@ public class EditorLanguageExport : EditorWindow
 
 		foreach( string s in avaliableLan) {
 			CreateXml(defaultPathes[0], exportPathes[0], s);
-			CreateXml(defaultPathes[1], exportPathes[1], s);
-            CreateXml(defaultPathes[2], exportPathes[2], s);
+            CreateXml(defaultPathes[1], exportPathes[1], s);
+            //         CreateXml(defaultPathes[2], exportPathes[2], s);
         }
 
         if (isSuccess)

Assets/Script/Label/ResourceLabel.cs

@@ -5,11 +5,11 @@ using UnityEngine;
 
 public class ResourceLabel
 {
-    public static string NewDressConfig = "new_dress_config";
+    //public static string NewDressConfig = "new_dress_config";
     public static string NewDressSke = "new_dress_ske";
     public static string NewDressTex = "new_dress_tex";
     public static string NewLanguage = "new_language_config";
-    public static string NewFlowerConfig = "new_flower_config";
+    //public static string NewFlowerConfig = "new_flower_config";
     public static string NewFlowerTex = "new_flower_tex";
 
     public static string ChestTimer = "ChestTimer";
@@ -103,6 +103,7 @@ public class ResourceLabel
     public static string ChineseSimplified = "ChineseSimplified";
     public static string ChineseTraditional = "ChineseTraditional";
     public static string DefaultNickName = "DefaultNickName";
+    public static string Config = "Config";
     public static string MinigameConfig = "minigame_config";
     public static string DressroomConfig = "dressRoom_config";
     public static string AchieveConfig = "achieve_config";

Assets/Script/Manage/ConfigManager.cs

@@ -114,7 +114,7 @@ public class ConfigManager : Regist
             }
 
 
-            TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
+            TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Default);
 
             DefaultConfigDocument.LoadXml(textAsset.text);
 
@@ -202,7 +202,7 @@ public class ConfigManager : Regist
         }
         else
         {
-            TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
+            TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Default);
 
             DefaultConfigDocument.LoadXml(textAsset.text);
 
@@ -228,7 +228,7 @@ public class ConfigManager : Regist
             {
                 PlayerDocumentDamageFlag = false;
 
-                TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
+                TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Default);
 
                 configDocument = new XmlDocument();
 
@@ -269,7 +269,7 @@ public class ConfigManager : Regist
             return;
         }
 
-        TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
+        TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Default);
 
         DefaultConfigDocument.LoadXml(textAsset.text);
         //Debug.Log(jsonData.ToJson());

Assets/Script/Manage/GardenManager.cs

@@ -343,7 +343,7 @@ public class GardenManager : Regist
         #region 生成FlowerItem
 
         List<XmlAttributeCollection> attributeList = ConfigManager.GetFlowerConfig();
-        attributeList.AddRange(Bundle.NewFlowerConfigs);
+        //attributeList.AddRange(Bundle.NewFlowerConfigs);
         for (int i = 0; i < attributeList.Count; i++)
         {
             FlowerInfo flowerInfo = new FlowerInfo(attributeList[i]);

Assets/Script/Manage/Initializer.cs

@@ -307,7 +307,7 @@ public class Initializer : MonoBehaviour
         DebugText.text = "Error code : 7";
         List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
         attributeList.RemoveAt(0);
-        attributeList.AddRange(Bundle.NewDressroomConfigs);
+        //attributeList.AddRange(Bundle.NewDressroomConfigs);
         PlayerManager.CreateCloseItems(attributeList);
 
         DebugText.text = "Error code : 1-11";

Assets/Script/Manage/ResourceManager.cs

@@ -14,6 +14,7 @@ using Component = UnityEngine.Component;
 
 public enum Folder
 {
+    Default,
     UI,
     Atlas,
     Atlas2,

Assets/Script/Social/FashionShowEditPage.cs

@@ -82,6 +82,11 @@ public class FashionShowEditPage : Regist
     private static CustomSlider VividSlider;
     private static CustomSlider SimpleSlider;
     private static CustomSlider GlorySlider;
+    private static Transform CuteSliderBg;
+    private static Transform GraceSliderBg;
+    private static Transform VividSliderBg;
+    private static Transform SimpleSliderBg;
+    private static Transform GlorySliderBg;
 
     private static bool Praised;
     private static bool BelongSelf;
@@ -131,6 +136,11 @@ public class FashionShowEditPage : Regist
         VividSlider = ResourceManager.Get<CustomSlider>(CanvasLabel.Pg_VividSlider);
         SimpleSlider = ResourceManager.Get<CustomSlider>(CanvasLabel.Pg_SimpleSlider);
         GlorySlider = ResourceManager.Get<CustomSlider>(CanvasLabel.Pg_GlorySlider);
+        CuteSliderBg = ResourceManager.Get(CanvasLabel.Pg_CuteBackground);
+        GraceSliderBg = ResourceManager.Get(CanvasLabel.Pg_GraceBackground);
+        VividSliderBg = ResourceManager.Get(CanvasLabel.Pg_VividBackground);
+        SimpleSliderBg = ResourceManager.Get(CanvasLabel.Pg_SimpleBackground);
+        GlorySliderBg = ResourceManager.Get(CanvasLabel.Pg_GloryBackground);
         Return = ResourceManager.Get<Button>(CanvasLabel.Pg_Return);
         DisplayEditButton = ResourceManager.Get<Button>(CanvasLabel.Pg_DisplayEditButton);
         DeleteButton = ResourceManager.Get<Button>(CanvasLabel.Pg_DeleteButton);
@@ -250,6 +260,16 @@ public class FashionShowEditPage : Regist
         GraceSlider.value = cuteRate == 0 ? 1 : graceRate;
         SimpleSlider.value = cuteRate == 0 ? 1 : simpleRate;
         VividSlider.value = cuteRate == 0 ? 1 : vividRate;
+        CuteSliderBg.SetActive(false);
+        GlorySliderBg.SetActive(false);
+        GraceSliderBg.SetActive(false);
+        SimpleSliderBg.SetActive(false);
+        VividSliderBg.SetActive(false);
+        CuteSlider.interactable = false;
+        GlorySlider.interactable = false;
+        GraceSlider.interactable = false;
+        SimpleSlider.interactable = false;
+        VividSlider.interactable = false;
         CuteValue.text = FashionShowData.CuteRate == "0" ? "--" : FashionShowData.CuteRate;
         GloryValue.text = FashionShowData.GloryRate == "0" ? "--" : FashionShowData.GloryRate;
         GraceValue.text = FashionShowData.GraceRate == "0" ? "--" : FashionShowData.GraceRate;
@@ -288,11 +308,6 @@ public class FashionShowEditPage : Regist
 
     private static void EnterEditMode()
     {
-        CuteSlider.interactable = false;
-        GlorySlider.interactable = false;
-        GraceSlider.interactable = false;
-        SimpleSlider.interactable = false;
-        VividSlider.interactable = false;
         FashionTitleInputField.interactable = true;
         FashionContentInputField.interactable = true;
 
@@ -321,11 +336,6 @@ public class FashionShowEditPage : Regist
 
     private static void EnterRateMode()
     {
-        CuteSlider.interactable = true;
-        GlorySlider.interactable = true;
-        GraceSlider.interactable = true;
-        SimpleSlider.interactable = true;
-        VividSlider.interactable = true;
         FashionTitleInputField.interactable = false;
         FashionContentInputField.interactable = false;
 
@@ -450,6 +460,11 @@ public class FashionShowEditPage : Regist
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         RateButton.SetActive(false);
+        //CuteSliderBg.SetActive(true);
+        //GlorySliderBg.SetActive(true);
+        //GraceSliderBg.SetActive(true);
+        //SimpleSliderBg.SetActive(true);
+        //VividSliderBg.SetActive(true);
     }
 
     private static void OnSaveButtonClick()
@@ -650,19 +665,19 @@ public class FashionShowEditPage : Regist
 
     private static void OnLevelChange(int level)
     {
-        GardenFashionShowButtonParent.SetActive(false); //todo 暂时关闭
-        DressroomFashionShowButton.SetActive(false); //todo 暂时关闭
-
-        //if (level >= UnlockLevel)
-        //{
-        //    GardenFashionShowButtonParent.SetActive(true); 
-        //    DressroomFashionShowButton.SetActive(true); 
-        //}
-        //else
-        //{
-        //    GardenFashionShowButtonParent.SetActive(false);
-        //    DressroomFashionShowButton.SetActive(false);
-        //}
+        //GardenFashionShowButtonParent.SetActive(false);
+        //DressroomFashionShowButton.SetActive(false);
+
+        if (level >= UnlockLevel)
+        {
+            GardenFashionShowButtonParent.SetActive(true);
+            DressroomFashionShowButton.SetActive(true);
+        }
+        else
+        {
+            GardenFashionShowButtonParent.SetActive(false);
+            DressroomFashionShowButton.SetActive(false);
+        }
     }
 
     private static void OnDressroomFashionShowButtonClick()

Assets/Script/Tool/Auxiliary.cs

@@ -156,7 +156,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            //DebugManager.ResetGardenLevel(150);
+            DebugManager.ResetGardenLevel(50);
             //foreach (var skill in Manager.UsingSkillList)
             //{
             //    skill.UseTimer = 0;
@@ -180,7 +180,7 @@ public class Auxiliary : Regist
             //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
             //Debug.Log(screenPosition);
             //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-            DebugManager.ResetMemoryGameTutorial();
+            //DebugManager.ResetMemoryGameTutorial();/
             //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
         }
 

Assets/Script/Tool/Bundle.cs

@@ -25,32 +25,33 @@ public class Bundle : MonoBehaviour
         get { return CopyCount == 0; }
     }
     public static bool UpdateComplete;
-    public static AssetBundle NewDressConfig;
+    //public static AssetBundle NewDressConfig;
     public static AssetBundle NewDressSke;
     public static AssetBundle NewDressTex;
-    public static AssetBundle NewLanguage;
-    public static AssetBundle NewFlowerConfig;
+    //public static AssetBundle NewLanguage;
+    //public static AssetBundle NewFlowerConfig;
     public static AssetBundle NewFlowerTex;
-    public static List<XmlAttributeCollection> NewDressroomConfigs = new List<XmlAttributeCollection>();
-    public static List<XmlAttributeCollection> NewFlowerConfigs = new List<XmlAttributeCollection>();
+    //public static List<XmlAttributeCollection> NewDressroomConfigs = new List<XmlAttributeCollection>();
+    //public static List<XmlAttributeCollection> NewFlowerConfigs = new List<XmlAttributeCollection>();
 
     public static List<string> HotUpdateAssetBundleNames=new List<string>
     {
-        ResourceLabel.NewDressConfig,
+        ResourceLabel.Config,
+        //ResourceLabel.NewDressConfig,
         ResourceLabel.NewDressSke,
         ResourceLabel.NewDressTex,
-        ResourceLabel.NewLanguage,
-        ResourceLabel.NewFlowerConfig,
+        //ResourceLabel.NewLanguage,
+        //ResourceLabel.NewFlowerConfig,
         ResourceLabel.NewFlowerTex,
     };
 
-    public List<Object> NewDressConfigList;
+    //public List<Object> NewDressConfigList;
     public List<Object> NewDressSkeList;
     public List<Object> NewDressTexList;
     public List<Object> NewDressTexConfigList;
     public List<Object> NewDressSpriteList;
-    public List<Object> NewLanguageList;
-    public List<Object> NewFlowerConfigList;
+    //public List<Object> NewLanguageList;
+    //public List<Object> NewFlowerConfigList;
     public List<Object> NewFlowerSpriteList;
 
     public static Bundle Instance;
@@ -60,6 +61,7 @@ public class Bundle : MonoBehaviour
     public static AssetBundle Atlas;
     public static AssetBundle Atlas2;
 
+    public static AssetBundle Defaul;
     public static AssetBundle UI;
     public static AssetBundle Effect;
     public static AssetBundle Audio;
@@ -70,6 +72,7 @@ public class Bundle : MonoBehaviour
 
     public Texture2D AtlasTexture;
     public Texture2D ExpressionTexture;
+    public List<Object> DefaultList;
     public List<Object> UiList;
     public List<Object> AtlasList;
     public List<Sprite> Atlas2List;
@@ -107,6 +110,16 @@ public class Bundle : MonoBehaviour
                     }
                 }
             }
+            if (folder == Folder.Default)
+            {
+                for (int i = 0; i < Instance.DefaultList.Count; i++)
+                {
+                    if (Instance.DefaultList[i].name == goName)
+                    {
+                        return (T)Instance.DefaultList[i];
+                    }
+                }
+            }
             else if (folder == Folder.Audio)
             {
                 for (int i = 0; i < Instance.AudioList.Count; i++)
@@ -212,6 +225,10 @@ public class Bundle : MonoBehaviour
             {
                 return Audio.LoadAsset<T>(goName);
             }
+            else if (folder == Folder.Default)
+            {
+                return Defaul.LoadAsset<T>(goName);
+            }
             else if (folder == Folder.Config)
             {
                 return Config.LoadAsset<T>(goName);
@@ -359,6 +376,10 @@ public class Bundle : MonoBehaviour
         {
             return Audio.LoadAssetAsync<T>(goName);
         }
+        else if (folder == Folder.Default)
+        {
+            return Defaul.LoadAssetAsync<T>(goName);
+        }
         else if (folder == Folder.Config)
         {
             return Config.LoadAssetAsync<T>(goName);
@@ -447,11 +468,11 @@ public class Bundle : MonoBehaviour
 
     public static IEnumerator ILoadAll(UnityAction callback)
     {
-        yield return LoadConfig();
+        yield return LoadDefaul();
 
         if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config, () =>
+            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PlayerConfig, Folder.Default, () =>
             {
                 ConfigManager.ConfigDocument = ConfigManager.ConfigDocument;
                 HttpManager.GetBuyPackLimitFlag();
@@ -467,77 +488,77 @@ public class Bundle : MonoBehaviour
 
         yield return LoadUI();
 
-        if (!Logo.Complete && !Initializer.Instance.DebugMode)
-        {
-            ResourceManager.AddAsyncLoad(ResourceLabel.Canvas, 1, Folder.UI, ObjType.Canvas);
+        //if (!Logo.Complete && !Initializer.Instance.DebugMode)
+        //{
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.Canvas, 1, Folder.UI, ObjType.Canvas);
 
-            //ResourceManager.AddAsyncLoad(ResourceLabel.GroupA, 1, Folder.UI, ObjType.GroupA, true);
-            //ResourceManager.AddAsyncLoad(ResourceLabel.GroupB, 1, Folder.UI, ObjType.GroupB, true);
-            //ResourceManager.AddAsyncLoad(ResourceLabel.GroupC, 1, Folder.UI, ObjType.GroupC, true);
-            //ResourceManager.AddAsyncLoad(ResourceLabel.GroupE, 1, Folder.UI, ObjType.GroupE, true);
-            //ResourceManager.AddAsyncLoad(ResourceLabel.GroupD, 1, Folder.UI, ObjType.GroupD, true);
+        //    //ResourceManager.AddAsyncLoad(ResourceLabel.GroupA, 1, Folder.UI, ObjType.GroupA, true);
+        //    //ResourceManager.AddAsyncLoad(ResourceLabel.GroupB, 1, Folder.UI, ObjType.GroupB, true);
+        //    //ResourceManager.AddAsyncLoad(ResourceLabel.GroupC, 1, Folder.UI, ObjType.GroupC, true);
+        //    //ResourceManager.AddAsyncLoad(ResourceLabel.GroupE, 1, Folder.UI, ObjType.GroupE, true);
+        //    //ResourceManager.AddAsyncLoad(ResourceLabel.GroupD, 1, Folder.UI, ObjType.GroupD, true);
 
-            ResourceManager.AddAsyncLoad(ResourceLabel.EventSystem, 1, Folder.UI, ObjType.EventSystem);
-            ResourceManager.AddAsyncLoad(ResourceLabel.MainCamera, 1, Folder.UI, ObjType.MainCamera);
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.EventSystem, 1, Folder.UI, ObjType.EventSystem);
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.MainCamera, 1, Folder.UI, ObjType.MainCamera);
 
-            //ResourceManager.AddAsyncLoad("SkillItem", 31, Folder.UI, ObjType.SkillItem, true);
-            //ResourceManager.AddAsyncLoad("SignItem", 21, Folder.UI, ObjType.SignItem, true);
-            //ResourceManager.AddAsyncLoad("FlowerItem", 17, Folder.UI, ObjType.FlowerItem, true);
-            //ResourceManager.AddAsyncLoad("AchieveItem", 2, Folder.UI, ObjType.AchieveItem, true);
-        }
+        //    //ResourceManager.AddAsyncLoad("SkillItem", 31, Folder.UI, ObjType.SkillItem, true);
+        //    //ResourceManager.AddAsyncLoad("SignItem", 21, Folder.UI, ObjType.SignItem, true);
+        //    //ResourceManager.AddAsyncLoad("FlowerItem", 17, Folder.UI, ObjType.FlowerItem, true);
+        //    //ResourceManager.AddAsyncLoad("AchieveItem", 2, Folder.UI, ObjType.AchieveItem, true);
+        //}
 
         yield return LoadScene();
 
-        if (!Logo.Complete && !Initializer.Instance.DebugMode)
-        {
-            ResourceManager.AddAsyncLoad(ResourceLabel.Flower, 9, Folder.Scene, ObjType.Flower);
+        //if (!Logo.Complete && !Initializer.Instance.DebugMode)
+        //{
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.Flower, 9, Folder.Scene, ObjType.Flower);
 
-            ResourceManager.AddAsyncLoad(ResourceLabel.Page, 2, Folder.Scene, ObjType.SlotPage);
-            ResourceManager.AddAsyncLoad(ResourceLabel.Garden, 1, Folder.Scene, ObjType.Garden);
-            ResourceManager.AddAsyncLoad(ResourceLabel.DressRoom, 1, Folder.UI, ObjType.DressRoom);
-        }
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.Page, 2, Folder.Scene, ObjType.SlotPage);
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.Garden, 1, Folder.Scene, ObjType.Garden);
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.DressRoom, 1, Folder.UI, ObjType.DressRoom);
+        //}
 
         yield return LoadAudio();
 
-        if (!Logo.Complete && !Initializer.Instance.DebugMode)
-        {
-            ResourceManager.AddAsyncLoad(ResourceLabel.Music, 1, Folder.Audio, ObjType.Music);
-        }
+        //if (!Logo.Complete && !Initializer.Instance.DebugMode)
+        //{
+        //    ResourceManager.AddAsyncLoad(ResourceLabel.Music, 1, Folder.Audio, ObjType.Music);
+        //}
 
         yield return LoadAtlas2();
 
-        if (!Logo.Complete && !Initializer.Instance.DebugMode)
-        {
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.SkillConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PackConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.AbilityConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.AchieveConfig, Folder.Config);
-
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.VisitConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.AwardConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.FlowerConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.OfflineConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.SigninConfig, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.DressroomConfig, Folder.Config);
-
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.English, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.ChineseSimplified, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.ChineseTraditional, Folder.Config);
-
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.BtnClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.SkillClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.ErrorClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.DropClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.CloseClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.FlowerClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.BubbleClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.CurrentClip, Folder.Audio);
-            ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.MiniEndClip, Folder.Audio);
-
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.StandTex, Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.StandSke, Folder.Config);
-            ResourceManager.AddAsyncLoad<Texture2D>(ResourceLabel.StandTexture, Folder.Scene);
-        }
+        //if (!Logo.Complete && !Initializer.Instance.DebugMode)
+        //{
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.SkillConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PackConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.AbilityConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.AchieveConfig, Folder.Config);
+
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.VisitConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.AwardConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.FlowerConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.OfflineConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.SigninConfig, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.DressroomConfig, Folder.Config);
+
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.English, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.ChineseSimplified, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.ChineseTraditional, Folder.Config);
+
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.BtnClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.SkillClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.ErrorClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.DropClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.CloseClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.FlowerClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.BubbleClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.CurrentClip, Folder.Audio);
+        //    ResourceManager.AddAsyncLoad<AudioClip>(ResourceLabel.MiniEndClip, Folder.Audio);
+
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.StandTex, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.StandSke, Folder.Config);
+        //    ResourceManager.AddAsyncLoad<Texture2D>(ResourceLabel.StandTexture, Folder.Scene);
+        //}
 
         yield return LoadAtlas();
         yield return LoadEffect();
@@ -615,15 +636,15 @@ public class Bundle : MonoBehaviour
         }
     }
 
-    public static IEnumerator LoadConfig()
+    public static IEnumerator LoadDefaul()
     {
-        WWW www = new WWW(GetStreamPath() + "config");
+        WWW www = new WWW(GetStreamPath() + "default");
 
         yield return www;
 
         if (string.IsNullOrEmpty(www.error))
         {
-            Config = www.assetBundle;
+            Defaul = www.assetBundle;
         }
         else
         {
@@ -844,7 +865,7 @@ public class Bundle : MonoBehaviour
         try
         {
             Initializer.DebugText.text = "01";
-            NewDressroomConfigs = ConfigManager.GetDressRoomConfig(NewDressConfig.LoadAsset<TextAsset>(ResourceLabel.NewDressroomConfig));
+            //NewDressroomConfigs = ConfigManager.GetDressRoomConfig(NewDressConfig.LoadAsset<TextAsset>(ResourceLabel.NewDressroomConfig));
 
             Initializer.DebugText.text = "02";
             TextAsset[] textAssets = NewDressSke.LoadAllAssets<TextAsset>();
@@ -871,43 +892,43 @@ public class Bundle : MonoBehaviour
             }
 
             Initializer.DebugText.text = "051";
-            TextAsset language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.English);
+            TextAsset language = Config.LoadAsset<TextAsset>(ResourceLabel.English);
             XmlDocument document = new XmlDocument();
             document.LoadXml(language.text);
             Language.AddLanguageDocument(CurrentLanguage.English, document);
 
             Initializer.DebugText.text = "061";
-            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.ChineseSimplified);
+            language = Config.LoadAsset<TextAsset>(ResourceLabel.ChineseSimplified);
             document = new XmlDocument();
             document.LoadXml(language.text);
             Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
 
             Initializer.DebugText.text = "071";
-            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.ChineseTraditional);
+            language = Config.LoadAsset<TextAsset>(ResourceLabel.ChineseTraditional);
             document = new XmlDocument();
             document.LoadXml(language.text);
             Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
 
-            Initializer.DebugText.text = "052";
-            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewEnglish);
-            document = new XmlDocument();
-            document.LoadXml(language.text);
-            Language.AddLanguageDocument(CurrentLanguage.English, document);
+            //Initializer.DebugText.text = "052";
+            //language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewEnglish);
+            //document = new XmlDocument();
+            //document.LoadXml(language.text);
+            //Language.AddLanguageDocument(CurrentLanguage.English, document);
 
-            Initializer.DebugText.text = "062";
-            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewChineseSimplified);
-            document = new XmlDocument();
-            document.LoadXml(language.text);
-            Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
+            //Initializer.DebugText.text = "062";
+            //language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewChineseSimplified);
+            //document = new XmlDocument();
+            //document.LoadXml(language.text);
+            //Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
 
-            Initializer.DebugText.text = "072";
-            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewChineseTraditional);
-            document = new XmlDocument();
-            document.LoadXml(language.text);
-            Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
+            //Initializer.DebugText.text = "072";
+            //language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewChineseTraditional);
+            //document = new XmlDocument();
+            //document.LoadXml(language.text);
+            //Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
 
             Initializer.DebugText.text = "08";
-            NewFlowerConfigs = ConfigManager.GetFlowerConfig(NewFlowerConfig.LoadAsset<TextAsset>(ResourceLabel.NewFlowerConfig));
+            //NewFlowerConfigs = ConfigManager.GetFlowerConfig(NewFlowerConfig.LoadAsset<TextAsset>(ResourceLabel.NewFlowerConfig));
 
             Initializer.DebugText.text = "09";
             sprites = NewFlowerTex.LoadAllAssets<Sprite>();
@@ -930,7 +951,7 @@ public class Bundle : MonoBehaviour
 
     public static void DownloadAllAssetBundleSucceed()
     {
-        Debug.Log("succeed");
+        //Debug.Log("succeed");
     }
 
     public static void DownloadAllAssetBundleFailed()
@@ -940,11 +961,12 @@ public class Bundle : MonoBehaviour
 
     public static void DownloadAssetBundleSucceed(AssetBundleSet assetBundleSet, bool isDownload)
     {
-        if (assetBundleSet.Name == ResourceLabel.NewDressConfig)
-        {
-            NewDressConfig = assetBundleSet.AssetBundle;
-        }
-        else if (assetBundleSet.Name == ResourceLabel.NewDressSke)
+        //Debug.Log(assetBundleSet.AssetBundle.name);
+        //if (assetBundleSet.Name == ResourceLabel.NewDressConfig)
+        //{
+        //    NewDressConfig = assetBundleSet.AssetBundle;
+        //}
+        if (assetBundleSet.Name == ResourceLabel.NewDressSke)
         {
             NewDressSke = assetBundleSet.AssetBundle;
         }
@@ -952,14 +974,18 @@ public class Bundle : MonoBehaviour
         {
             NewDressTex = assetBundleSet.AssetBundle;
         }
-        else if (assetBundleSet.Name == ResourceLabel.NewLanguage)
-        {
-            NewLanguage = assetBundleSet.AssetBundle;
-        }
-        else if (assetBundleSet.Name == ResourceLabel.NewFlowerConfig)
+        else if (assetBundleSet.Name == ResourceLabel.Config)
         {
-            NewFlowerConfig = assetBundleSet.AssetBundle;
+            Config = assetBundleSet.AssetBundle;
         }
+        //else if (assetBundleSet.Name == ResourceLabel.NewLanguage)
+        //{
+        //    NewLanguage = assetBundleSet.AssetBundle;
+        //}
+        //else if (assetBundleSet.Name == ResourceLabel.NewFlowerConfig)
+        //{
+        //    NewFlowerConfig = assetBundleSet.AssetBundle;
+        //}
         else if (assetBundleSet.Name == ResourceLabel.NewFlowerTex)
         {
             NewFlowerTex = assetBundleSet.AssetBundle;
@@ -996,7 +1022,7 @@ public class Bundle : MonoBehaviour
 
     public static void SkipUpdateForDebugMode()
     {
-        NewDressroomConfigs = ConfigManager.GetDressRoomConfig(Instance.NewDressConfigList[0] as TextAsset);
+        //NewDressroomConfigs = ConfigManager.GetDressRoomConfig(Instance.NewDressConfigList[0] as TextAsset);
 
         foreach (var textAsset in Instance.NewDressSkeList)
         {
@@ -1018,28 +1044,33 @@ public class Bundle : MonoBehaviour
             ResourceManager.ObjectDictionary.UniqueAdd(sprite.name, sprite);
         }
 
-        for (int i = 0; i < Instance.NewLanguageList.Count; i++)
+        for (int i = 0; i < Instance.ConfigList.Count; i++)
         {
-            TextAsset textAsset = Instance.NewLanguageList[i] as TextAsset;
-            if (textAsset.name == ResourceLabel.NewEnglish)
+            TextAsset textAsset = Instance.ConfigList[i] as TextAsset;
+            if (textAsset.name == ResourceLabel.English)
             {
                 XmlDocument document = new XmlDocument();
                 document.LoadXml(textAsset.text);
                 Language.AddLanguageDocument(CurrentLanguage.English, document);
             }
-            else if (textAsset.name == ResourceLabel.NewChineseSimplified)
+            else if (textAsset.name == ResourceLabel.ChineseSimplified)
             {
                 XmlDocument document = new XmlDocument();
                 document.LoadXml(textAsset.text);
                 Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
             }
-            else if (textAsset.name == ResourceLabel.NewChineseTraditional)
+            else if (textAsset.name == ResourceLabel.ChineseTraditional)
             {
                 XmlDocument document = new XmlDocument();
                 document.LoadXml(textAsset.text);
                 Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
             }
-            else if (textAsset.name == ResourceLabel.English)
+        }
+
+        for (int i = 0; i < Instance.DefaultList.Count; i++)
+        {
+            TextAsset textAsset = Instance.ConfigList[i] as TextAsset;
+            if (textAsset.name == ResourceLabel.English)
             {
                 XmlDocument document = new XmlDocument();
                 document.LoadXml(textAsset.text);
@@ -1059,7 +1090,7 @@ public class Bundle : MonoBehaviour
             }
         }
 
-        NewFlowerConfigs = ConfigManager.GetDressRoomConfig(Instance.NewFlowerConfigList[0] as TextAsset);
+        //NewFlowerConfigs = ConfigManager.GetDressRoomConfig(Instance.NewFlowerConfigList[0] as TextAsset);
 
         foreach (var obj in Instance.NewFlowerSpriteList)
         {

Assets/Script/UI/UpdatePanel.cs

@@ -26,17 +26,17 @@ public class UpdatePanel : MonoBehaviour
         scaleAnim = bg.CreateTweenScale(Vector3.zero, Vector3.one, 0.25f, false, true, Curve.EaseOutQuad);
 
         XmlDocument document = new XmlDocument();
-        TextAsset textAsset = Bundle.Config.LoadAsset<TextAsset>(ResourceLabel.DefaultEnglish);
+        TextAsset textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultEnglish);
         document.LoadXml(textAsset.text);
         Language.AddLanguageDocument(CurrentLanguage.English, document);
 
         document = new XmlDocument();
-        textAsset = Bundle.Config.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseSimplified);
+        textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseSimplified);
         document.LoadXml(textAsset.text);
         Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
 
         document = new XmlDocument();
-        textAsset = Bundle.Config.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseTraditional);
+        textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseTraditional);
         document.LoadXml(textAsset.text);
         Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
     }

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: []

第五期.txt

@@ -1,14 +1,8 @@
-图标位置 骨骼位置 语言 保存
-
-鞋子
-
-第14套服装
-
-
 5兆金币成就
 
 点击换小游戏卡住
 
+角色的鞋子没有Alpha动画(试衣间)