LiuQilin před 7 roky
rodič
revize
cb0a8646a2

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex.json


binární
Assets/Resource/Animations/人物动画/stand_texture.png


+ 167 - 138
Assets/Resource/Animations/人物动画/stand_texture.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d523bac11c2f3742ab88a2cbd71bf39
-timeCreated: 1509116769
+timeCreated: 1522400909
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -155,6 +155,9 @@ TextureImporter:
     21300296: "\u8272\u54AA\u54AA"
     21300298: "\u59D4\u5C48"
     21300300: "\u90C1\u95F7"
+    21300302: "\u978B\u5B50_1"
+    21300304: "\u978B\u5B5014-1"
+    21300306: "\u978B\u5B5014-2"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -261,8 +264,8 @@ TextureImporter:
       name: "\u4E0A\u88631\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 1685
-        y: 2271
+        x: 1868
+        y: 3174
         width: 57
         height: 56
       alignment: 0
@@ -274,8 +277,8 @@ TextureImporter:
       name: "\u8111\u58F31"
       rect:
         serializedVersion: 2
-        x: 953
-        y: 1050
+        x: 1623
+        y: 1298
         width: 644
         height: 389
       alignment: 0
@@ -326,8 +329,8 @@ TextureImporter:
       name: "\u8116\u5B50"
       rect:
         serializedVersion: 2
-        x: 4059
-        y: 4046
+        x: 1868
+        y: 3065
         width: 33
         height: 49
       alignment: 0
@@ -339,10 +342,10 @@ TextureImporter:
       name: "\u978B\u5B501"
       rect:
         serializedVersion: 2
-        x: 2203
-        y: 246
-        width: 29
-        height: 36
+        x: 3933
+        y: 3473
+        width: 1
+        height: 1
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -352,8 +355,8 @@ TextureImporter:
       name: "\u5634\u5DF41"
       rect:
         serializedVersion: 2
-        x: 4085
-        y: 3956
+        x: 3064
+        y: 2532
         width: 10
         height: 8
       alignment: 0
@@ -362,26 +365,26 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u773C\u775B1"
+      name: "\u773C\u775B\u8868\u60C51"
       rect:
         serializedVersion: 2
-        x: 2761
-        y: 2540
-        width: 262
-        height: 93
+        x: 2213
+        y: 2951
+        width: 225
+        height: 38
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u773C\u775B\u8868\u60C51"
+      name: "\u773C\u775B1"
       rect:
         serializedVersion: 2
-        x: 2213
-        y: 2951
-        width: 225
-        height: 38
+        x: 2761
+        y: 2540
+        width: 262
+        height: 93
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -404,8 +407,8 @@ TextureImporter:
       name: "\u4E0A\u88631\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3334
-        y: 2204
+        x: 1868
+        y: 3293
         width: 60
         height: 59
       alignment: 0
@@ -430,8 +433,8 @@ TextureImporter:
       name: 2
       rect:
         serializedVersion: 2
-        x: 2173
-        y: 244
+        x: 2440
+        y: 2951
         width: 28
         height: 38
       alignment: 0
@@ -547,8 +550,8 @@ TextureImporter:
       name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 3025
-        y: 2524
+        x: 3740
+        y: 2618
         width: 37
         height: 46
       alignment: 0
@@ -560,8 +563,8 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 3064
-        y: 2542
+        x: 4058
+        y: 3480
         width: 24
         height: 28
       alignment: 0
@@ -625,7 +628,7 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2789
+        x: 3361
         y: 3442
         width: 570
         height: 653
@@ -638,7 +641,7 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7EFF\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 3361
+        x: 2789
         y: 3442
         width: 570
         height: 653
@@ -651,7 +654,7 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u68D5\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
+        x: 1221
         y: 2505
         width: 608
         height: 504
@@ -664,7 +667,7 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 611
+        x: 1
         y: 2505
         width: 608
         height: 504
@@ -677,7 +680,7 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1221
+        x: 611
         y: 2505
         width: 608
         height: 504
@@ -703,8 +706,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 549
-        y: 602
+        x: 1599
+        y: 850
         width: 447
         height: 446
       alignment: 0
@@ -742,8 +745,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 383
-        y: 1735
+        x: 1831
+        y: 2221
         width: 380
         height: 768
       alignment: 0
@@ -755,8 +758,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 1599
-        y: 850
+        x: 1419
+        y: 3063
         width: 447
         height: 446
       alignment: 0
@@ -768,8 +771,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 1831
-        y: 2221
+        x: 383
+        y: 1735
         width: 380
         height: 768
       alignment: 0
@@ -781,8 +784,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 1419
-        y: 3063
+        x: 549
+        y: 602
         width: 447
         height: 446
       alignment: 0
@@ -794,7 +797,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u6A59)"
       rect:
         serializedVersion: 2
-        x: 1299
+        x: 650
         y: 3511
         width: 647
         height: 584
@@ -807,7 +810,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 650
+        x: 1299
         y: 3511
         width: 647
         height: 584
@@ -846,8 +849,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 2520
-        y: 2942
+        x: 1
+        y: 3011
         width: 707
         height: 498
       alignment: 0
@@ -859,7 +862,7 @@ TextureImporter:
       name: "\u5934\u53D18(\u7EFF)"
       rect:
         serializedVersion: 2
-        x: 1
+        x: 710
         y: 3011
         width: 707
         height: 498
@@ -872,8 +875,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u9ED1)"
       rect:
         serializedVersion: 2
-        x: 710
-        y: 3011
+        x: 2520
+        y: 2942
         width: 707
         height: 498
       alignment: 0
@@ -885,8 +888,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u68D5\u8272)"
       rect:
         serializedVersion: 2
-        x: 1623
-        y: 1298
+        x: 2099
+        y: 1830
         width: 644
         height: 389
       alignment: 0
@@ -898,8 +901,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 2099
-        y: 1830
+        x: 953
+        y: 1050
         width: 644
         height: 389
       alignment: 0
@@ -937,8 +940,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u68D5\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 1147
-        y: 1973
+        x: 1
+        y: 1203
         width: 474
         height: 530
       alignment: 0
@@ -950,8 +953,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 1147
-        y: 1441
+        x: 477
+        y: 1203
         width: 474
         height: 530
       alignment: 0
@@ -963,8 +966,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 477
-        y: 1203
+        x: 1147
+        y: 1441
         width: 474
         height: 530
       alignment: 0
@@ -976,8 +979,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1203
+        x: 1147
+        y: 1973
         width: 474
         height: 530
       alignment: 0
@@ -989,7 +992,7 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 549
+        x: 998
         y: 216
         width: 442
         height: 384
@@ -1015,7 +1018,7 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 998
+        x: 549
         y: 216
         width: 442
         height: 384
@@ -1106,7 +1109,7 @@ TextureImporter:
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 788
+        x: 1090
         y: 19
         width: 300
         height: 195
@@ -1132,7 +1135,7 @@ TextureImporter:
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 1090
+        x: 788
         y: 19
         width: 300
         height: 195
@@ -1145,8 +1148,8 @@ TextureImporter:
       name: "\u88D9\u5B504"
       rect:
         serializedVersion: 2
-        x: 2574
-        y: 780
+        x: 2457
+        y: 922
         width: 201
         height: 140
       alignment: 0
@@ -1158,8 +1161,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 2457
-        y: 922
+        x: 2574
+        y: 780
         width: 201
         height: 140
       alignment: 0
@@ -1249,8 +1252,8 @@ TextureImporter:
       name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 3740
-        y: 2666
+        x: 3443
+        y: 2336
         width: 338
         height: 274
       alignment: 0
@@ -1262,8 +1265,8 @@ TextureImporter:
       name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 3443
-        y: 2336
+        x: 3740
+        y: 2666
         width: 338
         height: 274
       alignment: 0
@@ -1275,8 +1278,8 @@ TextureImporter:
       name: 3
       rect:
         serializedVersion: 2
-        x: 4059
-        y: 4006
+        x: 2470
+        y: 2951
         width: 28
         height: 38
       alignment: 0
@@ -1288,8 +1291,8 @@ TextureImporter:
       name: 4
       rect:
         serializedVersion: 2
-        x: 4059
-        y: 3966
+        x: 2173
+        y: 244
         width: 28
         height: 38
       alignment: 0
@@ -1301,8 +1304,8 @@ TextureImporter:
       name: 5
       rect:
         serializedVersion: 2
-        x: 3396
-        y: 2197
+        x: 3397
+        y: 2192
         width: 36
         height: 66
       alignment: 0
@@ -1314,8 +1317,8 @@ TextureImporter:
       name: 6
       rect:
         serializedVersion: 2
-        x: 2474
-        y: 2949
+        x: 1903
+        y: 3074
         width: 32
         height: 40
       alignment: 0
@@ -1327,8 +1330,8 @@ TextureImporter:
       name: 7
       rect:
         serializedVersion: 2
-        x: 4058
-        y: 3540
+        x: 3402
+        y: 2260
         width: 36
         height: 66
       alignment: 0
@@ -1341,7 +1344,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 4058
-        y: 3483
+        y: 3558
         width: 33
         height: 55
       alignment: 0
@@ -1366,8 +1369,8 @@ TextureImporter:
       name: 10
       rect:
         serializedVersion: 2
-        x: 2440
-        y: 2948
+        x: 1899
+        y: 3022
         width: 32
         height: 41
       alignment: 0
@@ -1379,8 +1382,8 @@ TextureImporter:
       name: 11
       rect:
         serializedVersion: 2
-        x: 4059
-        y: 3936
+        x: 3064
+        y: 2542
         width: 24
         height: 28
       alignment: 0
@@ -1392,8 +1395,8 @@ TextureImporter:
       name: 12
       rect:
         serializedVersion: 2
-        x: 3397
-        y: 2280
+        x: 4058
+        y: 3510
         width: 37
         height: 46
       alignment: 0
@@ -1405,8 +1408,8 @@ TextureImporter:
       name: 13
       rect:
         serializedVersion: 2
-        x: 3740
-        y: 2618
+        x: 3025
+        y: 2524
         width: 37
         height: 46
       alignment: 0
@@ -1574,8 +1577,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 2618
-        y: 338
+        x: 3938
+        y: 3137
         width: 119
         height: 111
       alignment: 0
@@ -1652,8 +1655,8 @@ TextureImporter:
       name: "\u4E0A\u886313"
       rect:
         serializedVersion: 2
-        x: 1447
-        y: 886
+        x: 3933
+        y: 3933
         width: 124
         height: 162
       alignment: 0
@@ -1691,8 +1694,8 @@ TextureImporter:
       name: "\u4E0A\u886313(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 3933
-        y: 3933
+        x: 1447
+        y: 886
         width: 124
         height: 162
       alignment: 0
@@ -1704,8 +1707,8 @@ TextureImporter:
       name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 3938
-        y: 3137
+        x: 2618
+        y: 338
         width: 119
         height: 111
       alignment: 0
@@ -1743,8 +1746,8 @@ TextureImporter:
       name: "\u7981\u6B62\u6807\u5FD7"
       rect:
         serializedVersion: 2
-        x: 4059
-        y: 3933
+        x: 4058
+        y: 3477
         width: 1
         height: 1
       alignment: 0
@@ -1756,8 +1759,8 @@ TextureImporter:
       name: "\u4E0A\u886312\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1831
-        y: 2995
+        x: 4006
+        y: 2956
         width: 66
         height: 66
       alignment: 0
@@ -1769,8 +1772,8 @@ TextureImporter:
       name: "\u4E0A\u886312\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 4026
-        y: 3608
+        x: 3334
+        y: 2197
         width: 61
         height: 61
       alignment: 0
@@ -1782,8 +1785,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4021
-        y: 3865
+        x: 4026
+        y: 3615
         width: 66
         height: 66
       alignment: 0
@@ -1795,8 +1798,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 3334
-        y: 2265
+        x: 1809
+        y: 602
         width: 61
         height: 61
       alignment: 0
@@ -1808,8 +1811,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 2663
-        y: 2240
+        x: 3938
+        y: 2956
         width: 66
         height: 66
       alignment: 0
@@ -1834,8 +1837,8 @@ TextureImporter:
       name: "\u4E0A\u88632\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1623
-        y: 2268
+        x: 1868
+        y: 3232
         width: 60
         height: 59
       alignment: 0
@@ -1847,8 +1850,8 @@ TextureImporter:
       name: "\u4E0A\u88632\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 1744
-        y: 2271
+        x: 1868
+        y: 3116
         width: 57
         height: 56
       alignment: 0
@@ -1860,8 +1863,8 @@ TextureImporter:
       name: "\u4E0A\u88636\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3938
-        y: 2956
+        x: 3334
+        y: 2260
         width: 66
         height: 66
       alignment: 0
@@ -1873,8 +1876,8 @@ TextureImporter:
       name: "\u4E0A\u88636\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 1809
-        y: 602
+        x: 1623
+        y: 2266
         width: 61
         height: 61
       alignment: 0
@@ -1886,8 +1889,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4006
-        y: 2956
+        x: 2663
+        y: 2240
         width: 66
         height: 66
       alignment: 0
@@ -1899,8 +1902,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 4026
-        y: 3671
+        x: 1749
+        y: 2266
         width: 61
         height: 61
       alignment: 0
@@ -1912,8 +1915,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 4026
-        y: 3734
+        x: 1686
+        y: 2266
         width: 61
         height: 61
       alignment: 0
@@ -1925,8 +1928,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4021
-        y: 3797
+        x: 1831
+        y: 2995
         width: 66
         height: 66
       alignment: 0
@@ -1964,8 +1967,8 @@ TextureImporter:
       name: "\u7CFB\u7EDF\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2303
-        y: 1447
+        x: 2457
+        y: 1064
         width: 407
         height: 381
       alignment: 0
@@ -1977,8 +1980,8 @@ TextureImporter:
       name: "\u82B1\u6735\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2048
-        y: 915
+        x: 2303
+        y: 1447
         width: 407
         height: 381
       alignment: 0
@@ -2003,8 +2006,8 @@ TextureImporter:
       name: "\u94BB\u77F3\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2457
-        y: 1064
+        x: 2048
+        y: 915
         width: 407
         height: 381
       alignment: 0
@@ -2129,6 +2132,32 @@ TextureImporter:
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B5014-1"
+      rect:
+        serializedVersion: 2
+        x: 4026
+        y: 3683
+        width: 60
+        height: 121
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B5014-2"
+      rect:
+        serializedVersion: 2
+        x: 4021
+        y: 3806
+        width: 59
+        height: 125
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
     outline: []
   spritePackingTag: 
   userData: 

+ 84 - 12
Assets/Resource/DragonBones/DragonBones/src/DragonBones/factory/BaseFactory.cs

@@ -42,11 +42,11 @@ namespace DragonBones
         /**
          * @private
          */
-        protected readonly Dictionary<string, DragonBonesData> _dragonBonesDataMap = new Dictionary<string, DragonBonesData>();
+        public readonly Dictionary<string, DragonBonesData> _dragonBonesDataMap = new Dictionary<string, DragonBonesData>();
         /**
          * @private
          */
-        protected readonly Dictionary<string, List<TextureAtlasData>> _textureAtlasDataMap = new Dictionary<string, List<TextureAtlasData>>();
+        public readonly Dictionary<string, List<TextureAtlasData>> _textureAtlasDataMap = new Dictionary<string, List<TextureAtlasData>>();
         /** 
          * @private 
          */
@@ -62,7 +62,7 @@ namespace DragonBones
         /** 
          * @private 
          */
-        protected TextureData _getTextureData(string textureAtlasName, string textureName)
+        public TextureData _getTextureData(string textureAtlasName, string textureName)
         {
             if (_textureAtlasDataMap.ContainsKey(textureAtlasName))
             {
@@ -649,15 +649,87 @@ namespace DragonBones
                 }
             }
         }
-        /**
-         * @language zh_CN
-         * 用指定资源列表替换插槽的显示对象列表。
-         * @param dragonBonesName 指定的 DragonBonesData 名称。
-         * @param armatureName 指定的骨架名称。
-         * @param slotName 指定的插槽名称。
-         * @param slot 指定的插槽实例。
-         * @version DragonBones 4.5
-         */
+
+        public void ReplaceSlotDisplay(string dragonBonesName, string armatureName, string slotName, string displayName, Slot slot, Texture2D texture, Material material, int displayIndex = -1)
+        {
+            var dataPackage = new BuildArmaturePackage();
+            if (_fillBuildArmaturePackage(dataPackage, dragonBonesName, armatureName, null, null))
+            {
+                DisplayData prevDispalyData = null;
+                var slotDisplayDataSet = dataPackage.skin.GetSlot(slotName);
+                if (slotDisplayDataSet != null)
+                {
+                    foreach (var displayData in slotDisplayDataSet.displays)
+                    {
+                        if (displayData.name == displayName)
+                        {
+                            prevDispalyData = displayData;
+                            _replaceSlotDisplay(dataPackage, displayData, slot, displayIndex);
+                            break;
+                        }
+                    }
+                }
+
+                if (prevDispalyData == null)
+                {
+                    return;
+                }
+
+                TextureData prevTextureData = prevDispalyData.texture;
+                UnityTextureData newTextureData = new UnityTextureData();
+                newTextureData.CopyFrom(prevTextureData);
+                newTextureData.rotated = false;
+                newTextureData.region.x = 0f;
+                newTextureData.region.y = 0f;
+                newTextureData.region.width = texture.width;
+                newTextureData.region.height = texture.height;
+                newTextureData.frame = newTextureData.region;
+                newTextureData.name = prevTextureData.name;
+                newTextureData.parent = new UnityTextureAtlasData();
+                newTextureData.parent.width = texture.width;
+                newTextureData.parent.height = texture.height;
+                (newTextureData.parent as UnityTextureAtlasData).texture = material;
+                material.mainTexture = texture;
+
+                DisplayData newDisplayData = new DisplayData();
+                newDisplayData.armature = prevDispalyData.armature;
+                newDisplayData.boundingBox = prevDispalyData.boundingBox;
+                newDisplayData.inheritAnimation = prevDispalyData.inheritAnimation;
+                newDisplayData.isRelativePivot = prevDispalyData.isRelativePivot;
+                newDisplayData.name = prevDispalyData.name;
+                newDisplayData.pivot.CopyFrom(prevDispalyData.pivot);
+                newDisplayData.texture = newTextureData;
+                newDisplayData.type = prevDispalyData.type;
+                newDisplayData.transform.CopyFrom(prevDispalyData.transform);
+                newDisplayData.mesh = prevDispalyData.mesh;
+                if (newDisplayData.mesh != null && newDisplayData.mesh.uvs != null)
+                {
+                    List<float> uvs = new List<float>();
+                    for (int i = 0; i < newDisplayData.mesh.uvs.Count; i += 2)
+                    {
+                        Vector2 uv = new Vector2(newDisplayData.mesh.uvs[i], newDisplayData.mesh.uvs[i + 1]);
+                        Vector2 uvPos = new Vector2(newTextureData.frame.x, -newTextureData.frame.y) +
+                                        new Vector2(newTextureData.frame.width * uv.x, newTextureData.frame.height * uv.y);
+                        uv.x = uvPos.x / newTextureData.frame.width;
+                        uv.y = uvPos.y / newTextureData.frame.height;
+                        uvs.Add(uv.x);
+                        uvs.Add(uv.y);
+                    }
+                    newDisplayData.mesh.uvs.Clear();
+                    newDisplayData.mesh.uvs.AddRange(uvs);
+                }
+                _replaceSlotDisplay(dataPackage, newDisplayData, slot, displayIndex);
+            }
+        }
+    /**
+     * @language zh_CN
+     * 用指定资源列表替换插槽的显示对象列表。
+     * @param dragonBonesName 指定的 DragonBonesData 名称。
+     * @param armatureName 指定的骨架名称。
+     * @param slotName 指定的插槽名称。
+     * @param slot 指定的插槽实例。
+     * @version DragonBones 4.5
+     */
         public void ReplaceSlotDisplayList(string dragonBonesName, string armatureName, string slotName, Slot slot)
         {
             var dataPackage = new BuildArmaturePackage();

+ 2 - 106
Assets/Resource/Logo.unity

@@ -585,110 +585,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &1822613930
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_Name
-      value: Canvas (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -716,9 +612,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AuditEdition: 1
+  AuditEdition: 0
   DebugMode: 1
-  CatchException: 1
+  CatchException: 0
   DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
     type: 2}
 --- !u!4 &1833966245

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

@@ -18053,7 +18053,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1994725287995210
 GameObject:
   m_ObjectHideFlags: 1
@@ -67862,9 +67862,9 @@ RectTransform:
   m_Father: {fileID: 224683451766537248}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -15}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224125534998707658
@@ -70747,10 +70747,10 @@ RectTransform:
   m_Father: {fileID: 224683451766537248}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -45}
-  m_SizeDelta: {x: 800, y: 30}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 800, y: 49}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224289263350337514
 RectTransform:
@@ -78946,8 +78946,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.00002670288, y: -190.5}
-  m_SizeDelta: {x: 100, y: 60}
+  m_AnchoredPosition: {x: 0.00002670288, y: -190.2}
+  m_SizeDelta: {x: 100, y: 61.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224684846496047688
 RectTransform:

+ 5 - 4
Assets/Resource/XML/Config/new_dressRoom_config.xml

@@ -1,8 +1,9 @@
 <data>
-  <item id="31" jump_frequency="" type="1" index="29" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发14(粉色)" spriteAlpha="" armatureName="头发14(粉色)" extraBodypart="" extraArmatureName="" ignore="1" />
-  <item id="218" jump_frequency="" type="3" index="17" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14" spriteAlpha="" armatureName="下衣14" extraBodypart="" extraArmatureName="" ignore="1" />
-  <item id="613" jump_frequency="" type="4" index="12" bodypart="4" level="50" buy_currency="2" buy_amt="450" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="" icon2offset="" spriteName="装饰14" spriteAlpha="" armatureName="装饰14" extraBodypart="" extraArmatureName="" ignore="1" />
-  <item id="818" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="750" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="1" />
+  <item id="31" jump_frequency="" type="1" index="29" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发14(粉色)" spriteAlpha="" armatureName="头发14(粉色)" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="218" jump_frequency="" type="3" index="17" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14" spriteAlpha="" armatureName="下衣14" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="613" jump_frequency="" type="4" index="12" bodypart="4" level="50" buy_currency="2" buy_amt="450" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="" icon2offset="" spriteName="装饰14" spriteAlpha="" armatureName="装饰14" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="818" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="750" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="" />
+  <item id="416" jump_frequency="" type="6" index="15" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子14-1,鞋子14-2" spriteAlpha="" armatureName="鞋子16" extraBodypart="" extraArmatureName="" ignore="" />
   <comment>
     <id>
 id

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

@@ -1,5 +1,5 @@
 <data>
-  <item id="36" name="花" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" />
+  <item id="36" name="鸡冠(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" />
   <comment>
     <id>
 id

+ 3 - 1
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -181,7 +181,9 @@
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
     <U_Lab desc=""><![CDATA[加载中…]]></U_Lab>
     <U_WarningTitle desc=""><![CDATA[健康游戏忠告]]></U_WarningTitle>
-    <U_WarningText desc=""><![CDATA[健康游戏忠告  抵制不良游戏,拒绝盗版游戏。注意自我保护,谨防受骗上当。适度游戏益脑,沉迷游戏伤身。合理安排时间,享受健康生活。]]></U_WarningText>
+    <U_WarningText desc=""><![CDATA[抵制不良游戏,拒绝盗版游戏。注意自我保护,谨防受骗上当。适度游戏益脑,沉迷游戏伤身。合理安排时间,享受健康生活。
+批准文号:  新广出审[2018]1713 号   ISBN:978-7-498-05050-2   沪网文(2016)1831-087号
+文网游备字文网游备字〔2018〕M-CSG 0675 号   新出网证(沪)字39号   著作权人:重庆极风游科技有限公司   出版单位:上海隐志网络科技有限公司]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖,3次机会]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花朵原来的颜色即可领奖,例如“红”“黄”“蓝”,3次机会]]></Y_GuessColorDesc>

+ 3 - 1
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -181,7 +181,9 @@
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
     <U_Lab desc=""><![CDATA[加載中…]]></U_Lab>
     <U_WarningTitle desc=""><![CDATA[我的甜蜜花園]]></U_WarningTitle>
-    <U_WarningText desc=""><![CDATA[[%value%]]]></U_WarningText>
+    <U_WarningText desc=""><![CDATA[抵制不良遊戲,拒絕盜版遊戲。註意自我保護,謹防受騙上當。適度遊戲益腦,沈迷遊戲傷身。合理安排時間,享受健康生活。
+批準文號:  新廣出審[2018]1713 號   ISBN:978-7-498-05050-2   滬網文(2016)1831-087號
+文網遊備字文網遊備字〔2018〕M-CSG 0675 號   新出網證(滬)字39號   著作權人:重慶極風遊科技有限公司   出版單位:上海隱誌網絡科技有限公司]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎,3次機會]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花朵原來的顏色即可領獎,例如“紅”“黃”“藍”,3次機會]]></Y_GuessColorDesc>

binární
Assets/Resource/Xlsx/language_config.xlsx


binární
Assets/Resource/Xlsx/new_dressRoom_config.xlsx


+ 24 - 0
Assets/Script/Extension/SpriteExtension.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+public static class SpriteExtension
+{
+    public static Texture2D ToTexture(this Sprite sprite)
+    {
+        int width = (int)sprite.rect.width;
+        int height = (int)sprite.rect.height;
+        int startX = (int)sprite.rect.x;
+        int startY = (int)sprite.rect.y;
+        //Debug.Log(width);
+        //Debug.Log(height);
+        //Debug.Log(startX);
+        //Debug.Log(startY);
+        Texture2D texture = new Texture2D(width, height);
+        texture.SetPixels(sprite.texture.GetPixels(startX, startY, width, height));
+        texture.Apply();
+        return texture;
+    }
+}

+ 12 - 0
Assets/Script/Extension/SpriteExtension.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: fddfd5b4515350b4bb0b228eb8eea061
+timeCreated: 1522396013
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1990,7 +1990,7 @@ public class HttpManager : Regist
             return content;
         }
     }
-
+    
 
     public static void GetCompensateOfflineIncome()
     {

+ 3 - 1
Assets/Script/Manage/Initializer.cs

@@ -483,11 +483,13 @@ public class Initializer : MonoBehaviour
         ResourceManager.SetText(CanvasLabel.U_WarningTitle, Language.GetStr(LanguageLabel.UI__U_WarningTitle, language));
         if (language == SystemLanguage.ChineseSimplified)
         {
+            ResourceManager.SetActive(CanvasLabel.U_WarningTitle, false);
             ResourceManager.SetText(CanvasLabel.U_WarningText, Language.GetStr(LanguageLabel.UI__U_WarningText, language));
         }
         else if (language == SystemLanguage.ChineseTraditional)
         {
-            ResourceManager.SetActive(CanvasLabel.U_WarningText, false);
+            ResourceManager.SetActive(CanvasLabel.U_WarningTitle, false);
+            ResourceManager.SetText(CanvasLabel.U_WarningText, Language.GetStr(LanguageLabel.UI__U_WarningText, language));
         }
         else
         {

+ 28 - 0
Assets/Script/Manage/PlayerManager.cs

@@ -36,6 +36,7 @@ public class PlayerManager : Regist
     public static Dictionary<int, CloseItem> CloseItemDictionary = new Dictionary<int, CloseItem>();
     public static Dictionary<string, int> CloseIDDictionary = new Dictionary<string, int>();
     public static Dictionary<string, Sprite> CloseSpriteDictionary = new Dictionary<string, Sprite>();
+    public static Dictionary<string, Texture2D> CloseTextureDictionary = new Dictionary<string, Texture2D>();
 
     #endregion
 
@@ -225,9 +226,36 @@ public class PlayerManager : Regist
 
     public static void InitDressRoom()
     {
+        foreach (var kv in CloseItemDictionary)
+        {
+            Debug.Log(kv.Value.ArmatureName);
+        }
         for (int i = 0; i < BoughtCloseIDs.Count; i++)
         {
             CloseItemDictionary[BoughtCloseIDs[i]].Unlock();
         }
     }
+
+
+    public static Texture2D GetCloseTexture(string closeName)
+    {
+        if (CloseTextureDictionary.ContainsKey(closeName))
+        {
+            return CloseTextureDictionary[closeName];
+        }
+        else
+        {
+            if (CloseSpriteDictionary.ContainsKey(closeName))
+            {
+                Texture2D texture = CloseSpriteDictionary[closeName].ToTexture();
+                CloseTextureDictionary.Add(closeName, texture);
+                return texture;
+            }
+            else
+            {
+                Debug.LogError("");
+                return null;
+            }
+        }
+    }
 }

+ 20 - 3
Assets/Script/Object/Player.cs

@@ -1727,10 +1727,27 @@ public class Player : Regist , IPointerClickHandler
         }
         else if (bodyPart == BodyPart.Shoe)
         {
-            Shoe = armatureName;
+            //Shoe = armatureName;
+            //slotList.Add(LeftShoeSlot);
+            //slotList.Add(RightShoeSlot);
 
-            slotList.Add(LeftShoeSlot);
-            slotList.Add(RightShoeSlot);
+            Shoe = armatureName;
+            int id = PlayerManager.CloseIDDictionary[armatureName];
+            CloseItem closeItem = PlayerManager.CloseItemDictionary[id];
+            Texture2D leftTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[0].name);
+            Texture2D rightTexture;
+            if (closeItem.Sprites.Length == 1)
+            {
+                rightTexture = leftTexture;
+            }
+            else
+            {
+                rightTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[1].name);
+            }
+            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子左", "鞋子1", LeftShoeSlot, 
+                leftTexture, new Material(Shader.Find("Sprites/Default")));
+            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子右", "鞋子1", RightShoeSlot,
+                rightTexture, new Material(Shader.Find("Sprites/Default")));
         }
         else if (bodyPart == BodyPart.Head)
         {

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

@@ -795,12 +795,12 @@ public class Bundle : MonoBehaviour
                 //Debug.Log(localMD5);
                 //Debug.Log(HttpManager.Md5);
                 needUpdate = localMD5 != HttpManager.Md5;
-                Debug.LogWarning($"NeedUpdate : {needUpdate}");
+                //Debug.LogWarning($"NeedUpdate : {needUpdate}");
+            }
+            if (Application.isEditor)
+            {
+                needUpdate = false;
             }
-            //if (Application.isEditor)
-            //{
-            //    needUpdate = false;
-            //}
             AssetBundleUtility.OnDownloadOrUpdateFinish += FinishDownloadAndLoad;
             if (needUpdate)
             {

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

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů