Browse Source

新家一套服装(17)

LiuQilin 7 years ago
parent
commit
c0136a0cd2

+ 0 - 32
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      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


+ 157 - 155
Assets/Resource/Animations/人物动画/stand_texture_0.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c486bd2e1e577b24a86013546709abda
-timeCreated: 1524744352
+timeCreated: 1524801765
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -205,6 +205,8 @@ TextureImporter:
     21300396: "\u8896\u5B5017-1"
     21300398: "\u8896\u5B5017-2"
     21300400: "\u5934\u53D117-2\u540E"
+    21300402: "\u5934\u53D117-3\u540E"
+    21300404: "\u88D9\u5B5017_1"
   externalObjects: {}
   serializedVersion: 4
   mipmaps:
@@ -323,8 +325,8 @@ TextureImporter:
       name: "\u4E0A\u88631\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 554
-        y: 1736
+        x: 3358
+        y: 753
         width: 57
         height: 56
       alignment: 0
@@ -338,7 +340,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 480
-        y: 569
+        y: 176
         width: 646
         height: 391
       alignment: 0
@@ -366,7 +368,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3427
-        y: 2660
+        y: 2804
         width: 212
         height: 142
       alignment: 0
@@ -421,8 +423,8 @@ TextureImporter:
       name: "\u5634\u5DF41"
       rect:
         serializedVersion: 2
-        x: 4016
-        y: 1681
+        x: 4025
+        y: 370
         width: 56
         height: 35
       alignment: 0
@@ -432,6 +434,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u773C\u775B1"
+      rect:
+        serializedVersion: 2
+        x: 3248
+        y: 16
+        width: 264
+        height: 95
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u773C\u775B\u8868\u60C51"
       rect:
         serializedVersion: 2
@@ -464,7 +480,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 548
-        y: 1073
+        y: 1134
         width: 60
         height: 59
       alignment: 0
@@ -474,13 +490,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u773C\u775B2"
+      name: "\u978B\u5B501"
       rect:
         serializedVersion: 2
-        x: 3248
-        y: 16
-        width: 264
-        height: 95
+        x: 480
+        y: 1425
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -491,7 +507,7 @@ TextureImporter:
       name: "\u8111\u58F32"
       rect:
         serializedVersion: 2
-        x: 1678
+        x: 1128
         y: 458
         width: 548
         height: 424
@@ -506,7 +522,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3427
-        y: 2804
+        y: 2948
         width: 212
         height: 142
       alignment: 0
@@ -533,8 +549,8 @@ TextureImporter:
       name: "\u5634\u5DF43"
       rect:
         serializedVersion: 2
-        x: 4025
-        y: 370
+        x: 4016
+        y: 1681
         width: 56
         height: 35
       alignment: 0
@@ -544,11 +560,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B502"
+      name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 4025
-        y: 543
+        x: 480
+        y: 1017
         width: 66
         height: 134
       alignment: 0
@@ -589,8 +605,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
@@ -603,8 +619,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
@@ -646,7 +662,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2
-        y: 2365
+        y: 1857
         width: 610
         height: 506
       alignment: 0
@@ -660,7 +676,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2
-        y: 1857
+        y: 2365
         width: 610
         height: 506
       alignment: 0
@@ -673,8 +689,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 1364
-        y: 1418
+        x: 2104
+        y: 2163
         width: 382
         height: 770
       alignment: 0
@@ -715,8 +731,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 3464
-        y: 752
+        x: 3227
+        y: 2102
         width: 449
         height: 448
       alignment: 0
@@ -729,8 +745,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 3658
-        y: 3324
+        x: 1364
+        y: 1418
         width: 382
         height: 770
       alignment: 0
@@ -743,8 +759,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 3227
-        y: 2102
+        x: 3464
+        y: 752
         width: 449
         height: 448
       alignment: 0
@@ -757,8 +773,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
@@ -785,8 +801,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u6A59)"
       rect:
         serializedVersion: 2
-        x: 879
-        y: 3039
+        x: 2
+        y: 2873
         width: 649
         height: 586
       alignment: 0
@@ -799,8 +815,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 2873
+        x: 1722
+        y: 3508
         width: 649
         height: 586
       alignment: 0
@@ -813,8 +829,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u84DD\u8272)"
       rect:
         serializedVersion: 2
-        x: 1722
-        y: 3508
+        x: 879
+        y: 3039
         width: 649
         height: 586
       alignment: 0
@@ -827,8 +843,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 653
-        y: 2030
+        x: 2947
+        y: 3594
         width: 709
         height: 500
       alignment: 0
@@ -869,8 +885,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u9ED1)"
       rect:
         serializedVersion: 2
-        x: 2947
-        y: 3594
+        x: 653
+        y: 2030
         width: 709
         height: 500
       alignment: 0
@@ -884,7 +900,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 480
-        y: 176
+        y: 569
         width: 646
         height: 391
       alignment: 0
@@ -912,7 +928,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1128
-        y: 458
+        y: 32
         width: 548
         height: 424
       alignment: 0
@@ -940,7 +956,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 614
-        y: 1496
+        y: 962
         width: 476
         height: 532
       alignment: 0
@@ -953,8 +969,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 1364
-        y: 884
+        x: 614
+        y: 1496
         width: 476
         height: 532
       alignment: 0
@@ -967,8 +983,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 614
-        y: 962
+        x: 2
+        y: 789
         width: 476
         height: 532
       alignment: 0
@@ -995,8 +1011,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2228
-        y: 14
+        x: 3579
+        y: 364
         width: 444
         height: 386
       alignment: 0
@@ -1009,8 +1025,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 789
+        x: 1364
+        y: 884
         width: 476
         height: 532
       alignment: 0
@@ -1020,11 +1036,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
+      name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 3579
-        y: 364
+        x: 2228
+        y: 14
         width: 444
         height: 386
       alignment: 0
@@ -1066,7 +1082,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3227
-        y: 1478
+        y: 1299
         width: 207
         height: 172
       alignment: 0
@@ -1104,39 +1120,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 8
-      rect:
-        serializedVersion: 2
-        x: 4025
-        y: 407
-        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: 9
-      rect:
-        serializedVersion: 2
-        x: 480
-        y: 1561
-        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: 10
+      name: 13
       rect:
         serializedVersion: 2
         x: 480
-        y: 1425
+        y: 1289
         width: 66
         height: 134
       alignment: 0
@@ -1163,8 +1151,8 @@ TextureImporter:
       name: "\u5934\u99707"
       rect:
         serializedVersion: 2
-        x: 2724
-        y: 996
+        x: 1092
+        y: 1756
         width: 270
         height: 272
       alignment: 0
@@ -1177,8 +1165,8 @@ TextureImporter:
       name: "\u5934\u99708"
       rect:
         serializedVersion: 2
-        x: 1092
-        y: 1756
+        x: 2724
+        y: 996
         width: 270
         height: 272
       alignment: 0
@@ -1192,7 +1180,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3915
-        y: 1324
+        y: 1502
         width: 171
         height: 176
       alignment: 0
@@ -1303,8 +1291,8 @@ TextureImporter:
       name: "\u4E0A\u886312\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3563
-        y: 2592
+        x: 4016
+        y: 1718
         width: 66
         height: 66
       alignment: 0
@@ -1331,7 +1319,7 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3495
+        x: 3563
         y: 2592
         width: 66
         height: 66
@@ -1346,7 +1334,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 548
-        y: 1258
+        y: 1321
         width: 61
         height: 61
       alignment: 0
@@ -1359,8 +1347,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3930
-        y: 32
+        x: 653
+        y: 3082
         width: 66
         height: 66
       alignment: 0
@@ -1374,7 +1362,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 548
-        y: 1195
+        y: 1258
         width: 61
         height: 61
       alignment: 0
@@ -1388,7 +1376,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 548
-        y: 1134
+        y: 1073
         width: 60
         height: 59
       alignment: 0
@@ -1401,8 +1389,8 @@ TextureImporter:
       name: "\u4E0A\u88632\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 3358
-        y: 753
+        x: 554
+        y: 1736
         width: 57
         height: 56
       alignment: 0
@@ -1415,8 +1403,8 @@ TextureImporter:
       name: "\u4E0A\u88636\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 653
-        y: 3082
+        x: 3427
+        y: 2592
         width: 66
         height: 66
       alignment: 0
@@ -1429,7 +1417,7 @@ TextureImporter:
       name: "\u4E0A\u88636\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 1191
+        x: 1128
         y: 929
         width: 61
         height: 61
@@ -1443,8 +1431,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4016
-        y: 1718
+        x: 3930
+        y: 32
         width: 66
         height: 66
       alignment: 0
@@ -1457,8 +1445,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 1128
-        y: 929
+        x: 548
+        y: 1195
         width: 61
         height: 61
       alignment: 0
@@ -1471,8 +1459,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 548
-        y: 1321
+        x: 1191
+        y: 929
         width: 61
         height: 61
       alignment: 0
@@ -1485,8 +1473,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3427
-        y: 2592
+        x: 3998
+        y: 32
         width: 66
         height: 66
       alignment: 0
@@ -1524,7 +1512,7 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u82B1\u6735\u5B9D\u7BB1"
+      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
         x: 3678
@@ -1636,6 +1624,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B5015-2"
+      rect:
+        serializedVersion: 2
+        x: 4025
+        y: 543
+        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: "\u4E0B\u886315"
       rect:
         serializedVersion: 2
@@ -1762,11 +1764,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014a"
+      name: "\u978B\u5B5014c"
       rect:
         serializedVersion: 2
         x: 480
-        y: 1289
+        y: 1561
         width: 66
         height: 134
       alignment: 0
@@ -1821,8 +1823,8 @@ TextureImporter:
       name: "\u5934\u53D110(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 1842
-        y: 1284
+        x: 2
+        y: 303
         width: 444
         height: 484
       alignment: 0
@@ -1850,7 +1852,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1377
-        y: 2915
+        y: 2791
         width: 134
         height: 122
       alignment: 0
@@ -1864,7 +1866,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1377
-        y: 2791
+        y: 2915
         width: 134
         height: 122
       alignment: 0
@@ -1933,8 +1935,8 @@ TextureImporter:
       name: "\u4E0A\u886314b-\u8896\u5B501"
       rect:
         serializedVersion: 2
-        x: 3998
-        y: 32
+        x: 3915
+        y: 796
         width: 66
         height: 66
       alignment: 0
@@ -1947,7 +1949,7 @@ TextureImporter:
       name: "\u4E0A\u886314b-\u8896\u5B502"
       rect:
         serializedVersion: 2
-        x: 785
+        x: 721
         y: 3086
         width: 62
         height: 62
@@ -1961,8 +1963,8 @@ TextureImporter:
       name: "\u4E0A\u886314c-\u8896\u5B501"
       rect:
         serializedVersion: 2
-        x: 3915
-        y: 796
+        x: 3495
+        y: 2592
         width: 66
         height: 66
       alignment: 0
@@ -1975,7 +1977,7 @@ TextureImporter:
       name: "\u4E0A\u886314c-\u8896\u5B502"
       rect:
         serializedVersion: 2
-        x: 721
+        x: 785
         y: 3086
         width: 62
         height: 62
@@ -1989,8 +1991,8 @@ TextureImporter:
       name: "\u5934\u53D110(\u68D5)"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 303
+        x: 1842
+        y: 1284
         width: 444
         height: 484
       alignment: 0
@@ -2070,25 +2072,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u65B0\u978B\u5B5016"
-      rect:
-        serializedVersion: 2
-        x: 480
-        y: 1017
-        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: "\u8111\u58F3-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 1128
-        y: 32
+        x: 1678
+        y: 458
         width: 548
         height: 424
       alignment: 0
@@ -2102,7 +2090,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3427
-        y: 2948
+        y: 2660
         width: 212
         height: 142
       alignment: 0
@@ -2116,7 +2104,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3915
-        y: 1502
+        y: 1324
         width: 171
         height: 176
       alignment: 0
@@ -2126,6 +2114,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B50-\u7F3A\u5931"
+      rect:
+        serializedVersion: 2
+        x: 4025
+        y: 407
+        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: "\u4E0A\u886314"
       rect:
         serializedVersion: 2
@@ -2196,13 +2198,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5017"
+      name: "\u88D9\u5B5017_1"
       rect:
         serializedVersion: 2
         x: 3227
-        y: 1301
-        width: 199
-        height: 175
+        y: 1473
+        width: 212
+        height: 177
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -2238,7 +2240,7 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D117-2\u540E"
+      name: "\u5934\u53D117-3\u540E"
       rect:
         serializedVersion: 2
         x: 1842

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


+ 156 - 154
Assets/Resource/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1524744362
+timeCreated: 1524801778
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -117,6 +117,8 @@ TextureImporter:
     21300220: "\u5934\u53D117-2"
     21300222: "\u5934\u53D117-3\u540E"
     21300224: "\u5934\u53D117-3"
+    21300226: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
+    21300228: "\u5934\u53D117-2\u540E"
   externalObjects: {}
   serializedVersion: 4
   mipmaps:
@@ -221,8 +223,8 @@ TextureImporter:
       name: "\u978B\u5B5015-2_1"
       rect:
         serializedVersion: 2
-        x: 3465
-        y: 2860
+        x: 3335
+        y: 3044
         width: 66
         height: 134
       alignment: 0
@@ -232,25 +234,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u773C\u775B1"
-      rect:
-        serializedVersion: 2
-        x: 2850
-        y: 3106
-        width: 264
-        height: 95
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-    - serializedVersion: 2
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 1874
-        y: 3065
+        x: 1608
+        y: 2953
         width: 165
         height: 111
       alignment: 0
@@ -274,13 +262,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B501"
+      name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 1022
-        y: 2814
-        width: 66
-        height: 134
+        x: 1426
+        y: 2848
+        width: 165
+        height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -288,11 +276,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u88632"
+      name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 2222
-        y: 3169
+        x: 2042
+        y: 2960
         width: 165
         height: 111
       alignment: 0
@@ -302,13 +290,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u88633"
+      name: "\u773C\u775B2"
       rect:
         serializedVersion: 2
-        x: 3298
-        y: 2952
-        width: 165
-        height: 111
+        x: 2613
+        y: 3102
+        width: 264
+        height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -319,8 +307,8 @@ TextureImporter:
       name: "\u773C\u775B3"
       rect:
         serializedVersion: 2
-        x: 2850
-        y: 3009
+        x: 2613
+        y: 3199
         width: 264
         height: 95
       alignment: 0
@@ -330,11 +318,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B503"
+      name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 3976
-        y: 2703
+        x: 3572
+        y: 3165
         width: 66
         height: 134
       alignment: 0
@@ -358,7 +346,7 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
+      name: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
         x: 2
@@ -375,7 +363,7 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 3185
+        x: 3458
         y: 3484
         width: 271
         height: 184
@@ -389,7 +377,7 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 3458
+        x: 3185
         y: 3484
         width: 271
         height: 184
@@ -403,8 +391,8 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 794
-        y: 3395
+        x: 2
+        y: 3007
         width: 386
         height: 301
       alignment: 0
@@ -431,8 +419,8 @@ TextureImporter:
       name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3007
+        x: 794
+        y: 3395
         width: 386
         height: 301
       alignment: 0
@@ -473,8 +461,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 3113
-        y: 3203
+        x: 2893
+        y: 3296
         width: 203
         height: 142
       alignment: 0
@@ -487,8 +475,8 @@ TextureImporter:
       name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 2595
-        y: 3583
+        x: 2072
+        y: 3478
         width: 287
         height: 233
       alignment: 0
@@ -501,8 +489,8 @@ TextureImporter:
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 2072
-        y: 3478
+        x: 2595
+        y: 3583
         width: 287
         height: 233
       alignment: 0
@@ -557,8 +545,8 @@ TextureImporter:
       name: 3
       rect:
         serializedVersion: 2
-        x: 4015
-        y: 3247
+        x: 648
+        y: 2721
         width: 66
         height: 134
       alignment: 0
@@ -571,8 +559,8 @@ TextureImporter:
       name: 4
       rect:
         serializedVersion: 2
-        x: 648
-        y: 2721
+        x: 3997
+        y: 3383
         width: 66
         height: 134
       alignment: 0
@@ -585,8 +573,8 @@ TextureImporter:
       name: 5
       rect:
         serializedVersion: 2
-        x: 3976
-        y: 2567
+        x: 3997
+        y: 3247
         width: 66
         height: 134
       alignment: 0
@@ -599,8 +587,8 @@ TextureImporter:
       name: 6
       rect:
         serializedVersion: 2
-        x: 3654
-        y: 2976
+        x: 1022
+        y: 2950
         width: 66
         height: 134
       alignment: 0
@@ -613,8 +601,8 @@ TextureImporter:
       name: 7
       rect:
         serializedVersion: 2
-        x: 3722
-        y: 2976
+        x: 3947
+        y: 3111
         width: 66
         height: 134
       alignment: 0
@@ -624,11 +612,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 11
+      name: 8
       rect:
         serializedVersion: 2
-        x: 3947
-        y: 3217
+        x: 1182
+        y: 3562
         width: 66
         height: 134
       alignment: 0
@@ -638,11 +626,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 12
+      name: 9
       rect:
         serializedVersion: 2
-        x: 3997
-        y: 3383
+        x: 1593
+        y: 2817
         width: 66
         height: 134
       alignment: 0
@@ -652,11 +640,39 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 13
+      name: 10
       rect:
         serializedVersion: 2
-        x: 1182
-        y: 3562
+        x: 1729
+        y: 2813
+        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: 11
+      rect:
+        serializedVersion: 2
+        x: 1661
+        y: 2681
+        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: 12
+      rect:
+        serializedVersion: 2
+        x: 1865
+        y: 2813
         width: 66
         height: 134
       alignment: 0
@@ -697,8 +713,8 @@ TextureImporter:
       name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 390
-        y: 2993
+        x: 794
+        y: 3086
         width: 351
         height: 307
       alignment: 0
@@ -711,8 +727,8 @@ TextureImporter:
       name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 794
-        y: 3086
+        x: 390
+        y: 2993
         width: 351
         height: 307
       alignment: 0
@@ -725,8 +741,8 @@ TextureImporter:
       name: "\u4E0A\u88635"
       rect:
         serializedVersion: 2
-        x: 3486
-        y: 2996
+        x: 1874
+        y: 3062
         width: 166
         height: 114
       alignment: 0
@@ -739,8 +755,8 @@ TextureImporter:
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 3794
-        y: 3095
+        x: 2419
+        y: 3053
         width: 180
         height: 111
       alignment: 0
@@ -753,8 +769,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 3304
-        y: 3065
+        x: 2879
+        y: 3068
         width: 180
         height: 111
       alignment: 0
@@ -767,8 +783,8 @@ TextureImporter:
       name: "\u4E0A\u88638"
       rect:
         serializedVersion: 2
-        x: 2408
-        y: 3174
+        x: 2879
+        y: 3181
         width: 179
         height: 113
       alignment: 0
@@ -795,8 +811,8 @@ TextureImporter:
       name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 3116
-        y: 3080
+        x: 2408
+        y: 3166
         width: 186
         height: 121
       alignment: 0
@@ -809,8 +825,8 @@ TextureImporter:
       name: "\u4E0A\u886312"
       rect:
         serializedVersion: 2
-        x: 2589
-        y: 3062
+        x: 2055
+        y: 3073
         width: 180
         height: 111
       alignment: 0
@@ -851,8 +867,8 @@ TextureImporter:
       name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 3116
-        y: 2967
+        x: 2237
+        y: 3053
         width: 180
         height: 111
       alignment: 0
@@ -876,7 +892,7 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
+      name: "\u82B1\u6735\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
         x: 1294
@@ -907,8 +923,8 @@ TextureImporter:
       name: "\u60CA\u8BB6"
       rect:
         serializedVersion: 2
-        x: 2613
-        y: 3175
+        x: 3335
+        y: 3180
         width: 235
         height: 119
       alignment: 0
@@ -935,8 +951,8 @@ TextureImporter:
       name: "\u671F\u5F85"
       rect:
         serializedVersion: 2
-        x: 3318
-        y: 3178
+        x: 3098
+        y: 3091
         width: 235
         height: 121
       alignment: 0
@@ -963,8 +979,8 @@ TextureImporter:
       name: "\u90C1\u95F7"
       rect:
         serializedVersion: 2
-        x: 3555
-        y: 3112
+        x: 2055
+        y: 3186
         width: 237
         height: 94
       alignment: 0
@@ -977,8 +993,8 @@ TextureImporter:
       name: "\u978B\u5B5014-1"
       rect:
         serializedVersion: 2
-        x: 2771
-        y: 3039
+        x: 1661
+        y: 2817
         width: 66
         height: 134
       alignment: 0
@@ -991,22 +1007,8 @@ TextureImporter:
       name: "\u978B\u5B5015-1"
       rect:
         serializedVersion: 2
-        x: 648
-        y: 2857
-        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-2"
-      rect:
-        serializedVersion: 2
-        x: 3976
-        y: 2975
+        x: 1942
+        y: 2926
         width: 66
         height: 134
       alignment: 0
@@ -1086,11 +1088,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014b"
+      name: "\u978B\u5B5014a"
       rect:
         serializedVersion: 2
-        x: 3976
-        y: 2839
+        x: 1022
+        y: 2814
         width: 66
         height: 134
       alignment: 0
@@ -1100,11 +1102,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014c"
+      name: "\u978B\u5B5014b"
       rect:
         serializedVersion: 2
-        x: 3533
-        y: 2860
+        x: 4015
+        y: 3072
         width: 66
         height: 134
       alignment: 0
@@ -1131,7 +1133,7 @@ TextureImporter:
       name: "\u5934\u53D111(\u68D5)"
       rect:
         serializedVersion: 2
-        x: 1294
+        x: 1740
         y: 3720
         width: 444
         height: 374
@@ -1159,7 +1161,7 @@ TextureImporter:
       name: "\u5934\u53D111(\u84DD)"
       rect:
         serializedVersion: 2
-        x: 1740
+        x: 1294
         y: 3720
         width: 444
         height: 374
@@ -1212,13 +1214,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7FC5\u8180-\u7F3A\u5931"
+      name: "\u65B0\u978B\u5B5016"
       rect:
         serializedVersion: 2
-        x: 3744
-        y: 3666
-        width: 324
-        height: 210
+        x: 648
+        y: 2857
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1226,13 +1228,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u8863-\u7F3A\u5931"
+      name: "\u7FC5\u8180-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 2055
-        y: 3169
-        width: 165
-        height: 111
+        x: 3744
+        y: 3666
+        width: 324
+        height: 210
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1240,13 +1242,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B50-\u7F3A\u5931"
+      name: "\u4E0A\u8863-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 4015
-        y: 3111
-        width: 66
-        height: 134
+        x: 1775
+        y: 2949
+        width: 165
+        height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1285,8 +1287,8 @@ TextureImporter:
       name: "\u5934\u53D117-1\u540E"
       rect:
         serializedVersion: 2
-        x: 425
-        y: 3302
+        x: 1703
+        y: 3324
         width: 367
         height: 394
       alignment: 0
@@ -1299,8 +1301,8 @@ TextureImporter:
       name: "\u5934\u53D117-1_1"
       rect:
         serializedVersion: 2
-        x: 871
-        y: 3698
+        x: 2
+        y: 3310
         width: 421
         height: 396
       alignment: 0
@@ -1313,10 +1315,10 @@ TextureImporter:
       name: "\u8863\u670D17"
       rect:
         serializedVersion: 2
-        x: 2893
-        y: 3305
+        x: 3098
+        y: 3214
         width: 218
-        height: 133
+        height: 131
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1327,8 +1329,8 @@ TextureImporter:
       name: "\u978B\u5B5018"
       rect:
         serializedVersion: 2
-        x: 1022
-        y: 2950
+        x: 1797
+        y: 2813
         width: 66
         height: 134
       alignment: 0
@@ -1338,13 +1340,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D117-2"
+      name: "\u5934\u53D117-2\u540E"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3310
-        width: 421
-        height: 396
+        x: 425
+        y: 3302
+        width: 367
+        height: 394
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1352,13 +1354,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D117-3\u540E"
+      name: "\u5934\u53D117-2"
       rect:
         serializedVersion: 2
-        x: 1703
-        y: 3324
-        width: 367
-        height: 394
+        x: 871
+        y: 3698
+        width: 421
+        height: 396
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}

+ 1 - 1
Assets/Resource/Logo.unity

@@ -341,7 +341,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 841147520}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 488.5, y: 275, z: 0}
+  m_LocalPosition: {x: 432.5, y: 243.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 722194762}

+ 0 - 10
Assets/Resource/Sprite/Editor/HotUpdate/NewFlower.meta

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

+ 1 - 1
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -91,7 +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="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_1" 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="" />

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


+ 2 - 2
Assets/Script/Object/Player.cs

@@ -1843,9 +1843,9 @@ public class Player : Regist , IPointerClickHandler
             {
                 rightTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[1].name);
             }
-            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
+            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
                 leftTexture, new Material(Shader.Find("Sprites/Default")));
-            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
+            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
                 rightTexture, new Material(Shader.Find("Sprites/Default")));
             leftShoeDisplayName = closeItem.Sprites[0].name;
             if (closeItem.Sprites.Length == 1)

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