Browse Source

替换鞋子资源

liuqilin 7 years ago
parent
commit
9a908eedb7
27 changed files with 424 additions and 259 deletions
  1. 25 0
      Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta
  2. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  3. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_0.json
  4. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_1.json
  5. BIN
      Assets/Resource/Animations/人物动画/stand_texture_0.png
  6. 173 164
      Assets/Resource/Animations/人物动画/stand_texture_0.png.meta
  7. BIN
      Assets/Resource/Animations/人物动画/stand_texture_1.png
  8. 93 47
      Assets/Resource/Animations/人物动画/stand_texture_1.png.meta
  9. 4 0
      Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityUGUIDisplay.cs
  10. 5 4
      Assets/Resource/Logo.unity
  11. 3 3
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  12. 5 5
      Assets/Resource/Prefab/PrefabUI/FashionShowCloseBox.prefab
  13. BIN
      Assets/Resource/Sprite/Editor/SpriteUI/我的搭配秀按钮 1.png
  14. 68 0
      Assets/Resource/Sprite/Editor/SpriteUI/我的搭配秀按钮 1.png.meta
  15. 0 0
      Assets/Resource/Sprite/Mobile/Garden/Flower36.png
  16. 0 0
      Assets/Resource/Sprite/Mobile/Garden/Flower36.png.meta
  17. 1 1
      Assets/Script/Editor/EditorBundle.cs
  18. 1 1
      Assets/Script/Label/ResourceLabel.cs
  19. 1 0
      Assets/Script/Manage/AudioManager.cs
  20. 2 0
      Assets/Script/Manage/VisitManager.cs
  21. 14 6
      Assets/Script/Object/Player.cs
  22. 4 3
      Assets/Script/Social/FashionShowCloseBox.cs
  23. 8 7
      Assets/Script/Social/FashionShowEditPage.cs
  24. 1 1
      Assets/Script/Social/FashionShowHomePage.cs
  25. 10 7
      Assets/Script/Tool/Bundle.cs
  26. 3 3
      ProjectSettings/GraphicsSettings.asset
  27. 3 7
      第五期.txt

+ 25 - 0
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: 

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


+ 173 - 164
Assets/Resource/Animations/人物动画/stand_texture_0.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c486bd2e1e577b24a86013546709abda
-timeCreated: 1522830441
+timeCreated: 1523002742
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -167,6 +167,20 @@ TextureImporter:
     21300320: "\u5934\u997013-1"
     21300322: "\u4E0A\u886314a"
     21300324: "\u5934\u53D110(\u68D5)"
+    21300326: "\u978B\u5B5015-2_1"
+    21300328: "\u4E0A\u88631"
+    21300330: "\u4E0A\u88632"
+    21300332: "\u4E0A\u88633"
+    21300334: "\u8863\u670D11"
+    21300336: "\u88D9\u5B5013(\u7D2B)"
+    21300338: 12
+    21300340: 13
+    21300342: "\u5934\u99704"
+    21300344: "\u5934\u99705"
+    21300346: "\u5934\u99709"
+    21300348: "\u5934\u997010"
+    21300350: "\u4E0A\u88637"
+    21300352: "\u4E0B\u886314b\u8774\u8776\u7ED3"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -190,7 +204,7 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -1
     wrapMode: 1
@@ -205,7 +219,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 8
   textureShape: 1
@@ -245,6 +259,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -266,7 +288,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 4035
-        y: 145
+        y: 272
         width: 57
         height: 56
       alignment: 0
@@ -279,7 +301,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 480
-        y: 176
+        y: 569
         width: 646
         height: 391
       alignment: 0
@@ -343,8 +365,8 @@ TextureImporter:
       name: "\u978B\u5B5015-1_2"
       rect:
         serializedVersion: 2
-        x: 1377
-        y: 2903
+        x: 480
+        y: 1313
         width: 66
         height: 134
       alignment: 0
@@ -353,26 +375,26 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5634\u5DF41"
+      name: "\u978B\u5B5015-2_1"
       rect:
         serializedVersion: 2
-        x: 779
-        y: 3040
-        width: 56
-        height: 35
+        x: 480
+        y: 1449
+        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: "\u773C\u775B1"
+      name: "\u5634\u5DF41"
       rect:
         serializedVersion: 2
-        x: 3110
-        y: 2
-        width: 264
-        height: 95
+        x: 4038
+        y: 1570
+        width: 56
+        height: 35
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -392,6 +414,19 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u773C\u775B1"
+      rect:
+        serializedVersion: 2
+        x: 3376
+        y: 2
+        width: 264
+        height: 95
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u5934\u9970\u54C11"
       rect:
         serializedVersion: 2
@@ -408,8 +443,8 @@ TextureImporter:
       name: "\u4E0A\u88631\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 779
-        y: 3077
+        x: 4025
+        y: 1207
         width: 60
         height: 59
       alignment: 0
@@ -418,10 +453,10 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B501"
+      name: 2
       rect:
         serializedVersion: 2
-        x: 1377
+        x: 1445
         y: 2767
         width: 66
         height: 134
@@ -434,8 +469,8 @@ TextureImporter:
       name: "\u773C\u775B2"
       rect:
         serializedVersion: 2
-        x: 3376
-        y: 2
+        x: 2677
+        y: 825
         width: 264
         height: 95
       alignment: 0
@@ -447,8 +482,8 @@ TextureImporter:
       name: "\u773C\u775B3"
       rect:
         serializedVersion: 2
-        x: 2677
-        y: 825
+        x: 3110
+        y: 2
         width: 264
         height: 95
       alignment: 0
@@ -461,7 +496,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1128
-        y: 458
+        y: 32
         width: 548
         height: 424
       alignment: 0
@@ -499,8 +534,8 @@ TextureImporter:
       name: "\u5634\u5DF43"
       rect:
         serializedVersion: 2
-        x: 4035
-        y: 108
+        x: 779
+        y: 3040
         width: 56
         height: 35
       alignment: 0
@@ -512,8 +547,8 @@ TextureImporter:
       name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 1041
+        x: 4019
+        y: 839
         width: 66
         height: 134
       alignment: 0
@@ -525,8 +560,8 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 4005
-        y: 388
+        x: 1377
+        y: 2903
         width: 66
         height: 134
       alignment: 0
@@ -577,8 +612,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2373
-        y: 3437
+        x: 1530
+        y: 2190
         width: 572
         height: 657
       alignment: 0
@@ -590,8 +625,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1530
-        y: 2190
+        x: 2373
+        y: 3437
         width: 572
         height: 657
       alignment: 0
@@ -617,7 +652,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2
-        y: 2365
+        y: 1857
         width: 610
         height: 506
       alignment: 0
@@ -643,7 +678,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2
-        y: 1857
+        y: 2365
         width: 610
         height: 506
       alignment: 0
@@ -655,8 +690,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 3658
-        y: 2552
+        x: 1364
+        y: 1418
         width: 382
         height: 770
       alignment: 0
@@ -669,7 +704,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3386
-        y: 2102
+        y: 752
         width: 449
         height: 448
       alignment: 0
@@ -681,8 +716,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 1364
-        y: 1418
+        x: 2104
+        y: 2163
         width: 382
         height: 770
       alignment: 0
@@ -695,7 +730,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3386
-        y: 1202
+        y: 2102
         width: 449
         height: 448
       alignment: 0
@@ -708,7 +743,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3658
-        y: 3324
+        y: 2552
         width: 382
         height: 770
       alignment: 0
@@ -721,7 +756,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3386
-        y: 752
+        y: 1652
         width: 449
         height: 448
       alignment: 0
@@ -733,8 +768,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 2104
-        y: 2163
+        x: 3658
+        y: 3324
         width: 382
         height: 770
       alignment: 0
@@ -747,7 +782,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3386
-        y: 1652
+        y: 1202
         width: 449
         height: 448
       alignment: 0
@@ -812,7 +847,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2947
-        y: 3594
+        y: 3092
         width: 709
         height: 500
       alignment: 0
@@ -825,7 +860,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2947
-        y: 3092
+        y: 3594
         width: 709
         height: 500
       alignment: 0
@@ -850,8 +885,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u68D5\u8272)"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 569
+        x: 1748
+        y: 1770
         width: 646
         height: 391
       alignment: 0
@@ -863,8 +898,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 1748
-        y: 1770
+        x: 480
+        y: 176
         width: 646
         height: 391
       alignment: 0
@@ -877,7 +912,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1128
-        y: 32
+        y: 458
         width: 548
         height: 424
       alignment: 0
@@ -903,7 +938,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 614
-        y: 1496
+        y: 962
         width: 476
         height: 532
       alignment: 0
@@ -915,8 +950,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 789
+        x: 614
+        y: 1496
         width: 476
         height: 532
       alignment: 0
@@ -928,8 +963,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 1364
-        y: 884
+        x: 2
+        y: 789
         width: 476
         height: 532
       alignment: 0
@@ -941,8 +976,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 614
-        y: 962
+        x: 2
+        y: 1323
         width: 476
         height: 532
       alignment: 0
@@ -954,8 +989,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2664
-        y: 48
+        x: 2677
+        y: 922
         width: 444
         height: 386
       alignment: 0
@@ -967,8 +1002,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 1323
+        x: 1364
+        y: 884
         width: 476
         height: 532
       alignment: 0
@@ -980,8 +1015,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2677
-        y: 922
+        x: 2664
+        y: 436
         width: 444
         height: 386
       alignment: 0
@@ -994,7 +1029,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2664
-        y: 436
+        y: 48
         width: 444
         height: 386
       alignment: 0
@@ -1029,7 +1064,7 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8863\u670D11(\u7C89)"
+      name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
         x: 2228
@@ -1110,8 +1145,8 @@ TextureImporter:
       name: 3
       rect:
         serializedVersion: 2
-        x: 3937
-        y: 388
+        x: 1445
+        y: 2631
         width: 66
         height: 134
       alignment: 0
@@ -1123,8 +1158,8 @@ TextureImporter:
       name: 4
       rect:
         serializedVersion: 2
-        x: 4019
-        y: 839
+        x: 480
+        y: 1721
         width: 66
         height: 134
       alignment: 0
@@ -1136,8 +1171,8 @@ TextureImporter:
       name: 5
       rect:
         serializedVersion: 2
-        x: 1445
-        y: 2903
+        x: 480
+        y: 1585
         width: 66
         height: 134
       alignment: 0
@@ -1149,8 +1184,8 @@ TextureImporter:
       name: 6
       rect:
         serializedVersion: 2
-        x: 1377
-        y: 2631
+        x: 480
+        y: 1177
         width: 66
         height: 134
       alignment: 0
@@ -1162,21 +1197,8 @@ TextureImporter:
       name: 7
       rect:
         serializedVersion: 2
-        x: 1445
-        y: 2631
-        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: 8
-      rect:
-        serializedVersion: 2
         x: 480
-        y: 1585
+        y: 1041
         width: 66
         height: 134
       alignment: 0
@@ -1185,11 +1207,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 9
+      name: 11
       rect:
         serializedVersion: 2
-        x: 480
-        y: 1449
+        x: 3937
+        y: 388
         width: 66
         height: 134
       alignment: 0
@@ -1198,11 +1220,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 10
+      name: 12
       rect:
         serializedVersion: 2
-        x: 480
-        y: 1313
+        x: 4019
+        y: 975
         width: 66
         height: 134
       alignment: 0
@@ -1211,11 +1233,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 11
+      name: 13
       rect:
         serializedVersion: 2
-        x: 480
-        y: 1177
+        x: 1377
+        y: 2767
         width: 66
         height: 134
       alignment: 0
@@ -1371,7 +1393,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3837
-        y: 998
+        y: 772
         width: 180
         height: 111
       alignment: 0
@@ -1436,7 +1458,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3837
-        y: 772
+        y: 998
         width: 180
         height: 111
       alignment: 0
@@ -1474,8 +1496,8 @@ TextureImporter:
       name: "\u4E0A\u886312\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 2943
-        y: 854
+        x: 1364
+        y: 2200
         width: 66
         height: 66
       alignment: 0
@@ -1500,7 +1522,7 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1364
+        x: 1432
         y: 2200
         width: 66
         height: 66
@@ -1513,7 +1535,7 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 3490
+        x: 3427
         y: 2579
         width: 61
         height: 61
@@ -1526,8 +1548,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1432
-        y: 2200
+        x: 1377
+        y: 2563
         width: 66
         height: 66
       alignment: 0
@@ -1539,7 +1561,7 @@ TextureImporter:
       name: "\u4E0A\u886313\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 3553
+        x: 3490
         y: 2579
         width: 61
         height: 61
@@ -1552,8 +1574,8 @@ TextureImporter:
       name: "\u4E0A\u88632\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4025
-        y: 1207
+        x: 779
+        y: 3077
         width: 60
         height: 59
       alignment: 0
@@ -1566,7 +1588,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 4035
-        y: 203
+        y: 330
         width: 57
         height: 56
       alignment: 0
@@ -1578,8 +1600,8 @@ TextureImporter:
       name: "\u4E0A\u88636\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3183
-        y: 1369
+        x: 543
+        y: 973
         width: 66
         height: 66
       alignment: 0
@@ -1604,8 +1626,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3011
-        y: 854
+        x: 3183
+        y: 1369
         width: 66
         height: 66
       alignment: 0
@@ -1617,7 +1639,7 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 3427
+        x: 3553
         y: 2579
         width: 61
         height: 61
@@ -1643,7 +1665,7 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1377
+        x: 1445
         y: 2563
         width: 66
         height: 66
@@ -1679,7 +1701,7 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u82B1\u6735\u5B9D\u7BB1"
+      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
         x: 3528
@@ -1809,7 +1831,7 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014-1"
+      name: "\u978B\u5B5014-2"
       rect:
         serializedVersion: 2
         x: 548
@@ -1822,24 +1844,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014-2"
-      rect:
-        serializedVersion: 2
-        x: 4035
-        y: 261
-        width: 59
-        height: 125
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
       name: "\u5934\u53D19-\u84DD"
       rect:
         serializedVersion: 2
-        x: 2488
-        y: 2125
+        x: 2937
+        y: 2093
         width: 447
         height: 457
       alignment: 0
@@ -1851,8 +1860,8 @@ TextureImporter:
       name: "\u978B\u5B5015-2"
       rect:
         serializedVersion: 2
-        x: 4019
-        y: 975
+        x: 4005
+        y: 388
         width: 66
         height: 134
       alignment: 0
@@ -1929,8 +1938,8 @@ TextureImporter:
       name: "\u5934\u53D19(\u767D)"
       rect:
         serializedVersion: 2
-        x: 2288
-        y: 1310
+        x: 2228
+        y: 824
         width: 447
         height: 458
       alignment: 0
@@ -1942,8 +1951,8 @@ TextureImporter:
       name: "\u5934\u53D19-\u7C89"
       rect:
         serializedVersion: 2
-        x: 2937
-        y: 2093
+        x: 2488
+        y: 2125
         width: 447
         height: 457
       alignment: 0
@@ -1955,8 +1964,8 @@ TextureImporter:
       name: "\u5934\u53D19-\u9EC4"
       rect:
         serializedVersion: 2
-        x: 2228
-        y: 824
+        x: 2288
+        y: 1310
         width: 447
         height: 458
       alignment: 0
@@ -1982,7 +1991,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1445
-        y: 2767
+        y: 2903
         width: 66
         height: 134
       alignment: 0
@@ -1994,8 +2003,8 @@ TextureImporter:
       name: "\u978B\u5B5014b"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 1721
+        x: 1377
+        y: 2631
         width: 66
         height: 134
       alignment: 0
@@ -2060,7 +2069,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2737
-        y: 1341
+        y: 1717
         width: 444
         height: 374
       alignment: 0
@@ -2086,7 +2095,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2737
-        y: 1717
+        y: 1341
         width: 444
         height: 374
       alignment: 0
@@ -2098,8 +2107,8 @@ TextureImporter:
       name: "\u5934\u53D110(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 303
+        x: 1842
+        y: 1284
         width: 444
         height: 484
       alignment: 0
@@ -2125,7 +2134,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3937
-        y: 648
+        y: 524
         width: 134
         height: 122
       alignment: 0
@@ -2138,7 +2147,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3937
-        y: 524
+        y: 648
         width: 134
         height: 122
       alignment: 0
@@ -2202,8 +2211,8 @@ TextureImporter:
       name: "\u4E0A\u886314b-\u8896\u5B501"
       rect:
         serializedVersion: 2
-        x: 1445
-        y: 2563
+        x: 2943
+        y: 854
         width: 66
         height: 66
       alignment: 0
@@ -2215,8 +2224,8 @@ TextureImporter:
       name: "\u4E0A\u886314b-\u8896\u5B502"
       rect:
         serializedVersion: 2
-        x: 3251
-        y: 1373
+        x: 4019
+        y: 775
         width: 62
         height: 62
       alignment: 0
@@ -2228,8 +2237,8 @@ TextureImporter:
       name: "\u4E0A\u886314c-\u8896\u5B501"
       rect:
         serializedVersion: 2
-        x: 543
-        y: 973
+        x: 3011
+        y: 854
         width: 66
         height: 66
       alignment: 0
@@ -2241,8 +2250,8 @@ TextureImporter:
       name: "\u4E0A\u886314c-\u8896\u5B502"
       rect:
         serializedVersion: 2
-        x: 4019
-        y: 775
+        x: 3251
+        y: 1373
         width: 62
         height: 62
       alignment: 0
@@ -2254,8 +2263,8 @@ TextureImporter:
       name: "\u5934\u53D110(\u68D5)"
       rect:
         serializedVersion: 2
-        x: 1842
-        y: 1284
+        x: 2
+        y: 303
         width: 444
         height: 484
       alignment: 0

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


+ 93 - 47
Assets/Resource/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1522830458
+timeCreated: 1523002753
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -55,6 +55,31 @@ TextureImporter:
     21300096: "\u94BB\u77F3\u5B9D\u7BB1"
     21300098: "\u5F00\u5FC3"
     21300100: "\u978B\u5B5015-1"
+    21300102: "\u88D9\u5B501"
+    21300104: "\u5934\u9970\u54C11"
+    21300106: "\u88D9\u5B503"
+    21300108: "\u5934\u9970\u54C12"
+    21300110: "\u88D9\u5B502"
+    21300112: "\u88D9\u5B504"
+    21300114: "\u88D9\u5B505"
+    21300116: "\u88D9\u5B506"
+    21300118: "\u88D9\u5B508"
+    21300120: "\u5934\u99707"
+    21300122: "\u5934\u99708"
+    21300124: "\u5934\u997011"
+    21300126: "\u4E0A\u88634"
+    21300128: "\u4E0A\u88639"
+    21300130: "\u4E0A\u886311(\u7C89)"
+    21300132: "\u54ED"
+    21300134: "\u8272\u54AA\u54AA"
+    21300136: "\u4E0B\u886315"
+    21300138: "\u5934\u53D111(\u68D5)\u540E"
+    21300140: "\u978B\u5B501"
+    21300142: "\u8863\u670D11(\u7C89)"
+    21300144: 8
+    21300146: 9
+    21300148: "\u82B1\u6735\u5B9D\u7BB1"
+    21300150: "\u978B\u5B5014-1"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -78,7 +103,7 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -1
     wrapMode: 1
@@ -93,7 +118,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 8
   textureShape: 1
@@ -133,23 +158,18 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     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
@@ -163,11 +183,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 2
+      name: "\u978B\u5B501"
       rect:
         serializedVersion: 2
-        x: 2808
-        y: 3810
+        x: 1906
+        y: 3768
         width: 66
         height: 134
       alignment: 0
@@ -180,7 +200,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 990
-        y: 3142
+        y: 3029
         width: 165
         height: 111
       alignment: 0
@@ -193,7 +213,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 990
-        y: 3029
+        y: 3142
         width: 165
         height: 111
       alignment: 0
@@ -205,7 +225,7 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 275
+        x: 2
         y: 3037
         width: 271
         height: 184
@@ -218,7 +238,7 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 2
+        x: 275
         y: 3037
         width: 271
         height: 184
@@ -228,26 +248,26 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5011(\u7C89)"
+      name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 3514
-        width: 302
-        height: 197
+        x: 820
+        y: 3793
+        width: 386
+        height: 301
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8863\u670D11"
+      name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 820
-        y: 3793
-        width: 386
-        height: 301
+        x: 686
+        y: 3067
+        width: 302
+        height: 197
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -257,8 +277,8 @@ TextureImporter:
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 686
-        y: 3067
+        x: 480
+        y: 3514
         width: 302
         height: 197
       alignment: 0
@@ -271,7 +291,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1173
-        y: 3317
+        y: 3552
         width: 287
         height: 233
       alignment: 0
@@ -284,7 +304,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1173
-        y: 3552
+        y: 3317
         width: 287
         height: 233
       alignment: 0
@@ -309,7 +329,7 @@ TextureImporter:
       name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 2
+        x: 344
         y: 3223
         width: 340
         height: 276
@@ -322,7 +342,7 @@ TextureImporter:
       name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 344
+        x: 2
         y: 3223
         width: 340
         height: 276
@@ -332,11 +352,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 12
+      name: 8
       rect:
         serializedVersion: 2
-        x: 1462
-        y: 3651
+        x: 2808
+        y: 3810
         width: 66
         height: 134
       alignment: 0
@@ -345,11 +365,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 13
+      name: 9
       rect:
         serializedVersion: 2
-        x: 1906
-        y: 3768
+        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: 10
+      rect:
+        serializedVersion: 2
+        x: 548
+        y: 2951
         width: 66
         height: 134
       alignment: 0
@@ -449,7 +482,7 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
+      name: "\u82B1\u6735\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
         x: 411
@@ -488,7 +521,7 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5015-1"
+      name: "\u978B\u5B5014-1"
       rect:
         serializedVersion: 2
         x: 616
@@ -501,6 +534,19 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B5015-1"
+      rect:
+        serializedVersion: 2
+        x: 1462
+        y: 3651
+        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: "\u5934\u997015"
       rect:
         serializedVersion: 2

+ 4 - 0
Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityUGUIDisplay.cs

@@ -13,6 +13,10 @@ public class UnityUGUIDisplay : MonoBehaviour
     
     public void Disable()
     {
+        if (dbGraphic == null)
+        {
+            return;
+        }
         dbGraphic.Disable();
     }
 

+ 5 - 4
Assets/Resource/Logo.unity

@@ -612,10 +612,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AuditEdition: 1
-  DebugMode: 0
-  CatchException: 1
-  DebugModeGo: {fileID: 0}
+  AuditEdition: 0
+  DebugMode: 1
+  CatchException: 0
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 3 - 3
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -17659,7 +17659,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1963155686783080
 GameObject:
   m_ObjectHideFlags: 1
@@ -21809,7 +21809,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: cc406256d3e6c6544af7f91fee3855cd, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bb16136b83fffea4fa26833c8beef061, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -75115,7 +75115,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -80.138245, y: -182.99924}
+  m_AnchoredPosition: {x: -80.138565, y: -182.9992}
   m_SizeDelta: {x: 664, y: 51}
   m_Pivot: {x: 0.9999998, y: 0.000000044703484}
 --- !u!224 &224484530123866530

+ 5 - 5
Assets/Resource/Prefab/PrefabUI/FashionShowCloseBox.prefab

@@ -2160,7 +2160,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: 1.66, y: -88.12}
+  m_AnchoredPosition: {x: 1.66, y: -83.12}
   m_SizeDelta: {x: 210, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224131076373525684
@@ -2237,7 +2237,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: 1.66, y: -88.12}
+  m_AnchoredPosition: {x: 1.66, y: -83.12}
   m_SizeDelta: {x: 210, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224225934111306550
@@ -2273,7 +2273,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: 1.6599464, y: -88.11997}
+  m_AnchoredPosition: {x: 1.6599464, y: -83.12}
   m_SizeDelta: {x: 210, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224265603061263988
@@ -2540,7 +2540,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: 1.66, y: -88.12}
+  m_AnchoredPosition: {x: 1.66, y: -83.12}
   m_SizeDelta: {x: 210, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224666612108067186
@@ -2711,6 +2711,6 @@ 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: 3.7, y: -92.91}
+  m_AnchoredPosition: {x: 3.7, y: -87.91}
   m_SizeDelta: {x: 210, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}

BIN
Assets/Resource/Sprite/Editor/SpriteUI/我的搭配秀按钮 1.png


+ 68 - 0
Assets/Resource/Sprite/Editor/SpriteUI/我的搭配秀按钮 1.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: bb16136b83fffea4fa26833c8beef061
+timeCreated: 1523002970
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Assets/Resource/Sprite/Editor/HotUpdate/NewFlower/Flower36.png → Assets/Resource/Sprite/Mobile/Garden/Flower36.png


+ 0 - 0
Assets/Resource/Sprite/Editor/HotUpdate/NewFlower/Flower36.png.meta → Assets/Resource/Sprite/Mobile/Garden/Flower36.png.meta


+ 1 - 1
Assets/Script/Editor/EditorBundle.cs

@@ -174,7 +174,7 @@ public class EditorBundle : Editor
             //"new_dress_config",
             //"new_language_config",
             //"new_flower_config",
-            "new_flower_tex",
+            //"new_flower_tex",
         };
         foreach (var name in names)
         {

+ 1 - 1
Assets/Script/Label/ResourceLabel.cs

@@ -105,7 +105,7 @@ public class ResourceLabel
     public static string ChineseSimplified = "ChineseSimplified";
     public static string ChineseTraditional = "ChineseTraditional";
     public static string DefaultNickName = "DefaultNickName";
-    public static string Config = "Config";
+    public static string Config = "config";
     public static string MinigameConfig = "minigame_config";
     public static string DressroomConfig = "dressRoom_config";
     public static string AchieveConfig = "achieve_config";

+ 1 - 0
Assets/Script/Manage/AudioManager.cs

@@ -172,6 +172,7 @@ public class AudioManager : Regist
 
     public static void PlayClip(string clipName)
     {
+        //Debug.Log(clipName);
         if (AudioOn)
         {
             AudioClip audioClip = ResourceManager.Load<AudioClip>(clipName, Folder.Audio);

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

@@ -212,6 +212,7 @@ public class VisitManager : Regist
 
     public static void OnStartEnterVisiteeGarden()
     {
+        ResourceManager.SetActive(CanvasLabel.C_FashionShowButton, false);
         ResourceManager.SetActive(CanvasLabel.C_EnterPlazaRoom0, false);
     }
 
@@ -377,6 +378,7 @@ public class VisitManager : Regist
     {
         if (Manager.GardenLevel >= TutorialManager.PlazaRoomTutorialLevel)
         {
+            ResourceManager.SetActive(CanvasLabel.C_FashionShowButton, true);
             ResourceManager.SetActive(CanvasLabel.C_EnterPlazaRoom0, true);
         }
     }

+ 14 - 6
Assets/Script/Object/Player.cs

@@ -934,6 +934,10 @@ public class Player : Regist , IPointerClickHandler
                 ChangeClose(BodyPart.Eye, TempClose);
             }
         }
+        if (IsDisplayInUGUI)
+        {
+            DisplayInUI(UGUIScale, false);
+        }
     }
 
     public void PlayAnim(string animName)
@@ -1419,11 +1423,14 @@ public class Player : Regist , IPointerClickHandler
 
 
     private List<UnityUGUIDisplay> uguiDisplays;
-    public void DisplayInUI(float scale)
+    public void DisplayInUI(float scale, bool adjustScale)
     {
         uguiDisplays = new List<UnityUGUIDisplay>();
+        if (adjustScale)
+        {
+            scale *= ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor;
+        }
         UGUIScale = scale;
-        scale *= ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor;
         MeshFilter[] meshFilters = UAC.GetComponentsInChildren<MeshFilter>(true);
         MeshRenderer[] meshRenderers = UAC.GetComponentsInChildren<MeshRenderer>(true);
         for (int i = 0; i < meshRenderers.Length; i++)
@@ -1461,6 +1468,7 @@ public class Player : Regist , IPointerClickHandler
         ResetDepth();
     }
 
+
     #region 换装
 
     public void CorrectPivot()
@@ -1749,9 +1757,9 @@ public class Player : Regist , IPointerClickHandler
             {
                 rightTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[1].name);
             }
-            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
+            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
                 leftTexture, new Material(Shader.Find("Sprites/Default")));
-            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
+            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
                 rightTexture, new Material(Shader.Find("Sprites/Default")));
             leftShoeDisplayName = closeItem.Sprites[0].name;
             if (closeItem.Sprites.Length == 1)
@@ -1879,7 +1887,7 @@ public class Player : Regist , IPointerClickHandler
                 () =>
                 {
                     ResetDepth();
-                    if (IsDisplayInUGUI) DisplayInUI(UGUIScale);
+                    if (IsDisplayInUGUI) DisplayInUI(UGUIScale, false);
                 }
             );
         }
@@ -1904,7 +1912,7 @@ public class Player : Regist , IPointerClickHandler
                 () =>
                 {
                     ResetDepth();
-                    if (IsDisplayInUGUI) DisplayInUI(UGUIScale);
+                    if (IsDisplayInUGUI) DisplayInUI(UGUIScale, false);
                 }
             );
         }

+ 4 - 3
Assets/Script/Social/FashionShowCloseBox.cs

@@ -44,7 +44,7 @@ public class FashionShowCloseCell
             CloseItem closeItem = PlayerManager.CloseItemDictionary[closeID];
             closeItem.ChangeDress(Player, false);
         }
-        DelayCall.Call(1, ()=> { Player.DisplayInUI(uiScale); Player.ResetDepth(); });
+        DelayCall.Call(1, ()=> { Player.DisplayInUI(uiScale, false); Player.ResetDepth(); });
     }
 
     public void Save()
@@ -52,8 +52,9 @@ public class FashionShowCloseCell
         DisplayButton.SetActive(false);
         if (Player != null)
         {
-            Player.DisplayInScene();
-            ResourceManager.Save(Player, true);
+            Object.DestroyImmediate(Player.gameObject);
+            //Player.DisplayInScene();
+            //ResourceManager.Save(Player, true);
         }
     }
 

+ 8 - 7
Assets/Script/Social/FashionShowEditPage.cs

@@ -251,8 +251,9 @@ public class FashionShowEditPage : Regist
             CloseItem closeItem = PlayerManager.CloseItemDictionary[closeID];
             closeItem.ChangeDress(DisplayPlayer, false);
         }
-        DelayCall.Call(1, () => { DisplayPlayer.DisplayInUI(37.5f); DisplayPlayer.ResetDepth(); });
-        
+        DelayCall.Call(1, () => { DisplayPlayer.DisplayInUI(37.5f, true);});
+        DelayCall.Call(0.5f, () => { DisplayPlayer.ResetDepth(); });
+
         float cuteRate = FashionShowData.GetCuteRate();
         float gloryRate = FashionShowData.GetGloryRate();
         float graceRate = FashionShowData.GetGraceRate();
@@ -751,7 +752,7 @@ public class FashionShowEditPage : Regist
 
     private static void OnCuteSliderValueChange(float value)
     {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        //AudioManager.PlayClip(ResourceLabel.BtnClip);
         CuteRateText.text = value.ToString("0");
         CuteValue.text = value.ToString("0");
     }
@@ -768,7 +769,7 @@ public class FashionShowEditPage : Regist
 
     private static void OnGraceSliderValueChange(float value)
     {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        //AudioManager.PlayClip(ResourceLabel.BtnClip);
         GraceRateText.text = value.ToString("0");
         GraceValue.text = value.ToString("0");
     }
@@ -785,7 +786,7 @@ public class FashionShowEditPage : Regist
 
     private static void OnVividSliderValueChange(float value)
     {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        //AudioManager.PlayClip(ResourceLabel.BtnClip);
         VividRateText.text = value.ToString("0");
         VividValue.text = value.ToString("0");
     }
@@ -802,7 +803,7 @@ public class FashionShowEditPage : Regist
 
     private static void OnSimpleSliderValueChange(float value)
     {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        //AudioManager.PlayClip(ResourceLabel.BtnClip);
         SimpleRateText.text = value.ToString("0");
         SimpleValue.text = value.ToString("0");
     }
@@ -819,7 +820,7 @@ public class FashionShowEditPage : Regist
 
     private static void OnGlorySliderValueChange(float value)
     {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        //AudioManager.PlayClip(ResourceLabel.BtnClip);
         GloryRateText.text = value.ToString("0");
         GloryValue.text = value.ToString("0");
     }

+ 1 - 1
Assets/Script/Social/FashionShowHomePage.cs

@@ -235,7 +235,7 @@ public class FashionShowHomePage : Regist
     private static void OnTabButtonClick(Button button)
     {
         int index = TabButtons.IndexOf(button);
-
+        //Debug.Log(index);
         requesting = false;
         currentDataIndex = 0;
         currentPage = 0;

+ 10 - 7
Assets/Script/Tool/Bundle.cs

@@ -42,7 +42,7 @@ public class Bundle : MonoBehaviour
         ResourceLabel.NewDressTex,
         //ResourceLabel.NewLanguage,
         //ResourceLabel.NewFlowerConfig,
-        ResourceLabel.NewFlowerTex,
+        //ResourceLabel.NewFlowerTex,
     };
 
     //public List<Object> NewDressConfigList;
@@ -782,6 +782,9 @@ public class Bundle : MonoBehaviour
         else
         {
             Debug.Log(www.error);
+            Initializer.DebugText.text = www.error;
+            Initializer.DebugText.SetActive(true);
+            Initializer.DebugText.enabled = true;
         }
     }
 
@@ -936,12 +939,12 @@ public class Bundle : MonoBehaviour
             Initializer.DebugText.text = "08";
             //NewFlowerConfigs = ConfigManager.GetFlowerConfig(NewFlowerConfig.LoadAsset<TextAsset>(ResourceLabel.NewFlowerConfig));
 
-            Initializer.DebugText.text = "09";
-            sprites = NewFlowerTex.LoadAllAssets<Sprite>();
-            for (int i = 0; i < sprites.Length; i++)
-            {
-                ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
-            }
+            //Initializer.DebugText.text = "09";
+            //sprites = NewFlowerTex.LoadAllAssets<Sprite>();
+            //for (int i = 0; i < sprites.Length; i++)
+            //{
+            //    ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
+            //}
 
             UpdateComplete = true;
 

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

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

+ 3 - 7
第五期.txt

@@ -1,19 +1,15 @@
-增加服装流程 骨骼位置 UI上的位置 语言文档 存档
+上衣1的Offset
 
 
 
-打开EditPage
+增加服装流程 骨骼位置 UI上的位置 语言文档 存档
+
 
-上衣1的Offset
 
 5兆金币成就
 
 点击换小游戏卡住
 
-好友系统
-
-聊天系统
-
 
 
 //关闭DebugMode 开启CatchException

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