增加新的服装

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/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1523002753
+timeCreated: 1523347495
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -80,6 +80,13 @@ TextureImporter:
     21300146: 9
     21300148: "\u82B1\u6735\u5B9D\u7BB1"
     21300150: "\u978B\u5B5014-1"
+    21300152: "\u978B\u5B503"
+    21300154: 5
+    21300156: 6
+    21300158: 7
+    21300160: "\u978B\u5B5014a"
+    21300162: "\u7FC5\u81805"
+    21300164: "\u65B0\u978B\u5B5016"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -118,7 +125,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
   textureType: 8
   textureShape: 1
@@ -170,11 +177,24 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
+      name: "\u978B\u5B5015-2_1"
+      rect:
+        serializedVersion: 2
+        x: 548
+        y: 3087
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 2641
-        y: 3833
+        x: 3757
+        y: 3983
         width: 165
         height: 111
       alignment: 0
@@ -186,8 +206,8 @@ TextureImporter:
       name: "\u978B\u5B501"
       rect:
         serializedVersion: 2
-        x: 1906
-        y: 3768
+        x: 3893
+        y: 3824
         width: 66
         height: 134
       alignment: 0
@@ -199,8 +219,8 @@ TextureImporter:
       name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 990
-        y: 3029
+        x: 715
+        y: 2954
         width: 165
         height: 111
       alignment: 0
@@ -212,8 +232,8 @@ TextureImporter:
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 990
-        y: 3142
+        x: 548
+        y: 2954
         width: 165
         height: 111
       alignment: 0
@@ -222,10 +242,36 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B502"
+      rect:
+        serializedVersion: 2
+        x: 3825
+        y: 3847
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B503"
+      rect:
+        serializedVersion: 2
+        x: 616
+        y: 3087
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 2
+        x: 275
         y: 3037
         width: 271
         height: 184
@@ -238,7 +284,7 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 275
+        x: 2
         y: 3037
         width: 271
         height: 184
@@ -264,8 +310,8 @@ TextureImporter:
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 686
-        y: 3067
+        x: 480
+        y: 3514
         width: 302
         height: 197
       alignment: 0
@@ -277,8 +323,8 @@ TextureImporter:
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 3514
+        x: 686
+        y: 3067
         width: 302
         height: 197
       alignment: 0
@@ -313,10 +359,23 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5012"
+      name: "\u88D9\u5B509"
       rect:
         serializedVersion: 2
         x: 2368
+        y: 3909
+        width: 259
+        height: 185
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5012"
+      rect:
+        serializedVersion: 2
+        x: 2629
         y: 3921
         width: 271
         height: 173
@@ -329,7 +388,7 @@ TextureImporter:
       name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 344
+        x: 2
         y: 3223
         width: 340
         height: 276
@@ -342,7 +401,7 @@ TextureImporter:
       name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 2
+        x: 344
         y: 3223
         width: 340
         height: 276
@@ -352,11 +411,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 8
+      name: 5
       rect:
         serializedVersion: 2
-        x: 2808
-        y: 3810
+        x: 3992
+        y: 3960
         width: 66
         height: 134
       alignment: 0
@@ -365,11 +424,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 9
+      name: 6
       rect:
         serializedVersion: 2
-        x: 548
-        y: 3087
+        x: 3757
+        y: 3847
         width: 66
         height: 134
       alignment: 0
@@ -378,11 +437,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 10
+      name: 7
       rect:
         serializedVersion: 2
-        x: 548
-        y: 2951
+        x: 3961
+        y: 3824
         width: 66
         height: 134
       alignment: 0
@@ -420,8 +479,8 @@ TextureImporter:
       name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 820
-        y: 3484
+        x: 1208
+        y: 3787
         width: 351
         height: 307
       alignment: 0
@@ -433,8 +492,8 @@ TextureImporter:
       name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 1208
-        y: 3787
+        x: 820
+        y: 3484
         width: 351
         height: 307
       alignment: 0
@@ -447,7 +506,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 990
-        y: 3255
+        y: 3029
         width: 166
         height: 114
       alignment: 0
@@ -456,6 +515,19 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u4E0A\u88636"
+      rect:
+        serializedVersion: 2
+        x: 990
+        y: 3145
+        width: 180
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
@@ -469,6 +541,19 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u4E0A\u886312"
+      rect:
+        serializedVersion: 2
+        x: 990
+        y: 3258
+        width: 180
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u7FC5\u81801"
       rect:
         serializedVersion: 2
@@ -485,7 +570,7 @@ TextureImporter:
       name: "\u82B1\u6735\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 411
+        x: 2
         y: 3713
         width: 407
         height: 381
@@ -498,7 +583,7 @@ TextureImporter:
       name: "\u94BB\u77F3\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2
+        x: 411
         y: 3713
         width: 407
         height: 381
@@ -511,8 +596,8 @@ TextureImporter:
       name: "\u5F00\u5FC3"
       rect:
         serializedVersion: 2
-        x: 2912
-        y: 3959
+        x: 2902
+        y: 3812
         width: 270
         height: 135
       alignment: 0
@@ -521,11 +606,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u90C1\u95F7"
+      rect:
+        serializedVersion: 2
+        x: 2368
+        y: 3813
+        width: 237
+        height: 94
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u978B\u5B5014-1"
       rect:
         serializedVersion: 2
-        x: 616
-        y: 3087
+        x: 1462
+        y: 3651
         width: 66
         height: 134
       alignment: 0
@@ -537,8 +635,8 @@ TextureImporter:
       name: "\u978B\u5B5015-1"
       rect:
         serializedVersion: 2
-        x: 1462
-        y: 3651
+        x: 3924
+        y: 3960
         width: 66
         height: 134
       alignment: 0
@@ -550,7 +648,7 @@ TextureImporter:
       name: "\u5934\u997015"
       rect:
         serializedVersion: 2
-        x: 2641
+        x: 3221
         y: 3946
         width: 269
         height: 148
@@ -563,8 +661,8 @@ TextureImporter:
       name: "\u4E0B\u886314b\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 2912
-        y: 3820
+        x: 3492
+        y: 3957
         width: 263
         height: 137
       alignment: 0
@@ -576,8 +674,8 @@ TextureImporter:
       name: "\u4E0B\u886314b"
       rect:
         serializedVersion: 2
-        x: 1173
-        y: 3099
+        x: 686
+        y: 3266
         width: 277
         height: 216
       alignment: 0
@@ -589,8 +687,8 @@ TextureImporter:
       name: "\u4E0B\u886314c\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 3184
-        y: 3957
+        x: 2629
+        y: 3782
         width: 263
         height: 137
       alignment: 0
@@ -602,8 +700,8 @@ TextureImporter:
       name: "\u4E0B\u886314c"
       rect:
         serializedVersion: 2
-        x: 686
-        y: 3266
+        x: 1173
+        y: 3099
         width: 277
         height: 216
       alignment: 0
@@ -612,6 +710,19 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B5014a"
+      rect:
+        serializedVersion: 2
+        x: 1906
+        y: 3768
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u4E0B\u886314a"
       rect:
         serializedVersion: 2
@@ -624,6 +735,32 @@ TextureImporter:
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u7FC5\u81805"
+      rect:
+        serializedVersion: 2
+        x: 2902
+        y: 3949
+        width: 317
+        height: 145
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u65B0\u978B\u5B5016"
+      rect:
+        serializedVersion: 2
+        x: 882
+        y: 2931
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
     outline: []
   spritePackingTag: 
   userData: 

Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityUGUIDisplay.cs

@@ -22,7 +22,6 @@ public class UnityUGUIDisplay : MonoBehaviour
 
     public bool Enable(Transform parent, Transform copyTrans, MeshFilter meshFilter, MeshRenderer meshRenderer)
     {
-        Debug.Log(-1);
         bool addComponent = false;
         if (dbGraphic == null)
         {
@@ -31,6 +30,7 @@ public class UnityUGUIDisplay : MonoBehaviour
             go.AddComponent<CanvasRenderer>();
             dbGraphic = go.AddComponent<DragonBoneGraphic>();
             addComponent = true;
+            //Debug.Log("new");
         }
         dbGraphic.Enable(parent, copyTrans, meshFilter, meshRenderer);
         return addComponent;

Assets/Resource/Logo.unity

@@ -630,3 +630,151 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2044154207
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_Name
+      value: Canvas (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: -15
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: -54.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -2979,6 +2979,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1159760760284932
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224099733860408236}
+  - component: {fileID: 222239394650367164}
+  - component: {fileID: 114276001754858908}
+  m_Layer: 5
+  m_Name: Pi_SidePanelBg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1160402570471718
 GameObject:
   m_ObjectHideFlags: 1
@@ -4500,6 +4517,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1228251381329632
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224092797225497108}
+  - component: {fileID: 222627360558649800}
+  - component: {fileID: 114316785676928634}
+  - component: {fileID: 114261469111867270}
+  m_Layer: 5
+  m_Name: P_CloseTipBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1228798611461996
 GameObject:
   m_ObjectHideFlags: 1
@@ -11534,7 +11569,6 @@ GameObject:
   m_Component:
   - component: {fileID: 224532511594157728}
   - component: {fileID: 222507596288632230}
-  - component: {fileID: 114643162787514242}
   m_Layer: 5
   m_Name: Pi_FashionShowHomeSidePanel
   m_TagString: Untagged
@@ -15167,6 +15201,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1816815307588146
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224265650823470674}
+  - component: {fileID: 222684612505135156}
+  - component: {fileID: 114368597706487310}
+  - component: {fileID: 114836686390853758}
+  m_Layer: 5
+  m_Name: Pi_HomePageTipBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1816981574551056
 GameObject:
   m_ObjectHideFlags: 1
@@ -17483,7 +17535,8 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 224463365016899094}
-  - component: {fileID: 223841034135352024}
+  - component: {fileID: 222378571433840940}
+  - component: {fileID: 114324977199489316}
   m_Layer: 5
   m_Name: U_Parent
   m_TagString: Untagged
@@ -18641,7 +18694,6 @@ GameObject:
   m_Component:
   - component: {fileID: 224694386806689142}
   - component: {fileID: 222156513021321458}
-  - component: {fileID: 114814403820785534}
   - component: {fileID: 225296112413584246}
   m_Layer: 5
   m_Name: U_LoadingPanel
@@ -22025,7 +22077,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -29212,6 +29264,47 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9886\u53D6\u5956\u52B1"
+--- !u!114 &114261469111867270
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1228251381329632}
+  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: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    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: 114316785676928634}
+  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 &114262363233978670
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -29713,7 +29806,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -29855,6 +29948,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114276001754858908
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1159760760284932}
+  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: 0.7490196}
+  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: 338f3e3e1fde98a45bddde5da22dc383, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114276185882028354
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -31459,6 +31579,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63D0\u4EA4\u95EE\u9898"
+--- !u!114 &114316785676928634
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1228251381329632}
+  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: 0}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114317597627844288
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -31819,6 +31966,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53D6\u6D88"
+--- !u!114 &114324977199489316
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1938169061283902}
+  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: 61f620ad131e53b43a98f1bc3a0a164e, 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 &114325910027983378
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -33569,6 +33743,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0
+--- !u!114 &114368597706487310
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1816815307588146}
+  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: 0}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114369256623160882
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -35275,7 +35476,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -37562,7 +37763,7 @@ MonoBehaviour:
   m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
+  m_HorizontalFit: 2
   m_VerticalFit: 2
 --- !u!114 &114465313624299756
 MonoBehaviour:
@@ -39017,7 +39218,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -44390,33 +44591,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114643162787514242
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1593287312673742}
-  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: 0.7490196}
-  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: 338f3e3e1fde98a45bddde5da22dc383, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &114644740620894910
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -45681,7 +45855,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -46821,7 +46995,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 20
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -48998,7 +49172,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 20
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -51375,33 +51549,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114814403820785534
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1994305511662682}
-  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: 61f620ad131e53b43a98f1bc3a0a164e, 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 &114814598802171178
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -52277,6 +52424,47 @@ MonoBehaviour:
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
+--- !u!114 &114836686390853758
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1816815307588146}
+  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: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    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: 114368597706487310}
+  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 &114837350644250442
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -54585,7 +54773,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -56593,7 +56781,7 @@ MonoBehaviour:
   m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
+  m_HorizontalFit: 2
   m_VerticalFit: 2
 --- !u!114 &114933887406458736
 MonoBehaviour:
@@ -62934,6 +63122,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1407528392767648}
+--- !u!222 &222239394650367164
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1159760760284932}
 --- !u!222 &222240092063846502
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -63726,6 +63920,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1112217278232724}
+--- !u!222 &222378571433840940
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1938169061283902}
 --- !u!222 &222380415668444280
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -65052,6 +65252,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1311906819414802}
+--- !u!222 &222627360558649800
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1228251381329632}
 --- !u!222 &222629197141370516
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -65346,6 +65552,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1020038402279328}
+--- !u!222 &222684612505135156
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1816815307588146}
 --- !u!222 &222686726736102282
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -67064,25 +67276,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
---- !u!223 &223841034135352024
-Canvas:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1938169061283902}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 2
-  m_TargetDisplay: 0
 --- !u!224 &224000362090024068
 RectTransform:
   m_ObjectHideFlags: 1
@@ -69307,6 +69500,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224092797225497108
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1228251381329632}
+  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_Father: {fileID: 224748735399504228}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -172.99998, y: 0.0008293524}
+  m_SizeDelta: {x: 345, y: 0.10614014}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224092854695183372
 RectTransform:
   m_ObjectHideFlags: 1
@@ -69457,6 +69668,24 @@ RectTransform:
   m_AnchoredPosition: {x: -0.925, y: -0.000015259}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224099733860408236
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1159760760284932}
+  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_Father: {fileID: 224532511594157728}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.0000010371732, y: 0.000000515327}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224099813649884984
 RectTransform:
   m_ObjectHideFlags: 1
@@ -70759,7 +70988,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224412738076424010}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -70890,7 +71119,7 @@ RectTransform:
   m_Children:
   - {fileID: 224504804021541794}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 5
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -71394,7 +71623,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224748735399504228}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -71673,7 +71902,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224412738076424010}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -72682,6 +72911,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224265650823470674
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1816815307588146}
+  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_Father: {fileID: 224532511594157728}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000013153491, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224267079705163436
 RectTransform:
   m_ObjectHideFlags: 1
@@ -73989,7 +74236,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 1
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -75254,7 +75501,7 @@ RectTransform:
   m_Children:
   - {fileID: 224112832932415636}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 4
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -75272,12 +75519,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224090067404907716}
-  - {fileID: 224589063885364814}
-  - {fileID: 224433486282159728}
   - {fileID: 224173203919665598}
   - {fileID: 224222152581841080}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 9
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -75710,8 +75955,8 @@ RectTransform:
   m_LocalScale: {x: 1.1674954, y: 1.1674954, z: 1.1674954}
   m_Children:
   - {fileID: 224049546259666266}
-  m_Father: {fileID: 224412738076424010}
-  m_RootOrder: 2
+  m_Father: {fileID: 224532511594157728}
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -76424,10 +76669,10 @@ RectTransform:
   m_Father: {fileID: 224694386806689142}
   m_RootOrder: 0
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224463564165342122
 RectTransform:
@@ -78172,6 +78417,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224412738076424010}
+  - {fileID: 224099733860408236}
   - {fileID: 224791006927686970}
   - {fileID: 224333435985279728}
   - {fileID: 224923994672465638}
@@ -78181,7 +78428,9 @@ RectTransform:
   - {fileID: 224556376707151520}
   - {fileID: 224549302067237646}
   - {fileID: 224747277297083974}
-  - {fileID: 224412738076424010}
+  - {fileID: 224265650823470674}
+  - {fileID: 224589063885364814}
+  - {fileID: 224433486282159728}
   m_Father: {fileID: 224400564893835002}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -78496,7 +78745,7 @@ RectTransform:
   m_Children:
   - {fileID: 224448063658062092}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 7
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -78650,7 +78899,7 @@ RectTransform:
   m_Children:
   - {fileID: 224898074437857084}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -79277,7 +79526,7 @@ RectTransform:
   - {fileID: 224184161374468996}
   - {fileID: 224737858497042548}
   m_Father: {fileID: 224748735399504228}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -79446,8 +79695,8 @@ RectTransform:
   m_LocalScale: {x: 1.1674954, y: 1.1674954, z: 1.1674954}
   m_Children:
   - {fileID: 224368426186144126}
-  m_Father: {fileID: 224412738076424010}
-  m_RootOrder: 1
+  m_Father: {fileID: 224532511594157728}
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -80801,7 +81050,7 @@ RectTransform:
   - {fileID: 224299078283350170}
   - {fileID: 224632252683069606}
   m_Father: {fileID: 224748735399504228}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -82789,7 +83038,7 @@ RectTransform:
   - {fileID: 224807645637040302}
   - {fileID: 224793223109344142}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 8
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -82826,9 +83075,10 @@ RectTransform:
   m_Children:
   - {fileID: 224702879398399798}
   - {fileID: 224345610106173824}
+  - {fileID: 224648689854965190}
   - {fileID: 224581926987286028}
   - {fileID: 224212028489265098}
-  - {fileID: 224648689854965190}
+  - {fileID: 224092797225497108}
   m_Father: {fileID: 224866873176071794}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -83565,7 +83815,7 @@ RectTransform:
   - {fileID: 224493309859027724}
   - {fileID: 224484188298403516}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -84258,7 +84508,7 @@ RectTransform:
   m_Children:
   - {fileID: 224687335475828518}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 3
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -86330,7 +86580,7 @@ RectTransform:
   m_Children:
   - {fileID: 224102350150520044}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

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

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

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -59,6 +59,7 @@
   <item id="418" jump_frequency="" type="6" index="17" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子14a" spriteAlpha="" armatureName="鞋子14a" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="419" jump_frequency="" type="6" index="18" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子14b" spriteAlpha="" armatureName="鞋子14b" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="420" jump_frequency="" type="6" index="19" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子14c" spriteAlpha="" armatureName="鞋子14c" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="421" jump_frequency="" type="6" index="20" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="新鞋子16" spriteAlpha="" armatureName="新鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <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="" desc="" />
   <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="" desc="" />
   <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="" desc="" />
@@ -81,6 +82,7 @@
   <item id="220" jump_frequency="" type="3" index="19" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14a" spriteAlpha="" armatureName="下衣14a" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="221" jump_frequency="" type="3" index="20" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="1.08,77.07" icon2offset="" spriteName="下衣14b,下衣14b蝴蝶结" spriteAlpha="" armatureName="下衣14b" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="222" jump_frequency="" type="3" index="21" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="1.08,77.08" icon2offset="" spriteName="下衣14c,下衣14c蝴蝶结" spriteAlpha="" armatureName="下衣14c" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="223" jump_frequency="" type="3" index="22" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子16" spriteAlpha="" armatureName="裙子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <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="" desc="" />
   <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="" desc="" />
   <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="" desc="" />
@@ -97,6 +99,7 @@
   <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="" desc="DesignByKnife" />
   <item id="615" jump_frequency="" type="4" index="14" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰13-1" spriteAlpha="" armatureName="头饰13-1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="616" jump_frequency="" type="4" index="15" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰13-2" spriteAlpha="" armatureName="头饰13-2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="617" jump_frequency="" type="4" index="15" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="帽子16" spriteAlpha="" armatureName="帽子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <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="15,0" desc="" />
   <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="" desc="" />
   <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="" desc="" />
@@ -119,11 +122,13 @@
   <item id="820" jump_frequency="" type="2" index="19" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14a" spriteAlpha="" armatureName="上衣14a" extraBodypart="10,9" extraArmatureName="上衣14a-袖子2,上衣14a-袖子1" ignore="" icon0offset="" desc="" />
   <item id="821" jump_frequency="" type="2" index="20" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.56,16.23" icon2offset="56.97,13.65" spriteName="上衣14b,上衣14b-袖子2,上衣14b-袖子1" spriteAlpha="" armatureName="上衣14b" extraBodypart="10,9" extraArmatureName="上衣14b-袖子2,上衣14b-袖子1" ignore="" icon0offset="" desc="" />
   <item id="822" jump_frequency="" type="2" index="21" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.56,16.23" icon2offset="56.97,13.65" spriteName="上衣14c,上衣14c-袖子2,上衣14c-袖子1" spriteAlpha="" armatureName="上衣14c" extraBodypart="10,9" extraArmatureName="上衣14c-袖子2,上衣14c-袖子1" ignore="" icon0offset="" desc="" />
+  <item id="823" jump_frequency="" type="2" index="22" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣16,上衣16袖子2,上衣16袖子1" spriteAlpha="" armatureName="上衣16" extraBodypart="10,9" extraArmatureName="上衣16袖子2,上衣16袖子1" ignore="" icon0offset="" desc="" />
   <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="" desc="" />
   <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="" desc="" />
   <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="" desc="" />
   <item id="1004" jump_frequency="" type="5" index="3" bodypart="6" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀3" spriteAlpha="" armatureName="翅膀3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="1005" jump_frequency="" type="5" index="4" bodypart="6" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀4" spriteAlpha="" armatureName="翅膀4" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="1006" jump_frequency="" type="5" index="5" bodypart="6" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀5" spriteAlpha="" armatureName="翅膀5" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="1200" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="眼睛1" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="1201" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="眼睛2" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="1202" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="眼睛3" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="25" />
+  <Version value="26" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -860,6 +860,7 @@
     <Armature220 desc=""><![CDATA[蝶梦]]></Armature220>
     <Armature221 desc=""><![CDATA[橙意]]></Armature221>
     <Armature222 desc=""><![CDATA[青意]]></Armature222>
+    <Armature223 desc=""><![CDATA[名字]]></Armature223>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(蓝)]]></Armature403>
@@ -880,6 +881,7 @@
     <Armature418 desc=""><![CDATA[蝶梦]]></Armature418>
     <Armature419 desc=""><![CDATA[橙意]]></Armature419>
     <Armature420 desc=""><![CDATA[青意]]></Armature420>
+    <Armature421 desc=""><![CDATA[名字]]></Armature421>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶结]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -896,6 +898,7 @@
     <Armature614 desc=""><![CDATA[春华]]></Armature614>
     <Armature615 desc=""><![CDATA[熊熊]]></Armature615>
     <Armature616 desc=""><![CDATA[蝶梦]]></Armature616>
+    <Armature617 desc=""><![CDATA[名字]]></Armature617>
     <Armature801 desc=""><![CDATA[小鱼]]></Armature801>
     <Armature802 desc=""><![CDATA[可爱宝贝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -918,11 +921,13 @@
     <Armature820 desc=""><![CDATA[蝶梦]]></Armature820>
     <Armature821 desc=""><![CDATA[橙意]]></Armature821>
     <Armature822 desc=""><![CDATA[青意]]></Armature822>
+    <Armature823 desc=""><![CDATA[名字]]></Armature823>
     <Armature1001 desc=""><![CDATA[无翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶梦]]></Armature1005>
+    <Armature1006 desc=""><![CDATA[名字]]></Armature1006>
     <DesignByKnife desc=""><![CDATA[热心玩家<{<color=blue>小刀</color>}>设计ID[1801104863982007122]]]></DesignByKnife>
   </DressRoom>
   <Tip>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -860,6 +860,7 @@
     <Armature220 desc=""><![CDATA[蝶夢]]></Armature220>
     <Armature221 desc=""><![CDATA[橙意]]></Armature221>
     <Armature222 desc=""><![CDATA[青意]]></Armature222>
+    <Armature223 desc=""><![CDATA[]]></Armature223>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(藍)]]></Armature403>
@@ -880,6 +881,7 @@
     <Armature418 desc=""><![CDATA[蝶夢]]></Armature418>
     <Armature419 desc=""><![CDATA[橙意]]></Armature419>
     <Armature420 desc=""><![CDATA[青意]]></Armature420>
+    <Armature421 desc=""><![CDATA[]]></Armature421>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶結]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -896,6 +898,7 @@
     <Armature614 desc=""><![CDATA[春華]]></Armature614>
     <Armature615 desc=""><![CDATA[熊熊]]></Armature615>
     <Armature616 desc=""><![CDATA[蝶夢]]></Armature616>
+    <Armature617 desc=""><![CDATA[]]></Armature617>
     <Armature801 desc=""><![CDATA[小魚]]></Armature801>
     <Armature802 desc=""><![CDATA[可愛寶貝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -918,11 +921,13 @@
     <Armature820 desc=""><![CDATA[蝶夢]]></Armature820>
     <Armature821 desc=""><![CDATA[橙意]]></Armature821>
     <Armature822 desc=""><![CDATA[青意]]></Armature822>
+    <Armature823 desc=""><![CDATA[]]></Armature823>
     <Armature1001 desc=""><![CDATA[無翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精靈之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶夢]]></Armature1005>
+    <Armature1006 desc=""><![CDATA[]]></Armature1006>
     <DesignByKnife desc=""><![CDATA[熱心玩家<{<color=blue>小刀</color>}>設計ID[1801104863982007122]]]></DesignByKnife>
   </DressRoom>
   <Tip>

Assets/Resource/XML/lan/English.xml

@@ -859,6 +859,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature220 desc=""><![CDATA[Dream of Butterfly]]></Armature220>
     <Armature221 desc=""><![CDATA[Orange Imagination]]></Armature221>
     <Armature222 desc=""><![CDATA[Blue Imagination]]></Armature222>
+    <Armature223 desc=""><![CDATA[]]></Armature223>
     <Armature401 desc=""><![CDATA[Leather Shoes]]></Armature401>
     <Armature402 desc=""><![CDATA[Boots(Black)]]></Armature402>
     <Armature403 desc=""><![CDATA[Boots(Blue)]]></Armature403>
@@ -879,6 +880,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature418 desc=""><![CDATA[Dream of Butterfly]]></Armature418>
     <Armature419 desc=""><![CDATA[Orange Imagination]]></Armature419>
     <Armature420 desc=""><![CDATA[Blue Imagination]]></Armature420>
+    <Armature421 desc=""><![CDATA[]]></Armature421>
     <Armature601 desc=""><![CDATA[Big Bowknot]]></Armature601>
     <Armature602 desc=""><![CDATA[Pink Flower]]></Armature602>
     <Armature603 desc=""><![CDATA[Rabbit]]></Armature603>
@@ -895,6 +897,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature614 desc=""><![CDATA[Spring]]></Armature614>
     <Armature615 desc=""><![CDATA[Teddy]]></Armature615>
     <Armature616 desc=""><![CDATA[Dream of Butterfly]]></Armature616>
+    <Armature617 desc=""><![CDATA[]]></Armature617>
     <Armature801 desc=""><![CDATA[Fish]]></Armature801>
     <Armature802 desc=""><![CDATA[Lovely Baby]]></Armature802>
     <Armature803 desc=""><![CDATA[The White]]></Armature803>
@@ -917,11 +920,13 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature820 desc=""><![CDATA[Dream of Butterfly]]></Armature820>
     <Armature821 desc=""><![CDATA[Orange Imagination]]></Armature821>
     <Armature822 desc=""><![CDATA[Blue Imagination]]></Armature822>
+    <Armature823 desc=""><![CDATA[]]></Armature823>
     <Armature1001 desc=""><![CDATA[No Wings]]></Armature1001>
     <Armature1002 desc=""><![CDATA[Thin Wings]]></Armature1002>
     <Armature1003 desc=""><![CDATA[Elf Wings]]></Armature1003>
     <Armature1004 desc=""><![CDATA[Butterfly Elf]]></Armature1004>
     <Armature1005 desc=""><![CDATA[Dream of Butterfly]]></Armature1005>
+    <Armature1006 desc=""><![CDATA[]]></Armature1006>
     <DesignByKnife desc=""><![CDATA[Designed by player <{<color=blue>小刀</color>}>ID[1801104863982007122]]]></DesignByKnife>
   </DressRoom>
   <Tip>

Assets/Script/Label/CanvasLabel.cs

@@ -440,6 +440,15 @@ public class CanvasLabel
     public static string P_Reset = "P_Reset";
     public static string P_Save = "P_Save";
     public static string P_Return = "P_Return";
+    public static string P_Tutorial = "P_Tutorial";
+    public static string P_TutorialBg = "P_TutorialBg";
+    public static string P_CloseTipBtn = "P_CloseTipBtn";
+    public static string P_CloseTipBK = "P_CloseTipBK";
+    public static string P_CloseTip = "P_CloseTip";
+    public static string P_CreateTipBK = "P_CreateTipBK";
+    public static string P_CreateTip = "P_CreateTip";
+    public static string P_CloseArrow0 = "P_CloseArrow0";
+    public static string P_CloseArrow1 = "P_CloseArrow1";
     public static string P_SidePanel = "P_SidePanel";
     public static string P_Close = "P_Close";
     public static string P_Open = "P_Open";
@@ -480,17 +489,14 @@ public class CanvasLabel
     public static string Pf_ShoeTab = "Pf_ShoeTab";
     public static string Pf_ShoeGrid = "Pf_ShoeGrid";
     public static string P_CancelShare = "P_CancelShare";
-    public static string P_Tutorial = "P_Tutorial";
-    public static string P_TutorialBg = "P_TutorialBg";
-    public static string P_CloseTipBK = "P_CloseTipBK";
-    public static string P_CloseTip = "P_CloseTip";
-    public static string P_CreateTipBK = "P_CreateTipBK";
-    public static string P_CreateTip = "P_CreateTip";
-    public static string P_CloseArrow0 = "P_CloseArrow0";
-    public static string P_CloseArrow1 = "P_CloseArrow1";
     public static string Pi_FashionShowHomePanel = "Pi_FashionShowHomePanel";
     public static string Pi_FashionShowHomePanelPosition = "Pi_FashionShowHomePanelPosition";
     public static string Pi_FashionShowHomeSidePanel = "Pi_FashionShowHomeSidePanel";
+    public static string Pi_Tutorial = "Pi_Tutorial";
+    public static string Pi_TutorialBg = "Pi_TutorialBg";
+    public static string Pi_HomePageArrow0 = "Pi_HomePageArrow0";
+    public static string Pi_HomePageArrow1 = "Pi_HomePageArrow1";
+    public static string Pi_SidePanelBg = "Pi_SidePanelBg";
     public static string Pi_Ribbon = "Pi_Ribbon";
     public static string Pi_Return = "Pi_Return";
     public static string Pi_TabButtons = "Pi_TabButtons";
@@ -541,14 +547,11 @@ public class CanvasLabel
     public static string Pi_ShareArrow = "Pi_ShareArrow";
     public static string Pi_ShareBg = "Pi_ShareBg";
     public static string Pi_Share = "Pi_Share";
-    public static string Pi_Tutorial = "Pi_Tutorial";
-    public static string Pi_TutorialBg = "Pi_TutorialBg";
+    public static string Pi_HomePageTipBtn = "Pi_HomePageTipBtn";
     public static string Pi_HomePageTipBK = "Pi_HomePageTipBK";
     public static string Pi_HomePageTip = "Pi_HomePageTip";
     public static string Pi_LeaveTipBK = "Pi_LeaveTipBK";
     public static string Pi_LeaveTip = "Pi_LeaveTip";
-    public static string Pi_HomePageArrow0 = "Pi_HomePageArrow0";
-    public static string Pi_HomePageArrow1 = "Pi_HomePageArrow1";
     public static string Pg_FashionShowEditPanel = "Pg_FashionShowEditPanel";
     public static string Pg_FashionShowEditPanelPosition = "Pg_FashionShowEditPanelPosition";
     public static string Pg_Ribbon = "Pg_Ribbon";

Assets/Script/Manage/ConfigManager.cs

@@ -1456,6 +1456,13 @@ public class ConfigManager : Regist
             ToVersion25(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 26)
+        {
+            Debug.LogWarning("UpdateArchive to 26");
+
+            ToVersion26(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1841,4 +1848,16 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion26(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 26.ToString();
+
+        XmlNode xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FashionShowTutorial);
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
+        xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FashionShowTutorialIndex);
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/Initializer.cs

@@ -470,6 +470,14 @@ public class Initializer : MonoBehaviour
     private static float LoadingDelayTime = 3f;
     private static void ShowLoadingPanel()
     {
+        DelayCall.Call(1, () =>
+        {
+            Canvas canvas = ResourceManager.Get(CanvasLabel.U_Parent).AddComponent<Canvas>();
+            ResourceManager.Get(CanvasLabel.U_Parent).AddComponent<GraphicRaycaster>();
+            canvas.overrideSorting = true;
+            canvas.sortingOrder = 5;
+        });
+
         ResourceManager.Get(CanvasLabel.U_Group).TweenForCG();
         ResourceManager.Get<CanvasGroup>(CanvasLabel.C_Main).alpha = 0;
 

Assets/Script/Manage/TutorialManager.cs

@@ -1396,6 +1396,7 @@ public class TutorialManager : Regist
         StaticsManager.GetInstance().TutoComplete("EndHomePageDesc");
         ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, false);
         ResourceManager.SetActive(CanvasLabel.Pi_HomePageTipBK, false);
+        ResourceManager.SetActive(CanvasLabel.Pi_HomePageTipBtn, false);
 
         ClickMineTabButton();
     }
@@ -1403,9 +1404,15 @@ public class TutorialManager : Regist
     public static void EndClickMineTabButton()
     {
         StaticsManager.GetInstance().TutoComplete("EndClickMineTabButton");
+
         Tutorial.HightDisable();
         ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
 
+        ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, true);
+
+        ResourceManager.Get(CanvasLabel.Pi_Tutorial).SetAsLastSibling();
+        ResourceManager.Get(CanvasLabel.Pi_LeaveTipBK).SetAsLastSibling();
+
         DelayCall.Call(1, ShowLeaveDesc);
     }
 
@@ -1427,6 +1434,7 @@ public class TutorialManager : Regist
         StaticsManager.GetInstance().TutoComplete("EndCloseDesc");
         ResourceManager.SetActive(CanvasLabel.P_Tutorial, false);
         ResourceManager.SetActive(CanvasLabel.P_CloseTipBK, false);
+        ResourceManager.SetActive(CanvasLabel.P_CloseTipBtn, false);
         ClickShareButton();
     }
 
@@ -1536,6 +1544,7 @@ public class TutorialManager : Regist
     {
         ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, true);
         ResourceManager.SetActive(CanvasLabel.Pi_HomePageTipBK, true);
+        ResourceManager.SetActive(CanvasLabel.Pi_HomePageTipBtn, true);
         LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.Pi_HomePageTipBK));
 
         TweenRoot tween = ResourceManager.Get(CanvasLabel.Pi_FashionShowHomePanel).GetTweenVec();
@@ -1548,7 +1557,7 @@ public class TutorialManager : Regist
             ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().Pause();
             ResourceManager.Get(CanvasLabel.N_Mask).GetTweenGra().InOrigin = true;
 
-            ResourceManager.AddButtonEventOnetime(CanvasLabel.Pi_TutorialBg, EndHomePageDesc);
+            ResourceManager.AddButtonEventOnetime(CanvasLabel.Pi_HomePageTipBtn, EndHomePageDesc);
         });
     }
 
@@ -1572,7 +1581,6 @@ public class TutorialManager : Regist
 
     public static void ShowLeaveDesc()
     {
-        ResourceManager.SetActive(CanvasLabel.Pi_Tutorial, true);
         ResourceManager.SetActive(CanvasLabel.Pi_LeaveTipBK, true);
         LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.Pi_LeaveTipBK));
         //Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.P_Close), ResourceManager.Get(CanvasLabel.Pi_ShareBg));
@@ -1588,6 +1596,7 @@ public class TutorialManager : Regist
     public static void ShowCloseDesc()
     {
         ResourceManager.SetActive(CanvasLabel.P_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.P_CloseTipBtn, true);
         ResourceManager.SetActive(CanvasLabel.P_CloseTipBK, true);
 
         DelayCall.Call
@@ -1604,11 +1613,13 @@ public class TutorialManager : Regist
             }
         );
 
-        ResourceManager.AddButtonEventOnetime(CanvasLabel.P_TutorialBg, EndCloseDesc);
+        ResourceManager.AddButtonEventOnetime(CanvasLabel.P_CloseTipBtn, EndCloseDesc);
     }
 
     public static void ClickShareButton()
     {
+        ResourceManager.Get(CanvasLabel.P_Tutorial).SetAsLastSibling();
+
         ResourceManager.SetActive(CanvasLabel.P_Tutorial, true);
         ResourceManager.SetActive(CanvasLabel.P_CreateTipBK, true);
         DelayCall.Call(0.5f, () => LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.P_CreateTipBK)));

Assets/Script/Object/Player.cs

@@ -1722,11 +1722,20 @@ public class Player : Regist , IPointerClickHandler
 
         if (IsDisplayInUGUI)
         {
-            Debug.Log(0);
-
             uguiDisplays.MySort((display1, display0) =>
                     display1.transform.position.z < display0.transform.position.z);
 
+            //Debug.Log("resetDepth");
+
+            foreach (var display in uguiDisplays)
+            {
+                if (display.dbGraphic == null)
+                {
+                    continue;
+                }
+                display.dbGraphic.transform.SetParent(transform.parent);
+            }
+
             foreach (var display in uguiDisplays)
             {
                 //Debug.Log(display.dbGraphic.copyTrans.name);
@@ -1734,7 +1743,9 @@ public class Player : Regist , IPointerClickHandler
                 {
                     continue;
                 }
+                display.dbGraphic.transform.SetParent(UAC.transform);
                 display.dbGraphic.transform.SetAsLastSibling();
+                //Debug.Log(display.dbGraphic.copyTrans.name, display.dbGraphic.copyTrans);
             }
 
             //SetSlotAsFirstChild(TopSlot);

Assets/Script/Tool/Auxiliary.cs

@@ -156,7 +156,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            DebugManager.ResetGardenLevel(20);
+            DebugManager.ResetGardenLevel(100);
             //Manager.Coin = 0;
             //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
             //GardenManager.CreateElfTimer = 0;

Assets/Tookits/TextUtility/SpriteInfoManager.cs

@@ -21,7 +21,7 @@ namespace textUtility
 	        {
 	            if (spriteInfoDictionaryForEditor.Count == 0)
 	            {
-	                Instance.BuildTestEnviroment.Invoke();
+	                //Instance.BuildTestEnviroment.Invoke();
 	                if (spriteInfoDictionaryForEditor.Count == 0)
 	                {
 	                    throw new Exception("没有搭建起测试环境");
@@ -34,21 +34,21 @@ namespace textUtility
 	
 	    public static Dictionary<string, SpriteInfo> spriteInfoDictionaryForEditor = new Dictionary<string, SpriteInfo>();
 	
-	    private static SpriteInfoManager Instance
-	    {
-	        get
-	        {
-	            if (instance == null)
-	            {
-	#if UNITY_EDITOR
-	                instance = InstanceManager.SearchInstance<SpriteInfoManager>();
-	#endif
-	            }
-	            return instance;
-	        }
-	    }
+	//    private static SpriteInfoManager Instance
+	//    {
+	//        get
+	//        {
+	//            if (instance == null)
+	//            {
+	//#if UNITY_EDITOR
+	//                instance = InstanceManager.SearchInstance<SpriteInfoManager>();
+	//#endif
+	//            }
+	//            return instance;
+	//        }
+	//    }
 	
-	    private static SpriteInfoManager instance;
+	    //private static SpriteInfoManager instance;
 	
 	    public static Dictionary<string, SpriteInfo> SpriteInfoDictionary = new Dictionary<string, SpriteInfo>();