Browse Source

新加一套服装

liuqilin 7 years ago
parent
commit
70f7a6c18e
31 changed files with 1137 additions and 514 deletions
  1. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  2. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_0.json
  3. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_1.json
  4. BIN
      Assets/Resource/Animations/人物动画/stand_texture_0.png
  5. 164 256
      Assets/Resource/Animations/人物动画/stand_texture_0.png.meta
  6. BIN
      Assets/Resource/Animations/人物动画/stand_texture_1.png
  7. 395 174
      Assets/Resource/Animations/人物动画/stand_texture_1.png.meta
  8. 4 3
      Assets/Resource/Logo.unity
  9. 358 22
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  10. 8 0
      Assets/Resource/XML/Config/dressRoom_config.xml
  11. 1 1
      Assets/Resource/XML/PlayerConfig.xml
  12. 9 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  13. 9 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  14. 9 0
      Assets/Resource/XML/lan/English.xml
  15. BIN
      Assets/Resource/Xlsx/dressRoom_config.xlsx
  16. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  17. 3 1
      Assets/Script/AssetBundleUtility/AssetBundleGroup.cs
  18. 12 12
      Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab
  19. 5 0
      Assets/Script/Label/CanvasLabel.cs
  20. 20 0
      Assets/Script/Manage/ConfigManager.cs
  21. 2 0
      Assets/Script/Manage/Initializer.cs
  22. 72 0
      Assets/Script/Manage/LeftSidePanel.cs
  23. 13 0
      Assets/Script/Manage/LeftSidePanel.cs.meta
  24. 1 1
      Assets/Script/Manage/Manager.cs
  25. 1 1
      Assets/Script/Manage/MiniGameManager.cs
  26. 9 0
      Assets/Script/Manage/VisitManager.cs
  27. 33 33
      Assets/Script/Tool/Auxiliary.cs
  28. 5 5
      Assets/Script/Tool/Bundle.cs
  29. 0 1
      ProjectSettings/GraphicsSettings.asset
  30. 3 3
      ProjectSettings/ProjectSettings.asset
  31. 1 1
      ProjectSettings/UnityConnectSettings.asset

File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex_0.json


File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex_1.json


BIN
Assets/Resource/Animations/人物动画/stand_texture_0.png


File diff suppressed because it is too large
+ 164 - 256
Assets/Resource/Animations/人物动画/stand_texture_0.png.meta


BIN
Assets/Resource/Animations/人物动画/stand_texture_1.png


+ 395 - 174
Assets/Resource/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1524022564
+timeCreated: 1524744362
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -106,6 +106,17 @@ TextureImporter:
     21300198: "\u5934\u53D111(\u84DD)"
     21300200: "\u978B\u5B50-\u7F3A\u5931"
     21300202: "\u4E0B\u886314"
+    21300204: "\u978B\u5B5015-1_2"
+    21300206: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
+    21300208: "\u4E0A\u88638"
+    21300210: "\u53D1\u997017-2"
+    21300212: "\u5934\u53D117-1\u540E"
+    21300214: "\u5934\u53D117-1_1"
+    21300216: "\u8863\u670D17"
+    21300218: "\u978B\u5B5018"
+    21300220: "\u5934\u53D117-2"
+    21300222: "\u5934\u53D117-3\u540E"
+    21300224: "\u5934\u53D117-3"
   externalObjects: {}
   serializedVersion: 4
   mipmaps:
@@ -207,11 +218,25 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
+      name: "\u978B\u5B5015-2_1"
+      rect:
+        serializedVersion: 2
+        x: 3465
+        y: 2860
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u773C\u775B1"
       rect:
         serializedVersion: 2
-        x: 1095
-        y: 3389
+        x: 2850
+        y: 3106
         width: 264
         height: 95
       alignment: 0
@@ -224,8 +249,8 @@ TextureImporter:
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 1120
-        y: 3137
+        x: 1874
+        y: 3065
         width: 165
         height: 111
       alignment: 0
@@ -238,8 +263,22 @@ TextureImporter:
       name: 2
       rect:
         serializedVersion: 2
-        x: 138
-        y: 2853
+        x: 1182
+        y: 3426
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B501"
+      rect:
+        serializedVersion: 2
+        x: 1022
+        y: 2814
         width: 66
         height: 134
       alignment: 0
@@ -252,8 +291,8 @@ TextureImporter:
       name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 1287
-        y: 3137
+        x: 2222
+        y: 3169
         width: 165
         height: 111
       alignment: 0
@@ -266,8 +305,8 @@ TextureImporter:
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 1465
-        y: 3145
+        x: 3298
+        y: 2952
         width: 165
         height: 111
       alignment: 0
@@ -277,11 +316,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u773C\u775B2"
+      name: "\u773C\u775B3"
       rect:
         serializedVersion: 2
-        x: 3524
-        y: 3454
+        x: 2850
+        y: 3009
         width: 264
         height: 95
       alignment: 0
@@ -291,13 +330,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u773C\u775B3"
+      name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 3790
-        y: 3418
-        width: 264
-        height: 95
+        x: 3976
+        y: 2703
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -305,13 +344,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B502"
+      name: "\u88D9\u5B502"
       rect:
         serializedVersion: 2
-        x: 138
-        y: 2989
-        width: 66
-        height: 134
+        x: 2679
+        y: 3296
+        width: 212
+        height: 142
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -319,13 +358,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B503"
+      name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 328
-        y: 3201
-        width: 66
-        height: 134
+        x: 2
+        y: 3708
+        width: 444
+        height: 386
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -336,8 +375,8 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 1998
-        y: 3632
+        x: 3185
+        y: 3484
         width: 271
         height: 184
       alignment: 0
@@ -350,8 +389,8 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 2271
-        y: 3632
+        x: 3458
+        y: 3484
         width: 271
         height: 184
       alignment: 0
@@ -361,11 +400,25 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u8863\u670D11(\u7C89)"
+      rect:
+        serializedVersion: 2
+        x: 794
+        y: 3395
+        width: 386
+        height: 301
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 3551
-        y: 3897
+        x: 344
+        y: 2794
         width: 302
         height: 197
       alignment: 0
@@ -375,11 +428,25 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u8863\u670D11"
+      rect:
+        serializedVersion: 2
+        x: 2
+        y: 3007
+        width: 386
+        height: 301
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 3551
-        y: 3698
+        x: 3185
+        y: 3670
         width: 302
         height: 197
       alignment: 0
@@ -392,8 +459,8 @@ TextureImporter:
       name: "\u88D9\u5B504"
       rect:
         serializedVersion: 2
-        x: 3855
-        y: 3788
+        x: 2408
+        y: 3289
         width: 203
         height: 142
       alignment: 0
@@ -406,8 +473,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 3862
-        y: 3644
+        x: 3113
+        y: 3203
         width: 203
         height: 142
       alignment: 0
@@ -420,8 +487,8 @@ TextureImporter:
       name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 3013
-        y: 3861
+        x: 2595
+        y: 3583
         width: 287
         height: 233
       alignment: 0
@@ -434,8 +501,8 @@ TextureImporter:
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 2724
-        y: 3861
+        x: 2072
+        y: 3478
         width: 287
         height: 233
       alignment: 0
@@ -445,13 +512,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B508"
+      name: "\u88D9\u5B509"
       rect:
         serializedVersion: 2
-        x: 764
-        y: 3272
-        width: 329
-        height: 247
+        x: 2884
+        y: 3440
+        width: 259
+        height: 185
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -459,13 +526,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B509"
+      name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 3282
-        y: 3651
-        width: 259
-        height: 185
+        x: 2
+        y: 2729
+        width: 340
+        height: 276
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -473,11 +540,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5013"
+      name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 1656
-        y: 3606
+        x: 2595
+        y: 3818
         width: 340
         height: 276
       alignment: 0
@@ -487,13 +554,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5013(\u7D2B)"
+      name: 3
       rect:
         serializedVersion: 2
-        x: 2134
-        y: 3818
-        width: 340
-        height: 276
+        x: 4015
+        y: 3247
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -501,11 +568,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 8
+      name: 4
       rect:
         serializedVersion: 2
-        x: 1454
-        y: 3009
+        x: 648
+        y: 2721
         width: 66
         height: 134
       alignment: 0
@@ -515,11 +582,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 9
+      name: 5
       rect:
         serializedVersion: 2
-        x: 1522
-        y: 3009
+        x: 3976
+        y: 2567
         width: 66
         height: 134
       alignment: 0
@@ -529,11 +596,25 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 10
+      name: 6
       rect:
         serializedVersion: 2
-        x: 70
-        y: 2989
+        x: 3654
+        y: 2976
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: 7
+      rect:
+        serializedVersion: 2
+        x: 3722
+        y: 2976
         width: 66
         height: 134
       alignment: 0
@@ -546,8 +627,8 @@ TextureImporter:
       name: 11
       rect:
         serializedVersion: 2
-        x: 206
-        y: 2989
+        x: 3947
+        y: 3217
         width: 66
         height: 134
       alignment: 0
@@ -560,8 +641,8 @@ TextureImporter:
       name: 12
       rect:
         serializedVersion: 2
-        x: 396
-        y: 3057
+        x: 3997
+        y: 3383
         width: 66
         height: 134
       alignment: 0
@@ -574,8 +655,8 @@ TextureImporter:
       name: 13
       rect:
         serializedVersion: 2
-        x: 2
-        y: 2853
+        x: 1182
+        y: 3562
         width: 66
         height: 134
       alignment: 0
@@ -588,8 +669,8 @@ TextureImporter:
       name: "\u5934\u99704"
       rect:
         serializedVersion: 2
-        x: 764
-        y: 3521
+        x: 2937
+        y: 3904
         width: 440
         height: 190
       alignment: 0
@@ -602,8 +683,8 @@ TextureImporter:
       name: "\u5934\u99705"
       rect:
         serializedVersion: 2
-        x: 1206
-        y: 3486
+        x: 3379
+        y: 3869
         width: 363
         height: 225
       alignment: 0
@@ -616,8 +697,8 @@ TextureImporter:
       name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 1303
-        y: 3787
+        x: 390
+        y: 2993
         width: 351
         height: 307
       alignment: 0
@@ -630,8 +711,8 @@ TextureImporter:
       name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 411
-        y: 3411
+        x: 794
+        y: 3086
         width: 351
         height: 307
       alignment: 0
@@ -644,8 +725,8 @@ TextureImporter:
       name: "\u4E0A\u88635"
       rect:
         serializedVersion: 2
-        x: 2544
-        y: 3703
+        x: 3486
+        y: 2996
         width: 166
         height: 114
       alignment: 0
@@ -658,8 +739,8 @@ TextureImporter:
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 938
-        y: 3153
+        x: 3794
+        y: 3095
         width: 180
         height: 111
       alignment: 0
@@ -672,8 +753,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 1283
-        y: 3250
+        x: 3304
+        y: 3065
         width: 180
         height: 111
       alignment: 0
@@ -683,13 +764,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886311"
+      name: "\u4E0A\u88638"
       rect:
         serializedVersion: 2
-        x: 1361
-        y: 3363
-        width: 186
-        height: 121
+        x: 2408
+        y: 3174
+        width: 179
+        height: 113
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -697,13 +778,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886312"
+      name: "\u4E0A\u886310"
       rect:
         serializedVersion: 2
-        x: 1549
-        y: 3258
-        width: 180
-        height: 111
+        x: 1874
+        y: 3178
+        width: 179
+        height: 144
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -711,13 +792,27 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+      name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 2073
-        y: 3336
-        width: 179
-        height: 144
+        x: 3116
+        y: 3080
+        width: 186
+        height: 121
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u886312"
+      rect:
+        serializedVersion: 2
+        x: 2589
+        y: 3062
+        width: 180
+        height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -728,8 +823,8 @@ TextureImporter:
       name: "\u4E0A\u886311(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 1095
-        y: 3266
+        x: 2679
+        y: 3460
         width: 186
         height: 121
       alignment: 0
@@ -742,8 +837,8 @@ TextureImporter:
       name: "\u4E0A\u886313(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 3855
-        y: 3932
+        x: 1426
+        y: 2961
         width: 180
         height: 162
       alignment: 0
@@ -756,8 +851,8 @@ TextureImporter:
       name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 756
-        y: 3159
+        x: 3116
+        y: 2967
         width: 180
         height: 111
       alignment: 0
@@ -770,8 +865,8 @@ TextureImporter:
       name: "\u7FC5\u81801"
       rect:
         serializedVersion: 2
-        x: 1656
-        y: 3884
+        x: 1147
+        y: 3125
         width: 476
         height: 210
       alignment: 0
@@ -784,7 +879,7 @@ TextureImporter:
       name: "\u7CFB\u7EDF\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2
+        x: 1294
         y: 3337
         width: 407
         height: 381
@@ -798,7 +893,7 @@ TextureImporter:
       name: "\u94BB\u77F3\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 894
+        x: 2186
         y: 3713
         width: 407
         height: 381
@@ -812,8 +907,8 @@ TextureImporter:
       name: "\u60CA\u8BB6"
       rect:
         serializedVersion: 2
-        x: 1836
-        y: 3238
+        x: 2613
+        y: 3175
         width: 235
         height: 119
       alignment: 0
@@ -826,8 +921,8 @@ TextureImporter:
       name: "\u5F00\u5FC3"
       rect:
         serializedVersion: 2
-        x: 2269
-        y: 3495
+        x: 3145
+        y: 3347
         width: 270
         height: 135
       alignment: 0
@@ -840,8 +935,8 @@ TextureImporter:
       name: "\u671F\u5F85"
       rect:
         serializedVersion: 2
-        x: 1836
-        y: 3359
+        x: 3318
+        y: 3178
         width: 235
         height: 121
       alignment: 0
@@ -854,8 +949,8 @@ TextureImporter:
       name: "\u8272\u54AA\u54AA"
       rect:
         serializedVersion: 2
-        x: 3282
-        y: 3520
+        x: 3489
+        y: 3738
         width: 240
         height: 129
       alignment: 0
@@ -868,8 +963,8 @@ TextureImporter:
       name: "\u90C1\u95F7"
       rect:
         serializedVersion: 2
-        x: 1549
-        y: 3371
+        x: 3555
+        y: 3112
         width: 237
         height: 94
       alignment: 0
@@ -879,11 +974,25 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B5014-1"
+      rect:
+        serializedVersion: 2
+        x: 2771
+        y: 3039
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u978B\u5B5015-1"
       rect:
         serializedVersion: 2
-        x: 328
-        y: 3065
+        x: 648
+        y: 2857
         width: 66
         height: 134
       alignment: 0
@@ -896,8 +1005,8 @@ TextureImporter:
       name: "\u978B\u5B5015-2"
       rect:
         serializedVersion: 2
-        x: 274
-        y: 2929
+        x: 3976
+        y: 2975
         width: 66
         height: 134
       alignment: 0
@@ -910,8 +1019,8 @@ TextureImporter:
       name: "\u5934\u997015"
       rect:
         serializedVersion: 2
-        x: 1998
-        y: 3482
+        x: 2408
+        y: 3433
         width: 269
         height: 148
       alignment: 0
@@ -924,8 +1033,8 @@ TextureImporter:
       name: "\u4E0B\u886314b\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 2269
-        y: 3356
+        x: 3417
+        y: 3301
         width: 263
         height: 137
       alignment: 0
@@ -938,8 +1047,8 @@ TextureImporter:
       name: "\u4E0B\u886314b"
       rect:
         serializedVersion: 2
-        x: 2724
-        y: 3643
+        x: 1147
+        y: 2907
         width: 277
         height: 216
       alignment: 0
@@ -952,8 +1061,8 @@ TextureImporter:
       name: "\u4E0B\u886314c\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 1571
-        y: 3467
+        x: 3682
+        y: 3208
         width: 263
         height: 137
       alignment: 0
@@ -966,8 +1075,8 @@ TextureImporter:
       name: "\u4E0B\u886314c"
       rect:
         serializedVersion: 2
-        x: 3003
-        y: 3643
+        x: 743
+        y: 2848
         width: 277
         height: 216
       alignment: 0
@@ -977,11 +1086,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014a"
+      name: "\u978B\u5B5014b"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 2989
+        x: 3976
+        y: 2839
         width: 66
         height: 134
       alignment: 0
@@ -991,11 +1100,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014b"
+      name: "\u978B\u5B5014c"
       rect:
         serializedVersion: 2
-        x: 70
-        y: 2853
+        x: 3533
+        y: 2860
         width: 66
         height: 134
       alignment: 0
@@ -1008,8 +1117,8 @@ TextureImporter:
       name: "\u4E0B\u886314a"
       rect:
         serializedVersion: 2
-        x: 411
-        y: 3193
+        x: 3744
+        y: 3878
         width: 343
         height: 216
       alignment: 0
@@ -1019,13 +1128,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D111(\u68D5)\u540E"
+      name: "\u5934\u53D111(\u68D5)"
       rect:
         serializedVersion: 2
-        x: 2476
-        y: 3819
-        width: 246
-        height: 275
+        x: 1294
+        y: 3720
+        width: 444
+        height: 374
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1033,13 +1142,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D111(\u68D5)"
+      name: "\u5934\u53D111(\u84DD)\u540E"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3720
-        width: 444
-        height: 374
+        x: 2937
+        y: 3627
+        width: 246
+        height: 275
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1050,7 +1159,7 @@ TextureImporter:
       name: "\u5934\u53D111(\u84DD)"
       rect:
         serializedVersion: 2
-        x: 448
+        x: 1740
         y: 3720
         width: 444
         height: 374
@@ -1064,8 +1173,8 @@ TextureImporter:
       name: "\u7FC5\u81805"
       rect:
         serializedVersion: 2
-        x: 3543
-        y: 3551
+        x: 3731
+        y: 3519
         width: 317
         height: 145
       alignment: 0
@@ -1078,8 +1187,8 @@ TextureImporter:
       name: "\u5E3D\u5B5016"
       rect:
         serializedVersion: 2
-        x: 3302
-        y: 3838
+        x: 1625
+        y: 3066
         width: 247
         height: 256
       alignment: 0
@@ -1092,8 +1201,8 @@ TextureImporter:
       name: "\u88D9\u5B5016"
       rect:
         serializedVersion: 2
-        x: 2544
-        y: 3477
+        x: 3731
+        y: 3353
         width: 264
         height: 164
       alignment: 0
@@ -1106,8 +1215,8 @@ TextureImporter:
       name: "\u7FC5\u8180-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3125
+        x: 3744
+        y: 3666
         width: 324
         height: 210
       alignment: 0
@@ -1120,8 +1229,8 @@ TextureImporter:
       name: "\u4E0A\u8863-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 1632
-        y: 3137
+        x: 2055
+        y: 3169
         width: 165
         height: 111
       alignment: 0
@@ -1134,8 +1243,8 @@ TextureImporter:
       name: "\u978B\u5B50-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 1571
-        y: 3651
+        x: 4015
+        y: 3111
         width: 66
         height: 134
       alignment: 0
@@ -1148,8 +1257,8 @@ TextureImporter:
       name: "\u4E0B\u886314"
       rect:
         serializedVersion: 2
-        x: 3862
-        y: 3515
+        x: 2361
+        y: 3584
         width: 207
         height: 127
       alignment: 0
@@ -1158,6 +1267,118 @@ TextureImporter:
       outline: []
       physicsShape: []
       tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u53D1\u997017-2"
+      rect:
+        serializedVersion: 2
+        x: 2072
+        y: 3282
+        width: 334
+        height: 194
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u53D117-1\u540E"
+      rect:
+        serializedVersion: 2
+        x: 425
+        y: 3302
+        width: 367
+        height: 394
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u53D117-1_1"
+      rect:
+        serializedVersion: 2
+        x: 871
+        y: 3698
+        width: 421
+        height: 396
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8863\u670D17"
+      rect:
+        serializedVersion: 2
+        x: 2893
+        y: 3305
+        width: 218
+        height: 133
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B5018"
+      rect:
+        serializedVersion: 2
+        x: 1022
+        y: 2950
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u53D117-2"
+      rect:
+        serializedVersion: 2
+        x: 2
+        y: 3310
+        width: 421
+        height: 396
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u53D117-3\u540E"
+      rect:
+        serializedVersion: 2
+        x: 1703
+        y: 3324
+        width: 367
+        height: 394
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u53D117-3"
+      rect:
+        serializedVersion: 2
+        x: 448
+        y: 3698
+        width: 421
+        height: 396
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
     outline: []
     physicsShape: []
   spritePackingTag: 

+ 4 - 3
Assets/Resource/Logo.unity

@@ -654,9 +654,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 0
-  DebugMode: 0
-  CatchException: 1
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  CatchException: 0
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 358 - 22
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -2622,6 +2622,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1134644265372858
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224019142861309020}
+  - component: {fileID: 222840180260330102}
+  - component: {fileID: 114482707515660582}
+  - component: {fileID: 114523669974758350}
+  m_Layer: 5
+  m_Name: C_OpenSidePanelButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1135163695119966
 GameObject:
   m_ObjectHideFlags: 1
@@ -6644,6 +6662,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1342074751267646
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224458055422282144}
+  - component: {fileID: 222889325216228694}
+  - component: {fileID: 114219718047093426}
+  - component: {fileID: 114533385186565168}
+  m_Layer: 5
+  m_Name: C_CloseSidePanelButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1342527215314708
 GameObject:
   m_ObjectHideFlags: 1
@@ -10482,7 +10518,7 @@ GameObject:
   - component: {fileID: 114702051502693644}
   - component: {fileID: 114867032553136754}
   m_Layer: 5
-  m_Name: C_CloseSidePanelButton
+  m_Name: C_CloseLeftSidePanelButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -11251,6 +11287,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1565715321124612
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224293032258212104}
+  m_Layer: 5
+  m_Name: C_OpenCloseRightSidePanelButtons
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1567742903675772
 GameObject:
   m_ObjectHideFlags: 1
@@ -13127,6 +13178,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1690745255194432
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224536236374604756}
+  m_Layer: 5
+  m_Name: C_LeftSidePanelHidePos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1691045344358932
 GameObject:
   m_ObjectHideFlags: 1
@@ -15336,7 +15402,7 @@ GameObject:
   - component: {fileID: 114918750844086030}
   - component: {fileID: 114342735979280312}
   m_Layer: 5
-  m_Name: C_OpenSidePanelButton
+  m_Name: C_OpenLeftSidePanelButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -16908,7 +16974,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224995460938681758}
   m_Layer: 5
-  m_Name: C_OpenCloseRightSidePanelButtons
+  m_Name: C_OpenCloseLeftSidePanelButtons
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -17495,6 +17561,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1922549844026244
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224382916977960372}
+  - component: {fileID: 225095018124615640}
+  m_Layer: 5
+  m_Name: C_LeftSidePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1923635776990468
 GameObject:
   m_ObjectHideFlags: 1
@@ -28313,6 +28395,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6536\u53D6"
+--- !u!114 &114219718047093426
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1342074751267646}
+  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: fde368eda9204cb4bbc355f7a07c9ece, 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 &114220768213562136
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -38971,6 +39080,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114482707515660582
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1134644265372858}
+  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: fde368eda9204cb4bbc355f7a07c9ece, 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 &114483547486967446
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -40629,6 +40765,47 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114523669974758350
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1134644265372858}
+  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: 114482707515660582}
+  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 &114523843830010034
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -41153,6 +41330,47 @@ MonoBehaviour:
   - {x: 50.237133, y: -14.064116, z: 0}
   - {x: 35.345715, y: -14.064116, z: 0}
   - {x: 35.345715, y: 6.6184072, z: 0}
+--- !u!114 &114533385186565168
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1342074751267646}
+  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: 114219718047093426}
+  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 &114534053110171328
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -68162,6 +68380,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1528671969041708}
+--- !u!222 &222840180260330102
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1134644265372858}
 --- !u!222 &222840921915647440
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -68372,6 +68596,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1506250507696308}
+--- !u!222 &222889325216228694
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1342074751267646}
 --- !u!222 &222889518978475668
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -69408,6 +69638,24 @@ RectTransform:
   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 &224019142861309020
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1134644265372858}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -14.629944, y: 197.53964, z: 0}
+  m_LocalScale: {x: -1, y: -1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224293032258212104}
+  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}
+  m_AnchoredPosition: {x: -14.629944, y: 197.53964}
+  m_SizeDelta: {x: 54.9, y: 55.142}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224019492938172324
 RectTransform:
   m_ObjectHideFlags: 1
@@ -70291,7 +70539,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1533151170860654}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -14.629959, y: 197.5397, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224995460938681758}
@@ -70299,7 +70547,7 @@ 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: -14.629959, y: 197.5397}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 54.9, y: 55.142}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224054918525234698
@@ -73914,6 +74162,7 @@ RectTransform:
   - {fileID: 224873532853391380}
   - {fileID: 224481568594254954}
   - {fileID: 224274538382768356}
+  - {fileID: 224995460938681758}
   m_Father: {fileID: 224432493767108354}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -74121,8 +74370,7 @@ RectTransform:
   - {fileID: 224510655550494344}
   - {fileID: 224091659856119902}
   - {fileID: 224729527832615296}
-  - {fileID: 224432493767108354}
-  - {fileID: 224511404771622422}
+  - {fileID: 224382916977960372}
   m_Father: {fileID: 224902232319357440}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -75006,6 +75254,26 @@ RectTransform:
   m_AnchoredPosition: {x: 85.5, y: 0.0000015623}
   m_SizeDelta: {x: 21.4, y: 21.4}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224293032258212104
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1565715321124612}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.000015258789, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224458055422282144}
+  - {fileID: 224019142861309020}
+  m_Father: {fileID: 224729527832615296}
+  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_AnchoredPosition: {x: 0, y: -0.000015258789}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224293255102079490
 RectTransform:
   m_ObjectHideFlags: 1
@@ -76007,7 +76275,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1814702376654668}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -14.629944, y: 197.53964, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: -1, y: -1, z: 1}
   m_Children: []
   m_Father: {fileID: 224995460938681758}
@@ -76015,7 +76283,7 @@ 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: -14.629944, y: 197.53964}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 54.9, y: 55.142}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224336931507979612
@@ -76838,6 +77106,27 @@ RectTransform:
   m_AnchoredPosition: {x: 90.870056, y: -53.77}
   m_SizeDelta: {x: 85.6, y: 24.5}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224382916977960372
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1922549844026244}
+  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: 224536236374604756}
+  - {fileID: 224432493767108354}
+  - {fileID: 224511404771622422}
+  m_Father: {fileID: 224246329819966360}
+  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}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 800, y: 450.17993}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224382968998665408
 RectTransform:
   m_ObjectHideFlags: 1
@@ -77634,8 +77923,8 @@ RectTransform:
   - {fileID: 224301205963184192}
   - {fileID: 224233466821498018}
   - {fileID: 224146227275568310}
-  m_Father: {fileID: 224246329819966360}
-  m_RootOrder: 3
+  m_Father: {fileID: 224382916977960372}
+  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}
@@ -78294,6 +78583,24 @@ RectTransform:
   m_AnchoredPosition: {x: -132.9, y: -0.000009998679}
   m_SizeDelta: {x: 266, y: -0.000019997358}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224458055422282144
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1342074751267646}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -14.629959, y: 197.5397, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224293032258212104}
+  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_AnchoredPosition: {x: -14.629959, y: 197.5397}
+  m_SizeDelta: {x: 54.9, y: 55.142}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224458280017549116
 RectTransform:
   m_ObjectHideFlags: 1
@@ -79650,11 +79957,11 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1555391658121646}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 18.599976, y: 15.5, z: 0}
+  m_LocalPosition: {x: -381.40002, y: -209.58997, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224246329819966360}
-  m_RootOrder: 4
+  m_Father: {fileID: 224382916977960372}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -80214,6 +80521,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -6.1, y: -6.1}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224536236374604756
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1690745255194432}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -371.96005, y: 196.47612, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224382916977960372}
+  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_AnchoredPosition: {x: -371.96005, y: 196.47612}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224537139003440908
 RectTransform:
   m_ObjectHideFlags: 1
@@ -84637,7 +84962,7 @@ RectTransform:
   m_LocalPosition: {x: 237, y: -0.16073608, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224995460938681758}
+  - {fileID: 224293032258212104}
   - {fileID: 224372354546538860}
   m_Father: {fileID: 224246329819966360}
   m_RootOrder: 2
@@ -89906,19 +90231,19 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1886124172742740}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.000015258789, z: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
+  m_LocalPosition: {x: 230.73004, y: -155.90791, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224053763258463120}
   - {fileID: 224334953718115664}
-  m_Father: {fileID: 224729527832615296}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Father: {fileID: 224233466821498018}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -0.000015258789}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: 230.73004, y: -155.90791}
+  m_SizeDelta: {x: 51, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224995993620354378
 RectTransform:
@@ -90074,6 +90399,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225095018124615640
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1922549844026244}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225103059463273072
 CanvasGroup:
   m_ObjectHideFlags: 1

+ 8 - 0
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -41,6 +41,9 @@
   <item id="40" jump_frequency="" type="1" index="38" bodypart="1" level="70" buy_currency="2" buy_amt="200" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="95.34,-151.30" icon2offset="" spriteName="头发11(棕),头发11(棕)后" spriteAlpha="" armatureName="头发11(棕)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="-70,100" desc="" />
   <item id="41" jump_frequency="" type="1" index="39" bodypart="1" level="60" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="-40.1,-56.94" icon2offset="" spriteName="头发16,头发16后" spriteAlpha="" armatureName="头发16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="42" jump_frequency="" type="1" index="40" bodypart="1" level="1" buy_currency="1" buy_amt="0" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳-缺失" spriteAlpha="" armatureName="脑壳-缺失" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="43" jump_frequency="" type="1" index="41" bodypart="1" level="60" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="25,-15" icon2offset="" spriteName="头发17-1_1,头发17-1后" spriteAlpha="" armatureName="头发17-1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByMiracle" />
+  <item id="44" jump_frequency="" type="1" index="42" bodypart="1" level="60" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="25,-15" icon2offset="" spriteName="头发17-2,头发17-2后" spriteAlpha="" armatureName="头发17-2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByMiracle" />
+  <item id="45" jump_frequency="" type="1" index="43" bodypart="1" level="60" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="25,-15" icon2offset="" spriteName="头发17-3,头发17-3后" spriteAlpha="" armatureName="头发17-3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByMiracle" />
   <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="15" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <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="15" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <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="15" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
@@ -62,6 +65,7 @@
   <item id="419" jump_frequency="" type="6" index="18" bodypart="3" level="60" buy_currency="2" buy_amt="400" 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="60" buy_currency="2" buy_amt="400" 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="50" buy_currency="2" buy_amt="350" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="0" icon1offset="" icon2offset="" spriteName="新鞋子16" spriteAlpha="" armatureName="新鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="423" jump_frequency="" type="6" index="22" bodypart="3" level="50" buy_currency="2" buy_amt="350" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="-8" icon1offset="" icon2offset="" spriteName="鞋子18" spriteAlpha="" armatureName="鞋子18" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByMiracle" />
   <item id="422" jump_frequency="" type="6" index="21" bodypart="3" level="1" buy_currency="1" buy_amt="1" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子-缺失" spriteAlpha="" armatureName="鞋子-缺失" extraBodypart="" extraArmatureName="" ignore="1" 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="" />
@@ -87,6 +91,7 @@
   <item id="222" jump_frequency="" type="3" index="21" bodypart="2" level="70" buy_currency="2" buy_amt="2500" 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="60" buy_currency="2" buy_amt="2200" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子16" spriteAlpha="" armatureName="裙子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="224" jump_frequency="" type="3" index="23" bodypart="2" level="1" buy_currency="1" buy_amt="0" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子-缺失" spriteAlpha="" armatureName="裙子-缺失" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="225" jump_frequency="" type="3" index="24" bodypart="2" level="60" buy_currency="2" buy_amt="2500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子17" spriteAlpha="" armatureName="裙子17" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByMiracle" />
   <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="" />
@@ -104,6 +109,8 @@
   <item id="615" jump_frequency="" type="4" index="14" bodypart="4" level="80" buy_currency="2" buy_amt="500" 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="80" buy_currency="2" buy_amt="500" 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="618" jump_frequency="" type="4" index="16" bodypart="4" level="1" buy_currency="1" buy_amt="1" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰-缺失" spriteAlpha="" armatureName="头饰-缺失" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="619" jump_frequency="" type="4" index="17" bodypart="4" level="80" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="发饰17-1" spriteAlpha="" armatureName="发饰17-1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByMiracle" />
+  <item id="620" jump_frequency="" type="4" index="18" bodypart="4" level="80" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="发饰17-2" spriteAlpha="" armatureName="发饰17-2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByMiracle" />
   <item id="617" jump_frequency="" type="4" index="15" bodypart="4" level="60" buy_currency="2" buy_amt="500" 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="" />
@@ -129,6 +136,7 @@
   <item id="822" jump_frequency="" type="2" index="21" bodypart="5" level="70" buy_currency="2" buy_amt="800" 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="60" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-65,25" icon2offset="50,22" spriteName="上衣16,上衣16袖子2,上衣16袖子1_1" spriteAlpha="" armatureName="上衣16" extraBodypart="10,9" extraArmatureName="上衣16袖子2,上衣16袖子1" ignore="" icon0offset="" desc="" />
   <item id="824" jump_frequency="" type="2" index="23" bodypart="5" level="1" buy_currency="1" buy_amt="1" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣-缺失" spriteAlpha="" armatureName="上衣-缺失" extraBodypart="10,9" extraArmatureName="Empty,Empty" ignore="1" icon0offset="" desc="" />
+  <item id="825" jump_frequency="" type="2" index="24" bodypart="5" level="60" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="衣服17" spriteAlpha="" armatureName="衣服17" extraBodypart="10,9" extraArmatureName="袖子17-2,袖子17-1" ignore="" icon0offset="" desc="DesignByMiracle" />
   <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="" />

+ 1 - 1
Assets/Resource/XML/PlayerConfig.xml

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

+ 9 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -871,6 +871,9 @@
     <Armature40 desc=""><![CDATA[麻花辫(棕)]]></Armature40>
     <Armature41 desc=""><![CDATA[炽天使]]></Armature41>
     <Armature42 desc=""><![CDATA[缺失]]></Armature42>
+    <Armature43 desc=""><![CDATA[]]></Armature43>
+    <Armature44 desc=""><![CDATA[]]></Armature44>
+    <Armature45 desc=""><![CDATA[]]></Armature45>
     <Armature201 desc=""><![CDATA[蛋糕诱惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小纯真]]></Armature202>
     <Armature203 desc=""><![CDATA[清凉之夏]]></Armature203>
@@ -895,6 +898,7 @@
     <Armature222 desc=""><![CDATA[青意]]></Armature222>
     <Armature223 desc=""><![CDATA[炽天使]]></Armature223>
     <Armature224 desc=""><![CDATA[缺失]]></Armature224>
+    <Armature225 desc=""><![CDATA[]]></Armature225>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(蓝)]]></Armature403>
@@ -917,6 +921,7 @@
     <Armature420 desc=""><![CDATA[青意]]></Armature420>
     <Armature421 desc=""><![CDATA[炽天使]]></Armature421>
     <Armature422 desc=""><![CDATA[缺失]]></Armature422>
+    <Armature423 desc=""><![CDATA[]]></Armature423>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶结]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -935,6 +940,8 @@
     <Armature616 desc=""><![CDATA[蝶梦]]></Armature616>
     <Armature617 desc=""><![CDATA[纱帽]]></Armature617>
     <Armature618 desc=""><![CDATA[缺失]]></Armature618>
+    <Armature619 desc=""><![CDATA[]]></Armature619>
+    <Armature620 desc=""><![CDATA[]]></Armature620>
     <Armature801 desc=""><![CDATA[小鱼]]></Armature801>
     <Armature802 desc=""><![CDATA[可爱宝贝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -959,6 +966,7 @@
     <Armature822 desc=""><![CDATA[青意]]></Armature822>
     <Armature823 desc=""><![CDATA[炽天使]]></Armature823>
     <Armature824 desc=""><![CDATA[缺失]]></Armature824>
+    <Armature825 desc=""><![CDATA[]]></Armature825>
     <Armature1001 desc=""><![CDATA[无翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>
@@ -967,6 +975,7 @@
     <Armature1006 desc=""><![CDATA[炽天使之翼]]></Armature1006>
     <Armature1007 desc=""><![CDATA[缺失]]></Armature1007>
     <DesignByKnife desc=""><![CDATA[热心玩家<{<color=blue>小刀</color>}>设计ID[1801104863982007122]]]></DesignByKnife>
+    <DesignByMiracle desc=""><![CDATA[热心玩家<{<color=blue>奇迹</color>}>设计ID[1801064664406954478]]]></DesignByMiracle>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下,即使离线,花园也有收益哟~]]></Tip1>

+ 9 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -871,6 +871,9 @@
     <Armature40 desc=""><![CDATA[麻花辮(棕)]]></Armature40>
     <Armature41 desc=""><![CDATA[熾天使]]></Armature41>
     <Armature42 desc=""><![CDATA[]]></Armature42>
+    <Armature43 desc=""><![CDATA[]]></Armature43>
+    <Armature44 desc=""><![CDATA[]]></Armature44>
+    <Armature45 desc=""><![CDATA[]]></Armature45>
     <Armature201 desc=""><![CDATA[蛋糕誘惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小純真]]></Armature202>
     <Armature203 desc=""><![CDATA[清涼之夏]]></Armature203>
@@ -895,6 +898,7 @@
     <Armature222 desc=""><![CDATA[青意]]></Armature222>
     <Armature223 desc=""><![CDATA[熾天使]]></Armature223>
     <Armature224 desc=""><![CDATA[]]></Armature224>
+    <Armature225 desc=""><![CDATA[]]></Armature225>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(藍)]]></Armature403>
@@ -917,6 +921,7 @@
     <Armature420 desc=""><![CDATA[青意]]></Armature420>
     <Armature421 desc=""><![CDATA[熾天使]]></Armature421>
     <Armature422 desc=""><![CDATA[]]></Armature422>
+    <Armature423 desc=""><![CDATA[]]></Armature423>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶結]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -935,6 +940,8 @@
     <Armature616 desc=""><![CDATA[蝶夢]]></Armature616>
     <Armature617 desc=""><![CDATA[紗帽]]></Armature617>
     <Armature618 desc=""><![CDATA[]]></Armature618>
+    <Armature619 desc=""><![CDATA[]]></Armature619>
+    <Armature620 desc=""><![CDATA[]]></Armature620>
     <Armature801 desc=""><![CDATA[小魚]]></Armature801>
     <Armature802 desc=""><![CDATA[可愛寶貝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -959,6 +966,7 @@
     <Armature822 desc=""><![CDATA[青意]]></Armature822>
     <Armature823 desc=""><![CDATA[熾天使]]></Armature823>
     <Armature824 desc=""><![CDATA[]]></Armature824>
+    <Armature825 desc=""><![CDATA[]]></Armature825>
     <Armature1001 desc=""><![CDATA[無翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精靈之翼]]></Armature1003>
@@ -967,6 +975,7 @@
     <Armature1006 desc=""><![CDATA[熾天使之翼]]></Armature1006>
     <Armature1007 desc=""><![CDATA[]]></Armature1007>
     <DesignByKnife desc=""><![CDATA[熱心玩家<{<color=blue>小刀</color>}>設計ID[1801104863982007122]]]></DesignByKnife>
+    <DesignByMiracle desc=""><![CDATA[熱心玩家<{<color=blue>奇迹</color>}>設計ID[1801064664406954478]]]></DesignByMiracle>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下,即使離線,花園也有收益喲~]]></Tip1>

+ 9 - 0
Assets/Resource/XML/lan/English.xml

@@ -872,6 +872,9 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature40 desc=""><![CDATA[Twist(Brown)]]></Armature40>
     <Armature41 desc=""><![CDATA[Blazing Angel]]></Armature41>
     <Armature42 desc=""><![CDATA[]]></Armature42>
+    <Armature43 desc=""><![CDATA[]]></Armature43>
+    <Armature44 desc=""><![CDATA[]]></Armature44>
+    <Armature45 desc=""><![CDATA[]]></Armature45>
     <Armature201 desc=""><![CDATA[Cake]]></Armature201>
     <Armature202 desc=""><![CDATA[Innocence]]></Armature202>
     <Armature203 desc=""><![CDATA[Cool Summer]]></Armature203>
@@ -896,6 +899,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature222 desc=""><![CDATA[Blue Imagination]]></Armature222>
     <Armature223 desc=""><![CDATA[Blazing Angel]]></Armature223>
     <Armature224 desc=""><![CDATA[]]></Armature224>
+    <Armature225 desc=""><![CDATA[]]></Armature225>
     <Armature401 desc=""><![CDATA[Leather Shoes]]></Armature401>
     <Armature402 desc=""><![CDATA[Boots(Black)]]></Armature402>
     <Armature403 desc=""><![CDATA[Boots(Blue)]]></Armature403>
@@ -918,6 +922,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature420 desc=""><![CDATA[Blue Imagination]]></Armature420>
     <Armature421 desc=""><![CDATA[Blazing Angel]]></Armature421>
     <Armature422 desc=""><![CDATA[]]></Armature422>
+    <Armature423 desc=""><![CDATA[]]></Armature423>
     <Armature601 desc=""><![CDATA[Big Bowknot]]></Armature601>
     <Armature602 desc=""><![CDATA[Pink Flower]]></Armature602>
     <Armature603 desc=""><![CDATA[Rabbit]]></Armature603>
@@ -936,6 +941,8 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature616 desc=""><![CDATA[Dream of Butterfly]]></Armature616>
     <Armature617 desc=""><![CDATA[Yarn cap]]></Armature617>
     <Armature618 desc=""><![CDATA[]]></Armature618>
+    <Armature619 desc=""><![CDATA[]]></Armature619>
+    <Armature620 desc=""><![CDATA[]]></Armature620>
     <Armature801 desc=""><![CDATA[Fish]]></Armature801>
     <Armature802 desc=""><![CDATA[Lovely Baby]]></Armature802>
     <Armature803 desc=""><![CDATA[The White]]></Armature803>
@@ -960,6 +967,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature822 desc=""><![CDATA[Blue Imagination]]></Armature822>
     <Armature823 desc=""><![CDATA[Blazing Angel]]></Armature823>
     <Armature824 desc=""><![CDATA[]]></Armature824>
+    <Armature825 desc=""><![CDATA[]]></Armature825>
     <Armature1001 desc=""><![CDATA[No Wings]]></Armature1001>
     <Armature1002 desc=""><![CDATA[Thin Wings]]></Armature1002>
     <Armature1003 desc=""><![CDATA[Elf Wings]]></Armature1003>
@@ -968,6 +976,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature1006 desc=""><![CDATA[Wing of Blazing Angel]]></Armature1006>
     <Armature1007 desc=""><![CDATA[]]></Armature1007>
     <DesignByKnife desc=""><![CDATA[Designed by player <{<color=blue>小刀</color>}>ID[1801104863982007122]]]></DesignByKnife>
+    <DesignByMiracle desc=""><![CDATA[Designed by player <{<color=blue>奇迹</color>}>ID[1801064664406954478]]]></DesignByMiracle>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[The visitors will come to pay the tickest for your garden even if your are offline!]]></Tip1>

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 3 - 1
Assets/Script/AssetBundleUtility/AssetBundleGroup.cs

@@ -28,8 +28,10 @@ namespace assetBundleUtility
 	
 	    public void CreateMD5FileAndMD5DictionaryFile()
 	    {
+	        string MD5FileName = this.MD5FileName.Replace("#VERSION", Bundle.version);
+            string MD5DictionaryFileName = this.MD5DictionaryFileName.Replace("#VERSION", Bundle.version);
 	        string md5FilePath = CheckOutputPath(OutputPath, MD5FileName);
-	        string md5DictionaryFilePath = CheckOutputPath(OutputPath, MD5DictionaryFileName);
+            string md5DictionaryFilePath = CheckOutputPath(OutputPath, MD5DictionaryFileName);
 	
 	        List<AssetBundleSet> assetBundleSets = new List<AssetBundleSet>();
 	        for (int i = 0; i < AssetBundleSets.Count; i++)

+ 12 - 12
Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -52,17 +52,17 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AssetBundleGroups:
-  - MD5FileName: AndroidMD51_3_1.txt
-    MD5DictionaryFileName: AndroidMD5Dictionary1_3_1.txt
+  - MD5FileName: AndroidMD5#VERSION.txt
+    MD5DictionaryFileName: AndroidMD5Dictionary#VERSION.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: d40906ea5bb958244896cd19338ee6c5, type: 3}
+    - Object: {fileID: 102900000, guid: 04a7f1bd57fb5ca418ced2344883fc52, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: c16cb5c126353b04facb75b638746bcd, type: 3}
+    - Object: {fileID: 102900000, guid: 87e6a9d80ecd6a346a04c51b88667aab, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 8e1c9c8a34bf0604cb7c118a07439af4, type: 3}
+    - Object: {fileID: 102900000, guid: 4705785e6e314f0479e474830132724c, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 24e4f8d41f741764e9c8d72a15dcbbae, type: 3}
+    - Object: {fileID: 102900000, guid: 6220b0c1709c5dd48bf622263434363a, type: 3}
       URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt
@@ -76,15 +76,15 @@ MonoBehaviour:
       URL: null
     - Object: {fileID: 102900000, guid: 2322ebf659ac53340bfdc21c831c6f31, type: 3}
       URL: null
-  - MD5FileName: WindowsMD51_3_1.txt
-    MD5DictionaryFileName: WindowsMD5Dictionary1_3_1.txt
+  - MD5FileName: WindowsMD51_3_2.txt
+    MD5DictionaryFileName: WindowsMD5Dictionary1_3_2.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 470d0de5897adeb489b0ce8fec6663f9, type: 3}
+    - Object: {fileID: 102900000, guid: 2f17c5920d57b8d489896683f7c5c072, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 2a0ee40efadc3a749a90bd2c2f33b40b, type: 3}
+    - Object: {fileID: 102900000, guid: 858117daae6c5a1438728fe558f31270, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 23c77a155c1c00949a30fbcc5dc5a92a, type: 3}
+    - Object: {fileID: 102900000, guid: ac87496114f78414f95aa73a332d896b, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: ecb11dda1c1174e4bb6944fe130f31a4, type: 3}
+    - Object: {fileID: 102900000, guid: 29a4af5c2399bb64ea7f0b746b1beb9a, type: 3}
       URL: null

+ 5 - 0
Assets/Script/Label/CanvasLabel.cs

@@ -90,6 +90,8 @@ public class CanvasLabel
     public static string C_IncomeLab = "C_IncomeLab";
     public static string C_Garden = "C_Garden";
     public static string C_GardenLab = "C_GardenLab";
+    public static string C_LeftSidePanel = "C_LeftSidePanel";
+    public static string C_LeftSidePanelHidePos = "C_LeftSidePanelHidePos";
     public static string C_Group3 = "C_Group3";
     public static string C_NicknameParent = "C_NicknameParent";
     public static string C_NickNameBK = "C_NickNameBK";
@@ -107,6 +109,9 @@ public class CanvasLabel
     public static string C_NewMessageFlagText = "C_NewMessageFlagText";
     public static string C_RankRarent = "C_RankRarent";
     public static string C_Rank = "C_Rank";
+    public static string C_OpenCloseLeftSidePanelButtons = "C_OpenCloseLeftSidePanelButtons";
+    public static string C_CloseLeftSidePanelButton = "C_CloseLeftSidePanelButton";
+    public static string C_OpenLeftSidePanelButton = "C_OpenLeftSidePanelButton";
     public static string C_Info = "C_Info";
     public static string C_WifiButton = "C_WifiButton";
     public static string L_Setting = "L_Setting";

+ 20 - 0
Assets/Script/Manage/ConfigManager.cs

@@ -1533,6 +1533,13 @@ public class ConfigManager : Regist
             ToVersion35(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 36)
+        {
+            Debug.LogWarning("UpdateArchive to 36");
+
+            ToVersion36(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -2042,4 +2049,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion36(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 36.ToString();
+
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

+ 2 - 0
Assets/Script/Manage/Initializer.cs

@@ -376,6 +376,8 @@ public class Initializer : MonoBehaviour
             ResourceManager.Get(CanvasLabel.C_Notify).TweenForCG();
         }
 
+        LeftSidePanel.Init();
+
         DebugText.text = "Error code : 7-1";
         PlayerManager.InitDressRoom();
 

+ 72 - 0
Assets/Script/Manage/LeftSidePanel.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class LeftSidePanel
+{
+    public static bool isOpen = true;
+
+    public static RectTransform panel;
+    public static Button openButton;
+    public static Button closeButton;
+
+    private static Vector3 originPos;
+    private static Vector3 targetPos;
+
+    public static void Init()
+    {
+        openButton = ResourceManager.Get<Button>(CanvasLabel.C_OpenLeftSidePanelButton);
+        closeButton = ResourceManager.Get<Button>(CanvasLabel.C_CloseLeftSidePanelButton);
+        panel = ResourceManager.Get<RectTransform>(CanvasLabel.C_LeftSidePanel);
+
+        openButton.onClick.AddListener(Show);
+        closeButton.onClick.AddListener(Hide);
+
+        targetPos = ResourceManager.Get(CanvasLabel.C_LeftSidePanelHidePos).position;
+    }
+
+    public static void Show()
+    {
+        isOpen = true;
+        openButton.SetActive(false);
+        closeButton.SetActive(true);
+        Vector3 offset = originPos - closeButton.transform.position;
+        offset.y = 0;
+        panel.CreateTweenVecOffset2D(offset, 0.25f, false, true, true, Curve.EaseOutQuad, true);
+        panel.TweenForVec();
+    }
+
+    public static void Hide()
+    {
+        isOpen = false;
+        openButton.SetActive(true);
+        closeButton.SetActive(false);
+        originPos = openButton.transform.position;
+        Vector3 offset = targetPos - openButton.transform.position;
+        offset.y = 0;
+        panel.CreateTweenVecOffset2D(offset, 0.25f, false, true, true, Curve.EaseOutQuad, true);
+        panel.TweenForVec();
+    }
+
+    public static void Refresh()
+    {
+        LayoutRebuilder.ForceRebuildLayoutImmediate(ResourceManager.Get<RectTransform>(CanvasLabel.C_SocialGroup));
+    }
+
+    //public static void SetToShow()
+    //{
+    //    panel.GetTweenVec().InDestination = true;
+    //    openButton.SetActive(false);
+    //    closeButton.SetActive(true);
+    //}
+
+    //public static void SetToHide()
+    //{
+    //    panel.GetTweenVec().InOrigin = true;
+    //    openButton.SetActive(true);
+    //    closeButton.SetActive(false);
+    //}
+}

+ 13 - 0
Assets/Script/Manage/LeftSidePanel.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 25f643a9b6042f643970506d073e51d4
+timeCreated: 1524537287
+licenseType: Pro
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Script/Manage/Manager.cs

@@ -673,7 +673,7 @@ public class Manager : Regist
     public static double OfflineMaxTime;
     public static double OfflineMinTime = 120;
 
-    public static float InputDetectTime = 60f;
+    public static float InputDetectTime = 45;
     public static float InputDetectTimer;
 
     public static float LoginTime = 10f;

+ 1 - 1
Assets/Script/Manage/MiniGameManager.cs

@@ -2299,7 +2299,7 @@ public class MiniGameManager : Regist
 
         ResourceManager.GetHudText(string.Format("+{0}", FindMissingCorrectScore), Color.white, 90, FindMissingCorrectFlower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
-        Score += FindSoloCorrectScore;
+        Score += FindMissingCorrectScore;
 
         FindMissingCorrectFlower.PlayFlashLight();
         FindMissingCorrectFlower.FlowerIcon.TweenBacSr();

+ 9 - 0
Assets/Script/Manage/VisitManager.cs

@@ -209,11 +209,20 @@ public class VisitManager : Regist
         {
             ResourceManager.SetActive(CanvasLabel.C_OpenCloseRightSidePanelButtons, false);
             ResourceManager.Get<Button>(CanvasLabel.C_OpenSidePanelButton).onClick.Invoke();
+
+            if (LeftSidePanel.isOpen == false)
+            {
+                ResourceManager.Get<Button>(CanvasLabel.C_OpenLeftSidePanelButton).onClick.Invoke();
+            }
+            ResourceManager.SetActive(CanvasLabel.C_OpenCloseLeftSidePanelButtons, false);
         };
 
         OnExitVisteeGarden += () =>
         {
             ResourceManager.SetActive(CanvasLabel.C_OpenCloseRightSidePanelButtons, true);
+
+            ResourceManager.SetActive(CanvasLabel.C_OpenCloseLeftSidePanelButtons, true);
+            LeftSidePanel.Refresh();
         };
 
         Inited = true;

+ 33 - 33
Assets/Script/Tool/Auxiliary.cs

@@ -155,39 +155,39 @@ public class Auxiliary : Regist
         //    RobotManager.DeactivateAllRobots(false);
         //}
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            //DebugManager.ResetGardenLevel(100);
-            //Manager.Coin = 0;
-            //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
-            //GardenManager.CreateElfTimer = 0;
-            //DebugManager.ResetGardenLevel(50);
-            //foreach (var skill in Manager.UsingSkillList)
-            //{
-            //    skill.UseTimer = 0;
-            //}
-            //foreach (var skill in Manager.CoolSkillList)
-            //{
-            //    skill.CoolTimer = 0;
-            //}
-            //HttpManager.GetTargetConfig
-            //(
-            //    "1801134288353834791",
-            //    data =>
-            //    {
-            //        VisitManager.VisiteeSerialNumber = "1801134288353834791";
-            //        VisitManager.SavePulledConfig(data);
-            //    }
-            //);
-            PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
-            //Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-            //Debug.Log(screenPosition);
-            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-            //DebugManager.ResetMemoryGameTutorial();
-            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    DebugManager.ResetGardenLevel(100);
+        //    Manager.Coin = 0;
+        //    Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
+        //    GardenManager.CreateElfTimer = 0;
+        //    DebugManager.ResetGardenLevel(50);
+        //    foreach (var skill in Manager.UsingSkillList)
+        //    {
+        //        skill.UseTimer = 0;
+        //    }
+        //    foreach (var skill in Manager.CoolSkillList)
+        //    {
+        //        skill.CoolTimer = 0;
+        //    }
+        //    HttpManager.GetTargetConfig
+        //    (
+        //        "1801134288353834791",
+        //        data =>
+        //        {
+        //            VisitManager.VisiteeSerialNumber = "1801134288353834791";
+        //            VisitManager.SavePulledConfig(data);
+        //        }
+        //    );
+        //    PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+        //    Debug.Log(screenPosition);
+        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+        //    DebugManager.ResetMemoryGameTutorial();
+        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        //}
 
         //if (Input.GetKeyDown(KeyCode.A))
         //{

+ 5 - 5
Assets/Script/Tool/Bundle.cs

@@ -20,7 +20,7 @@ public class Bundle : MonoBehaviour
 {
     #region
 
-    public static string version = "1_3_1";
+    public static string version = "1_3_2";
 
     public static bool CopyComplete
     {
@@ -829,10 +829,10 @@ public class Bundle : MonoBehaviour
                 needUpdate = localMD5 != HttpManager.Md5;
                 //Debug.LogWarning(string.Format("NeedUpdate : {0}", needUpdate));
             }
-            if (Application.isEditor || Application.isMobilePlatform)
-            {
-                needUpdate = false;
-            }
+            //if (Application.isEditor || Application.isMobilePlatform)
+            //{
+            //    needUpdate = false;
+            //}
             AssetBundleUtility.OnDownloadOrUpdateFinish += FinishDownloadAndLoad;
             if (needUpdate)
             {

+ 0 - 1
ProjectSettings/GraphicsSettings.asset

@@ -39,7 +39,6 @@ GraphicsSettings:
   - {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
   - {fileID: 4800000, guid: e73e8e8cfe7b2344abcbf572918e22a1, type: 3}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -125,7 +125,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.3.1
+  bundleVersion: 1.3.2
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -156,8 +156,8 @@ PlayerSettings:
     iOS: com.dashgame.garden
     tvOS: com.dashgame.garden
   buildNumber:
-    iOS: 17
-  AndroidBundleVersionCode: 25
+    iOS: 18
+  AndroidBundleVersionCode: 26
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1

+ 1 - 1
ProjectSettings/UnityConnectSettings.asset

@@ -31,6 +31,6 @@ UnityConnectSettings:
     m_GameIds:
       AndroidPlayer: 1408493
       iPhonePlayer: 1408492
-    m_GameId: 1408493
+    m_GameId: 
   PerformanceReportingSettings:
     m_Enabled: 0

Some files were not shown because too many files changed in this diff