Browse Source

增加眼睛和嘴巴

liuqilin 7 years ago
parent
commit
378b4ff417

BIN
.vs/Garden5_2017/v15/Server/sqlite3/storage.ide


BIN
.vs/Garden5_2017/v15/Server/sqlite3/storage.ide-shm


BIN
.vs/Garden5_2017/v15/Server/sqlite3/storage.ide-wal


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


+ 243 - 150
Assets/Resource/Animations/人物动画/stand_texture_0.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c486bd2e1e577b24a86013546709abda
-timeCreated: 1525401186
+timeCreated: 1525779783
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -208,6 +208,15 @@ TextureImporter:
     21300402: "\u5934\u53D117-3\u540E"
     21300404: "\u88D9\u5B5017_1"
     21300406: "\u978B\u5B5018"
+    21300408: "\u5934\u53D117-1\u540E"
+    21300410: "\u773C\u775B6-wh"
+    21300412: "\u56344"
+    21300414: "\u56345-w"
+    21300416: "\u56346-h"
+    21300418: "\u56347"
+    21300420: "\u56348"
+    21300422: "\u56349"
+    21300424: "\u773C\u775B8-h_1"
   externalObjects: {}
   serializedVersion: 4
   mipmaps:
@@ -326,8 +335,8 @@ TextureImporter:
       name: "\u4E0A\u88631\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 3358
-        y: 753
+        x: 554
+        y: 1736
         width: 57
         height: 56
       alignment: 0
@@ -365,6 +374,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u88D9\u5B501"
+      rect:
+        serializedVersion: 2
+        x: 3427
+        y: 2948
+        width: 212
+        height: 142
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u5DE6\u624B\u770B\u6E05\u5DE6\u624B\u4F60\u7684\u5DE6\u624B\uFF01\uFF01"
       rect:
         serializedVersion: 2
@@ -396,8 +419,8 @@ TextureImporter:
       name: "\u5634\u5DF41"
       rect:
         serializedVersion: 2
-        x: 4025
-        y: 370
+        x: 653
+        y: 3045
         width: 56
         height: 35
       alignment: 0
@@ -467,7 +490,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1678
-        y: 32
+        y: 458
         width: 548
         height: 424
       alignment: 0
@@ -481,7 +504,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3427
-        y: 2660
+        y: 2804
         width: 212
         height: 142
       alignment: 0
@@ -494,8 +517,8 @@ TextureImporter:
       name: "\u5634\u5DF42"
       rect:
         serializedVersion: 2
-        x: 4016
-        y: 1681
+        x: 721
+        y: 3049
         width: 56
         height: 35
       alignment: 0
@@ -508,8 +531,8 @@ TextureImporter:
       name: "\u5634\u5DF43"
       rect:
         serializedVersion: 2
-        x: 554
-        y: 1699
+        x: 3915
+        y: 759
         width: 56
         height: 35
       alignment: 0
@@ -561,25 +584,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B502"
-      rect:
-        serializedVersion: 2
-        x: 3427
-        y: 2948
-        width: 212
-        height: 142
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-    - serializedVersion: 2
       name: "\u5934\u53D14\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1530
-        y: 2190
+        x: 2373
+        y: 3437
         width: 572
         height: 657
       alignment: 0
@@ -592,8 +601,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2373
-        y: 3437
+        x: 1530
+        y: 2849
         width: 572
         height: 657
       alignment: 0
@@ -607,7 +616,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1530
-        y: 2849
+        y: 2190
         width: 572
         height: 657
       alignment: 0
@@ -620,8 +629,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u68D5\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 1857
+        x: 2815
+        y: 2584
         width: 610
         height: 506
       alignment: 0
@@ -634,8 +643,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2815
-        y: 2584
+        x: 2
+        y: 2365
         width: 610
         height: 506
       alignment: 0
@@ -649,7 +658,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2
-        y: 2365
+        y: 1857
         width: 610
         height: 506
       alignment: 0
@@ -662,8 +671,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 3658
-        y: 3324
+        x: 2104
+        y: 2163
         width: 382
         height: 770
       alignment: 0
@@ -676,8 +685,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 3464
-        y: 752
+        x: 3227
+        y: 2102
         width: 449
         height: 448
       alignment: 0
@@ -704,8 +713,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 3227
-        y: 2102
+        x: 3464
+        y: 1202
         width: 449
         height: 448
       alignment: 0
@@ -718,8 +727,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 2104
-        y: 2163
+        x: 3658
+        y: 2552
         width: 382
         height: 770
       alignment: 0
@@ -733,7 +742,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3464
-        y: 1202
+        y: 752
         width: 449
         height: 448
       alignment: 0
@@ -747,7 +756,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3658
-        y: 2552
+        y: 3324
         width: 382
         height: 770
       alignment: 0
@@ -788,8 +797,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 1722
-        y: 3508
+        x: 879
+        y: 3039
         width: 649
         height: 586
       alignment: 0
@@ -802,8 +811,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u84DD\u8272)"
       rect:
         serializedVersion: 2
-        x: 879
-        y: 3039
+        x: 1722
+        y: 3508
         width: 649
         height: 586
       alignment: 0
@@ -816,8 +825,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2104
-        y: 2935
+        x: 653
+        y: 2030
         width: 709
         height: 500
       alignment: 0
@@ -830,8 +839,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 2947
-        y: 3594
+        x: 2104
+        y: 2935
         width: 709
         height: 500
       alignment: 0
@@ -844,8 +853,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7EFF)"
       rect:
         serializedVersion: 2
-        x: 653
-        y: 2030
+        x: 2947
+        y: 3594
         width: 709
         height: 500
       alignment: 0
@@ -872,8 +881,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u68D5\u8272)"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 176
+        x: 1748
+        y: 1770
         width: 646
         height: 391
       alignment: 0
@@ -886,8 +895,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 1748
-        y: 1770
+        x: 480
+        y: 176
         width: 646
         height: 391
       alignment: 0
@@ -900,8 +909,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 1678
-        y: 458
+        x: 1128
+        y: 32
         width: 548
         height: 424
       alignment: 0
@@ -928,8 +937,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u68D5\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 1364
-        y: 884
+        x: 2
+        y: 789
         width: 476
         height: 532
       alignment: 0
@@ -942,8 +951,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 1323
+        x: 614
+        y: 1496
         width: 476
         height: 532
       alignment: 0
@@ -956,8 +965,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 614
-        y: 962
+        x: 1364
+        y: 884
         width: 476
         height: 532
       alignment: 0
@@ -970,8 +979,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 614
-        y: 1496
+        x: 2
+        y: 1323
         width: 476
         height: 532
       alignment: 0
@@ -981,13 +990,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
+      name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 789
-        width: 476
-        height: 532
+        x: 3579
+        y: 364
+        width: 444
+        height: 386
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -995,13 +1004,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
+      name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2228
-        y: 14
-        width: 444
-        height: 386
+        x: 614
+        y: 962
+        width: 476
+        height: 532
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1012,8 +1021,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 3579
-        y: 364
+        x: 2228
+        y: 14
         width: 444
         height: 386
       alignment: 0
@@ -1093,7 +1102,7 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 10
+      name: 5
       rect:
         serializedVersion: 2
         x: 4025
@@ -1107,7 +1116,7 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 11
+      name: 6
       rect:
         serializedVersion: 2
         x: 480
@@ -1121,11 +1130,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 12
+      name: 7
       rect:
         serializedVersion: 2
         x: 480
-        y: 1289
+        y: 1153
         width: 66
         height: 134
       alignment: 0
@@ -1233,13 +1242,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886313"
+      name: "\u4E0A\u886310"
       rect:
         serializedVersion: 2
-        x: 1364
-        y: 2205
-        width: 124
-        height: 162
+        x: 3915
+        y: 864
+        width: 179
+        height: 144
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1247,13 +1256,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+      name: "\u4E0A\u886313"
       rect:
         serializedVersion: 2
-        x: 3915
-        y: 864
-        width: 179
-        height: 144
+        x: 1364
+        y: 2205
+        width: 124
+        height: 162
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1278,8 +1287,8 @@ TextureImporter:
       name: "\u7981\u6B62\u6807\u5FD7"
       rect:
         serializedVersion: 2
-        x: 2674
-        y: 399
+        x: 538
+        y: 1014
         width: 1
         height: 1
       alignment: 0
@@ -1292,7 +1301,7 @@ TextureImporter:
       name: "\u4E0A\u886312\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3563
+        x: 3427
         y: 2592
         width: 66
         height: 66
@@ -1320,8 +1329,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4016
-        y: 1718
+        x: 653
+        y: 3082
         width: 66
         height: 66
       alignment: 0
@@ -1335,7 +1344,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 548
-        y: 1258
+        y: 1195
         width: 61
         height: 61
       alignment: 0
@@ -1348,8 +1357,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3998
-        y: 32
+        x: 3495
+        y: 2592
         width: 66
         height: 66
       alignment: 0
@@ -1362,8 +1371,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 1128
-        y: 929
+        x: 548
+        y: 1258
         width: 61
         height: 61
       alignment: 0
@@ -1390,8 +1399,8 @@ TextureImporter:
       name: "\u4E0A\u88632\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 554
-        y: 1736
+        x: 3358
+        y: 753
         width: 57
         height: 56
       alignment: 0
@@ -1404,8 +1413,8 @@ TextureImporter:
       name: "\u4E0A\u88636\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3495
-        y: 2592
+        x: 4016
+        y: 1718
         width: 66
         height: 66
       alignment: 0
@@ -1432,8 +1441,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 653
-        y: 3082
+        x: 3563
+        y: 2592
         width: 66
         height: 66
       alignment: 0
@@ -1460,8 +1469,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 548
-        y: 1195
+        x: 1128
+        y: 929
         width: 61
         height: 61
       alignment: 0
@@ -1474,8 +1483,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
@@ -1513,12 +1522,12 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
+      name: "\u6570\u5B57\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
         x: 3678
-        y: 1786
-        width: 407
+        y: 2169
+        width: 416
         height: 381
       alignment: 0
       pivot: {x: 0, y: 0}
@@ -1527,12 +1536,12 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u6570\u5B57\u5B9D\u7BB1"
+      name: "\u94BB\u77F3\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
         x: 3678
-        y: 2169
-        width: 416
+        y: 1786
+        width: 407
         height: 381
       alignment: 0
       pivot: {x: 0, y: 0}
@@ -1625,6 +1634,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B5015-1"
+      rect:
+        serializedVersion: 2
+        x: 480
+        y: 1289
+        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
@@ -1751,11 +1774,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014c"
+      name: "\u978B\u5B5014b"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 1017
+        x: 4025
+        y: 407
         width: 66
         height: 134
       alignment: 0
@@ -1793,7 +1816,7 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D111(\u68D5)\u540E"
+      name: "\u5934\u53D111(\u84DD)\u540E"
       rect:
         serializedVersion: 2
         x: 1092
@@ -1839,7 +1862,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1377
-        y: 2915
+        y: 2791
         width: 134
         height: 122
       alignment: 0
@@ -1853,7 +1876,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1377
-        y: 2791
+        y: 2915
         width: 134
         height: 122
       alignment: 0
@@ -2062,7 +2085,7 @@ TextureImporter:
       name: "\u8111\u58F3-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 1128
+        x: 1678
         y: 32
         width: 548
         height: 424
@@ -2077,7 +2100,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3427
-        y: 2804
+        y: 2660
         width: 212
         height: 142
       alignment: 0
@@ -2101,20 +2124,6 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B50-\u7F3A\u5931"
-      rect:
-        serializedVersion: 2
-        x: 480
-        y: 1153
-        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
@@ -2199,6 +2208,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u5934\u53D117-1\u540E"
+      rect:
+        serializedVersion: 2
+        x: 1842
+        y: 888
+        width: 367
+        height: 394
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u8896\u5B5017-1"
       rect:
         serializedVersion: 2
@@ -2230,8 +2253,8 @@ TextureImporter:
       name: "\u978B\u5B5018"
       rect:
         serializedVersion: 2
-        x: 4025
-        y: 407
+        x: 480
+        y: 1017
         width: 66
         height: 134
       alignment: 0
@@ -2241,13 +2264,83 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D117-3\u540E"
+      name: "\u56344"
       rect:
         serializedVersion: 2
-        x: 1842
-        y: 888
-        width: 367
-        height: 394
+        x: 538
+        y: 975
+        width: 56
+        height: 35
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u56345-w"
+      rect:
+        serializedVersion: 2
+        x: 554
+        y: 1699
+        width: 58
+        height: 35
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u56346-h"
+      rect:
+        serializedVersion: 2
+        x: 4025
+        y: 365
+        width: 56
+        height: 40
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u56347"
+      rect:
+        serializedVersion: 2
+        x: 779
+        y: 3049
+        width: 56
+        height: 35
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u56348"
+      rect:
+        serializedVersion: 2
+        x: 4016
+        y: 1681
+        width: 56
+        height: 35
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u56349"
+      rect:
+        serializedVersion: 2
+        x: 480
+        y: 980
+        width: 56
+        height: 35
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}

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


+ 263 - 168
Assets/Resource/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1525401202
+timeCreated: 1525779795
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -122,6 +122,17 @@ TextureImporter:
     21300230: "\u88D9\u5B50-\u7F3A\u5931"
     21300232: "\u5934\u53D117-1"
     21300234: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
+    21300236: "\u773C\u775B4"
+    21300238: "\u773C\u775B5-wh"
+    21300240: "\u773C\u775B7"
+    21300242: "\u773C\u775B8-h"
+    21300244: "\u773C\u775B9-w"
+    21300246: "\u773C\u775B4_1"
+    21300248: "\u773C\u775B5-wh_1"
+    21300250: "\u773C\u775B6-wh_1"
+    21300252: "\u773C\u775B7_1"
+    21300254: "\u773C\u775B9-w_1"
+    21300256: "\u773C\u775B8-h_2"
   externalObjects: {}
   serializedVersion: 4
   mipmaps:
@@ -223,25 +234,11 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: "\u88D9\u5B501"
-      rect:
-        serializedVersion: 2
-        x: 2679
-        y: 3296
-        width: 212
-        height: 142
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-    - serializedVersion: 2
       name: "\u978B\u5B5015-1_2"
       rect:
         serializedVersion: 2
-        x: 1022
-        y: 2814
+        x: 2879
+        y: 2703
         width: 66
         height: 134
       alignment: 0
@@ -254,8 +251,8 @@ TextureImporter:
       name: "\u978B\u5B5015-2_1"
       rect:
         serializedVersion: 2
-        x: 648
-        y: 2857
+        x: 1022
+        y: 2814
         width: 66
         height: 134
       alignment: 0
@@ -268,8 +265,8 @@ TextureImporter:
       name: "\u773C\u775B1"
       rect:
         serializedVersion: 2
-        x: 2613
-        y: 3102
+        x: 3572
+        y: 3111
         width: 264
         height: 95
       alignment: 0
@@ -282,8 +279,8 @@ TextureImporter:
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 2042
-        y: 2960
+        x: 3517
+        y: 2998
         width: 165
         height: 111
       alignment: 0
@@ -296,8 +293,8 @@ TextureImporter:
       name: 2
       rect:
         serializedVersion: 2
-        x: 1942
-        y: 2926
+        x: 3410
+        y: 2931
         width: 66
         height: 134
       alignment: 0
@@ -310,8 +307,8 @@ TextureImporter:
       name: "\u978B\u5B501"
       rect:
         serializedVersion: 2
-        x: 4015
-        y: 3072
+        x: 3282
+        y: 2818
         width: 66
         height: 134
       alignment: 0
@@ -324,8 +321,8 @@ TextureImporter:
       name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 1775
-        y: 2949
+        x: 3243
+        y: 2954
         width: 165
         height: 111
       alignment: 0
@@ -338,8 +335,8 @@ TextureImporter:
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 1608
-        y: 2953
+        x: 3047
+        y: 2865
         width: 165
         height: 111
       alignment: 0
@@ -353,7 +350,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2613
-        y: 3199
+        y: 2714
         width: 264
         height: 95
       alignment: 0
@@ -366,8 +363,8 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 3335
-        y: 3044
+        x: 3046
+        y: 2729
         width: 66
         height: 134
       alignment: 0
@@ -377,7 +374,21 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
+      name: "\u88D9\u5B502"
+      rect:
+        serializedVersion: 2
+        x: 2679
+        y: 3296
+        width: 212
+        height: 142
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
         x: 2
@@ -394,7 +405,7 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 3185
+        x: 3458
         y: 3484
         width: 271
         height: 184
@@ -408,7 +419,7 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 3458
+        x: 3185
         y: 3484
         width: 271
         height: 184
@@ -422,8 +433,8 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3007
+        x: 794
+        y: 3395
         width: 386
         height: 301
       alignment: 0
@@ -436,8 +447,8 @@ TextureImporter:
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 344
-        y: 2794
+        x: 3185
+        y: 3670
         width: 302
         height: 197
       alignment: 0
@@ -450,8 +461,8 @@ TextureImporter:
       name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
-        x: 794
-        y: 3395
+        x: 2
+        y: 3007
         width: 386
         height: 301
       alignment: 0
@@ -464,8 +475,8 @@ TextureImporter:
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 3185
-        y: 3670
+        x: 344
+        y: 2794
         width: 302
         height: 197
       alignment: 0
@@ -478,8 +489,8 @@ TextureImporter:
       name: "\u88D9\u5B504"
       rect:
         serializedVersion: 2
-        x: 2408
-        y: 3289
+        x: 2893
+        y: 3296
         width: 203
         height: 142
       alignment: 0
@@ -492,8 +503,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 2893
-        y: 3296
+        x: 2408
+        y: 3289
         width: 203
         height: 142
       alignment: 0
@@ -506,8 +517,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
@@ -520,8 +531,8 @@ TextureImporter:
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 2072
-        y: 3478
+        x: 2595
+        y: 3583
         width: 287
         height: 233
       alignment: 0
@@ -576,8 +587,8 @@ TextureImporter:
       name: 3
       rect:
         serializedVersion: 2
-        x: 3997
-        y: 3247
+        x: 3684
+        y: 2975
         width: 66
         height: 134
       alignment: 0
@@ -590,8 +601,8 @@ TextureImporter:
       name: 4
       rect:
         serializedVersion: 2
-        x: 3572
-        y: 3165
+        x: 3114
+        y: 2729
         width: 66
         height: 134
       alignment: 0
@@ -601,11 +612,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 5
+      name: 8
       rect:
         serializedVersion: 2
-        x: 3947
-        y: 3111
+        x: 4020
+        y: 2976
         width: 66
         height: 134
       alignment: 0
@@ -615,11 +626,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 6
+      name: 9
       rect:
         serializedVersion: 2
-        x: 1593
-        y: 2817
+        x: 3947
+        y: 3217
         width: 66
         height: 134
       alignment: 0
@@ -629,11 +640,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 7
+      name: 10
       rect:
         serializedVersion: 2
-        x: 1729
-        y: 2813
+        x: 4015
+        y: 3217
         width: 66
         height: 134
       alignment: 0
@@ -643,11 +654,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 8
+      name: 11
       rect:
         serializedVersion: 2
-        x: 1661
-        y: 2681
+        x: 648
+        y: 2721
         width: 66
         height: 134
       alignment: 0
@@ -657,11 +668,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 9
+      name: 12
       rect:
         serializedVersion: 2
-        x: 1797
-        y: 2813
+        x: 3997
+        y: 3383
         width: 66
         height: 134
       alignment: 0
@@ -716,8 +727,8 @@ TextureImporter:
       name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 794
-        y: 3086
+        x: 390
+        y: 2993
         width: 351
         height: 307
       alignment: 0
@@ -730,8 +741,8 @@ TextureImporter:
       name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 390
-        y: 2993
+        x: 794
+        y: 3086
         width: 351
         height: 307
       alignment: 0
@@ -744,8 +755,8 @@ TextureImporter:
       name: "\u4E0A\u88635"
       rect:
         serializedVersion: 2
-        x: 1874
-        y: 3062
+        x: 2879
+        y: 2952
         width: 166
         height: 114
       alignment: 0
@@ -758,8 +769,8 @@ TextureImporter:
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 2237
-        y: 3053
+        x: 3061
+        y: 2978
         width: 180
         height: 111
       alignment: 0
@@ -772,8 +783,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 2419
-        y: 3053
+        x: 3335
+        y: 3067
         width: 180
         height: 111
       alignment: 0
@@ -797,13 +808,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886310"
+      name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 1874
-        y: 3178
-        width: 179
-        height: 144
+        x: 2408
+        y: 3166
+        width: 186
+        height: 121
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -811,13 +822,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886311"
+      name: "\u4E0A\u886312"
       rect:
         serializedVersion: 2
-        x: 2679
-        y: 3460
-        width: 186
-        height: 121
+        x: 3838
+        y: 2999
+        width: 180
+        height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -825,13 +836,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886312"
+      name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 2879
-        y: 3068
-        width: 180
-        height: 111
+        x: 1874
+        y: 3178
+        width: 179
+        height: 144
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -842,8 +853,8 @@ TextureImporter:
       name: "\u4E0A\u886311(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2408
-        y: 3166
+        x: 2679
+        y: 3460
         width: 186
         height: 121
       alignment: 0
@@ -870,8 +881,8 @@ TextureImporter:
       name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 2055
-        y: 3073
+        x: 2879
+        y: 3068
         width: 180
         height: 111
       alignment: 0
@@ -895,11 +906,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u82B1\u6735\u5B9D\u7BB1"
+      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 1294
-        y: 3337
+        x: 2186
+        y: 3713
         width: 407
         height: 381
       alignment: 0
@@ -909,11 +920,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u94BB\u77F3\u5B9D\u7BB1"
+      name: "\u82B1\u6735\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2186
-        y: 3713
+        x: 1294
+        y: 3337
         width: 407
         height: 381
       alignment: 0
@@ -982,8 +993,8 @@ TextureImporter:
       name: "\u90C1\u95F7"
       rect:
         serializedVersion: 2
-        x: 2055
-        y: 3186
+        x: 3838
+        y: 3112
         width: 237
         height: 94
       alignment: 0
@@ -996,22 +1007,8 @@ TextureImporter:
       name: "\u978B\u5B5014-1"
       rect:
         serializedVersion: 2
-        x: 3997
-        y: 3383
-        width: 66
-        height: 134
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u978B\u5B5015-1"
-      rect:
-        serializedVersion: 2
-        x: 1865
-        y: 2813
+        x: 3752
+        y: 2975
         width: 66
         height: 134
       alignment: 0
@@ -1024,8 +1021,8 @@ TextureImporter:
       name: "\u978B\u5B5015-2"
       rect:
         serializedVersion: 2
-        x: 648
-        y: 2721
+        x: 2947
+        y: 2703
         width: 66
         height: 134
       alignment: 0
@@ -1052,8 +1049,8 @@ TextureImporter:
       name: "\u4E0B\u886314b\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 3682
-        y: 3208
+        x: 3417
+        y: 3301
         width: 263
         height: 137
       alignment: 0
@@ -1080,8 +1077,8 @@ TextureImporter:
       name: "\u4E0B\u886314c\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 3417
-        y: 3301
+        x: 3682
+        y: 3208
         width: 263
         height: 137
       alignment: 0
@@ -1108,8 +1105,8 @@ TextureImporter:
       name: "\u978B\u5B5014a"
       rect:
         serializedVersion: 2
-        x: 1022
-        y: 2950
+        x: 1182
+        y: 3426
         width: 66
         height: 134
       alignment: 0
@@ -1119,11 +1116,11 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014b"
+      name: "\u978B\u5B5014c"
       rect:
         serializedVersion: 2
-        x: 1182
-        y: 3426
+        x: 1022
+        y: 2950
         width: 66
         height: 134
       alignment: 0
@@ -1147,13 +1144,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D111(\u68D5)"
+      name: "\u5934\u53D111(\u68D5)\u540E"
       rect:
         serializedVersion: 2
-        x: 1740
-        y: 3720
-        width: 444
-        height: 374
+        x: 2937
+        y: 3627
+        width: 246
+        height: 275
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1161,13 +1158,13 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D111(\u84DD)\u540E"
+      name: "\u5934\u53D111(\u68D5)"
       rect:
         serializedVersion: 2
-        x: 2937
-        y: 3627
-        width: 246
-        height: 275
+        x: 1740
+        y: 3720
+        width: 444
+        height: 374
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1234,8 +1231,8 @@ TextureImporter:
       name: "\u65B0\u978B\u5B5016"
       rect:
         serializedVersion: 2
-        x: 1661
-        y: 2817
+        x: 648
+        y: 2857
         width: 66
         height: 134
       alignment: 0
@@ -1262,8 +1259,8 @@ TextureImporter:
       name: "\u4E0A\u8863-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 1426
-        y: 2848
+        x: 2879
+        y: 2839
         width: 165
         height: 111
       alignment: 0
@@ -1273,6 +1270,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B50-\u7F3A\u5931"
+      rect:
+        serializedVersion: 2
+        x: 3214
+        y: 2818
+        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\u886314"
       rect:
         serializedVersion: 2
@@ -1301,24 +1312,10 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D117-1\u540E"
-      rect:
-        serializedVersion: 2
-        x: 1703
-        y: 3324
-        width: 367
-        height: 394
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-    - serializedVersion: 2
       name: "\u5934\u53D117-1_1"
       rect:
         serializedVersion: 2
-        x: 871
+        x: 448
         y: 3698
         width: 421
         height: 396
@@ -1346,8 +1343,8 @@ TextureImporter:
       name: "\u5934\u53D117-2\u540E"
       rect:
         serializedVersion: 2
-        x: 425
-        y: 3302
+        x: 1703
+        y: 3324
         width: 367
         height: 394
       alignment: 0
@@ -1360,7 +1357,7 @@ TextureImporter:
       name: "\u5934\u53D117-2"
       rect:
         serializedVersion: 2
-        x: 448
+        x: 871
         y: 3698
         width: 421
         height: 396
@@ -1371,6 +1368,20 @@ TextureImporter:
       physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u5934\u53D117-3\u540E"
+      rect:
+        serializedVersion: 2
+        x: 425
+        y: 3302
+        width: 367
+        height: 394
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u5934\u53D117-3"
       rect:
         serializedVersion: 2
@@ -1384,6 +1395,90 @@ TextureImporter:
       outline: []
       physicsShape: []
       tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u773C\u775B4_1"
+      rect:
+        serializedVersion: 2
+        x: 2613
+        y: 2811
+        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\u775B5-wh_1"
+      rect:
+        serializedVersion: 2
+        x: 2613
+        y: 2908
+        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\u775B6-wh_1"
+      rect:
+        serializedVersion: 2
+        x: 2613
+        y: 2617
+        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\u775B7_1"
+      rect:
+        serializedVersion: 2
+        x: 2613
+        y: 3005
+        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\u775B8-h_2"
+      rect:
+        serializedVersion: 2
+        x: 2613
+        y: 3199
+        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\u775B9-w_1"
+      rect:
+        serializedVersion: 2
+        x: 2613
+        y: 3102
+        width: 264
+        height: 95
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
     outline: []
     physicsShape: []
   spritePackingTag: 

+ 324 - 94
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -1326,16 +1326,16 @@ GameObject:
   m_Component:
   - component: {fileID: 224227923485215418}
   - component: {fileID: 222784424138809830}
-  - component: {fileID: 114431632061364980}
   - component: {fileID: 114304822369895080}
   - component: {fileID: 114475508250131352}
+  - component: {fileID: 114860504751614700}
   m_Layer: 5
   m_Name: AL_MouseTab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1068930050495370
 GameObject:
   m_ObjectHideFlags: 1
@@ -9834,9 +9834,8 @@ GameObject:
   m_Component:
   - component: {fileID: 224471376869959270}
   - component: {fileID: 114762970349663898}
-  - component: {fileID: 114938795150977698}
   m_Layer: 5
-  m_Name: AL_ScrollMouse
+  m_Name: AL_MouseParent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9940,6 +9939,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1486465048633164
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224238720063078920}
+  - component: {fileID: 114311291497242892}
+  - component: {fileID: 114938795150977698}
+  m_Layer: 5
+  m_Name: AL_ScrollMouse
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1487906843039534
 GameObject:
   m_ObjectHideFlags: 0
@@ -11690,9 +11706,8 @@ GameObject:
   m_Component:
   - component: {fileID: 224714057197182304}
   - component: {fileID: 114002061740779558}
-  - component: {fileID: 114433867554409130}
   m_Layer: 5
-  m_Name: AL_ScrollEye
+  m_Name: AL_EyeParent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12385,6 +12400,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1603533986070500
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224963938510268784}
+  - component: {fileID: 222985187566151042}
+  - component: {fileID: 114679543923070454}
+  m_Layer: 5
+  m_Name: AL_MouseBg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1603623907199396
 GameObject:
   m_ObjectHideFlags: 1
@@ -12733,6 +12765,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1621499627836134
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224200540117235800}
+  - component: {fileID: 222191992467110218}
+  - component: {fileID: 114790467689060182}
+  m_Layer: 5
+  m_Name: AL_EyeBg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1621884997237188
 GameObject:
   m_ObjectHideFlags: 1
@@ -14844,9 +14893,9 @@ GameObject:
   m_Component:
   - component: {fileID: 224062007240184220}
   - component: {fileID: 222463282353161900}
-  - component: {fileID: 114919241930844280}
   - component: {fileID: 114159261634268260}
   - component: {fileID: 114210058077362928}
+  - component: {fileID: 114928605746127368}
   m_Layer: 5
   m_Name: AL_EyeTab
   m_TagString: Untagged
@@ -17937,6 +17986,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1910815267053532
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224990835730074242}
+  - component: {fileID: 114139272617160256}
+  - component: {fileID: 114433867554409130}
+  m_Layer: 5
+  m_Name: AL_ScrollEye
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1911348442452138
 GameObject:
   m_ObjectHideFlags: 1
@@ -26344,6 +26410,17 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114139272617160256
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1910815267053532}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &114139497703552842
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -27034,7 +27111,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Padding:
     m_Left: 20
-    m_Right: 350
+    m_Right: 0
     m_Top: 15
     m_Bottom: 0
   m_ChildAlignment: 0
@@ -27042,8 +27119,8 @@ MonoBehaviour:
   m_StartAxis: 0
   m_CellSize: {x: 100, y: 100}
   m_Spacing: {x: 15, y: 15}
-  m_Constraint: 2
-  m_ConstraintCount: 2
+  m_Constraint: 1
+  m_ConstraintCount: 3
 --- !u!114 &114159356138489488
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -29082,8 +29159,8 @@ MonoBehaviour:
   m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &114210805909487492
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -32593,7 +32670,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Padding:
     m_Left: 20
-    m_Right: 350
+    m_Right: 0
     m_Top: 15
     m_Bottom: 0
   m_ChildAlignment: 0
@@ -32601,8 +32678,8 @@ MonoBehaviour:
   m_StartAxis: 0
   m_CellSize: {x: 100, y: 100}
   m_Spacing: {x: 15, y: 15}
-  m_Constraint: 2
-  m_ConstraintCount: 2
+  m_Constraint: 1
+  m_ConstraintCount: 3
 --- !u!114 &114305098763881126
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -33004,6 +33081,17 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114311291497242892
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1486465048633164}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &114311664276600912
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -38115,33 +38203,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
---- !u!114 &114431632061364980
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1068154299608868}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.83823526, g: 0.83823526, b: 0.83823526, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &114432534645583888
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -38305,15 +38366,15 @@ MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1567504029532606}
+  m_GameObject: {fileID: 1910815267053532}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 224062007240184220}
-  m_Horizontal: 1
-  m_Vertical: 0
+  m_Horizontal: 0
+  m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1
   m_Inertia: 0
@@ -40138,8 +40199,8 @@ MonoBehaviour:
   m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &114475758369098218
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -48062,6 +48123,33 @@ MonoBehaviour:
   m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &114679543923070454
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1603533986070500}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.83823526, g: 0.83823526, b: 0.83823526, a: 1}
+  m_RaycastTarget: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114680399579785312
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -52989,6 +53077,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114790467689060182
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1621499627836134}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.83823526, g: 0.83823526, b: 0.83823526, a: 1}
+  m_RaycastTarget: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114792070623873552
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -56204,6 +56319,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114860504751614700
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1068154299608868}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114860944139688528
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -58970,33 +59112,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114919241930844280
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1758300897784240}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.83823526, g: 0.83823526, b: 0.83823526, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &114919468479193204
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -59560,6 +59675,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114928605746127368
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1758300897784240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114929544524243848
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -59879,15 +60021,15 @@ MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1479930086408346}
+  m_GameObject: {fileID: 1486465048633164}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 224227923485215418}
-  m_Horizontal: 1
-  m_Vertical: 0
+  m_Horizontal: 0
+  m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1
   m_Inertia: 0
@@ -66764,6 +66906,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1541795420721418}
+--- !u!222 &222191992467110218
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1621499627836134}
 --- !u!222 &222192973844455232
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -71180,6 +71328,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1768075789885908}
+--- !u!222 &222985187566151042
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1603533986070500}
 --- !u!222 &222986792884188664
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -73009,17 +73163,17 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1758300897784240}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -207.1065, y: 19.309952, z: 0}
+  m_LocalPosition: {x: -207.10619, y: 117.026276, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224714057197182304}
+  m_Father: {fileID: 224990835730074242}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 0.08850098, y: 19.309952}
+  m_AnchoredPosition: {x: 0.093811035, y: 117.02628}
   m_SizeDelta: {x: 120, y: 278.18}
-  m_Pivot: {x: -0.000000006519258, y: 0.49999997}
+  m_Pivot: {x: 0, y: 1}
 --- !u!224 &224062398135328068
 RectTransform:
   m_ObjectHideFlags: 1
@@ -75685,6 +75839,25 @@ RectTransform:
   m_AnchoredPosition: {x: 105, y: -50.999977}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.5, y: 0.00000041350722}
+--- !u!224 &224200540117235800
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1621499627836134}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 66.878784, y: 0.16000366, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224990835730074242}
+  m_Father: {fileID: 224714057197182304}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 66.878784, y: 0.16000175}
+  m_SizeDelta: {x: 133.56998, y: -0.32000732}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224201318974070842
 RectTransform:
   m_ObjectHideFlags: 1
@@ -76267,17 +76440,17 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1068154299608868}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -207.10619, y: 19.309937, z: 0}
+  m_LocalPosition: {x: -207.10625, y: 117.09946, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224471376869959270}
+  m_Father: {fileID: 224238720063078920}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 0.08882141, y: 19.309937}
-  m_SizeDelta: {x: 547.97, y: 278.18}
-  m_Pivot: {x: -0.000000006519258, y: 0.49999997}
+  m_AnchoredPosition: {x: 0.09375, y: 117.09946}
+  m_SizeDelta: {x: 547.97, y: 234.2}
+  m_Pivot: {x: 0.000000037252903, y: 1.0000001}
 --- !u!224 &224228267808525492
 RectTransform:
   m_ObjectHideFlags: 1
@@ -76611,6 +76784,25 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000026828639, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224238720063078920
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1486465048633164}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -66.8788, y: 24.520004, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224227923485215418}
+  m_Father: {fileID: 224963938510268784}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -66.878784, y: 24.52}
+  m_SizeDelta: {x: 414.4, y: 229.16}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224239008306785784
 RectTransform:
   m_ObjectHideFlags: 1
@@ -81395,17 +81587,17 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1479930086408346}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 112.3, y: 0, z: 0}
+  m_LocalPosition: {x: 112.30002, y: 19.149963, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224227923485215418}
+  - {fileID: 224963938510268784}
   m_Father: {fileID: 224894077568315262}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 112.3, y: 0.00000047684}
-  m_SizeDelta: {x: 414.39, y: 331.36}
+  m_AnchoredPosition: {x: 112.30002, y: 19.149963}
+  m_SizeDelta: {x: 414.4, y: 278.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224471577763303176
 RectTransform:
@@ -87308,17 +87500,17 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1567504029532606}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 112.30002, y: 0, z: 0}
+  m_LocalPosition: {x: 112.30002, y: 19.149963, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224062007240184220}
+  - {fileID: 224200540117235800}
   m_Father: {fileID: 224894077568315262}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 112.30002, y: 0}
-  m_SizeDelta: {x: 414.39, y: 331.36}
+  m_AnchoredPosition: {x: 112.30002, y: 19.149963}
+  m_SizeDelta: {x: 414.4, y: 278.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224714376956246920
 RectTransform:
@@ -92499,6 +92691,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.5}
   m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224963938510268784
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1603533986070500}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 66.878784, y: 0.16000366, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224238720063078920}
+  m_Father: {fileID: 224471376869959270}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 66.878784, y: 0.16000175}
+  m_SizeDelta: {x: 133.56998, y: -0.32000732}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224964317361793810
 RectTransform:
   m_ObjectHideFlags: 1
@@ -93035,6 +93246,25 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000091552996, y: -76.125}
   m_SizeDelta: {x: 434, y: 59.75}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224990835730074242
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1910815267053532}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -66.8788, y: 24.520004, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224062007240184220}
+  m_Father: {fileID: 224200540117235800}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -66.878784, y: 24.52}
+  m_SizeDelta: {x: 414.4, y: 229.16}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224992395017071134
 RectTransform:
   m_ObjectHideFlags: 1

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

@@ -147,9 +147,21 @@
   <item id="1200" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛1" spriteAlpha="" armatureName="眼睛1" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="1201" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛2" spriteAlpha="" armatureName="眼睛2" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="1202" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛3" spriteAlpha="" armatureName="眼睛3" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1206" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛4_1" spriteAlpha="" armatureName="眼睛4" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1207" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛5-wh_1" spriteAlpha="" armatureName="眼睛5" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1208" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛6-wh_1" spriteAlpha="" armatureName="眼睛6" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1209" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛7_1" spriteAlpha="" armatureName="眼睛7" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1210" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛8-h_2" spriteAlpha="" armatureName="眼睛8" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1211" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛9-w_1" spriteAlpha="" armatureName="眼睛9" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="1203" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴巴1" spriteAlpha="" armatureName="嘴巴1" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="1204" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴巴2" spriteAlpha="" armatureName="嘴巴2" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="1205" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴巴3" spriteAlpha="" armatureName="嘴巴3" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1212" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴4" spriteAlpha="" armatureName="嘴巴4" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1213" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴5-w" spriteAlpha="" armatureName="嘴巴5" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1214" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴6-h" spriteAlpha="" armatureName="嘴巴6" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1215" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴7" spriteAlpha="" armatureName="嘴巴7" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1216" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴8" spriteAlpha="" armatureName="嘴巴8" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1217" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴9" spriteAlpha="" armatureName="嘴巴9" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <comment>
     <id>
 id

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


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

@@ -518,8 +518,12 @@ public class CanvasLabel
     public static string AL_CostLabImagePlus = "AL_CostLabImagePlus";
     public static string AL_PlayerPos = "AL_PlayerPos";
     public static string AL_Dress = "AL_Dress";
+    public static string AL_MouseParent = "AL_MouseParent";
+    public static string AL_MouseBg = "AL_MouseBg";
     public static string AL_ScrollMouse = "AL_ScrollMouse";
     public static string AL_MouseTab = "AL_MouseTab";
+    public static string AL_EyeParent = "AL_EyeParent";
+    public static string AL_EyeBg = "AL_EyeBg";
     public static string AL_ScrollEye = "AL_ScrollEye";
     public static string AL_EyeTab = "AL_EyeTab";
     public static string AL_TabBtn = "AL_TabBtn";

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

@@ -1175,7 +1175,7 @@ public class Manager : Regist
     {
         if (TutorialManager.PayExempt)
         {
-            succeedCallback.Invoke();
+            succeedCallback.SafeInvoke();
 
             return;
         }

+ 30 - 7
Assets/Script/Manage/Panel/ChangeMousePanel.cs

@@ -23,6 +23,8 @@ public class ChangeMousePanel : Regist
     public static Transform playerPos;
     public static Transform eyeTab;
     public static Transform mouseTab;
+    public static Transform eyeScroll;
+    public static Transform mouseScroll;
     public static Transform panel;
 
     public static string goldCostFml;
@@ -54,6 +56,8 @@ public class ChangeMousePanel : Regist
         eyeTab = ResourceManager.Get(CanvasLabel.AL_EyeTab);
         mouseTab = ResourceManager.Get(CanvasLabel.AL_MouseTab);
         panel = ResourceManager.Get(CanvasLabel.AL_ChangeMousePanel);
+        eyeScroll = ResourceManager.Get(CanvasLabel.AL_EyeParent);
+        mouseScroll = ResourceManager.Get(CanvasLabel.AL_MouseParent);
     }
 
     public override void ThirdInit()
@@ -106,13 +110,26 @@ public class ChangeMousePanel : Regist
         currentDressIds = new List<int>(originDressIds);
         BuildPlayer(currentDressIds);
 
-        goldCost = Auxiliary.FmlParse(goldCostFml, "c", (Manager.CircleIncome*6).ToString("0"));
-        diamondCost = Auxiliary.FmlParse(diamondCostFml, "l", Manager.GardenLevel.ToString());
-        costTxt.text = Language.GetStr(LanguageLabel.UI__AL_Cost) + " " + TransferLabel.CoinSprite + Auxiliary.ShrinkAllNumberStr(goldCost, 0) + " " + TransferLabel.DiamondSprite + Auxiliary.ShrinkAllNumberStr(diamondCost, 0);
+        SetCostText();
 
         OnEyeTabClick();
     }
 
+    public static void SetCostText()
+    {
+        if (HasCloseChanged())
+        {
+            goldCost = Auxiliary.FmlParse(goldCostFml, "c", (Manager.CircleIncome * 6).ToString("0"));
+            diamondCost = Auxiliary.FmlParse(diamondCostFml, "l", Manager.GardenLevel.ToString());
+        }
+        else
+        {
+            goldCost = 0;
+            diamondCost = 0;
+        }
+        costTxt.text = Language.GetStr(LanguageLabel.UI__AL_Cost) + " " + TransferLabel.CoinSprite + Auxiliary.ShrinkAllNumberStr(goldCost, 0) + " " + TransferLabel.DiamondSprite + Auxiliary.ShrinkAllNumberStr(diamondCost, 0);
+    }
+
     public static void BuildPlayer(List<int> dressIds)
     {
         player = PlayerManager.Instance.GetRawPlayer();
@@ -137,26 +154,32 @@ public class ChangeMousePanel : Regist
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
 
-        eyeTab.SetActive(false);
+        eyeScroll.SetActive(false);
         eyeIcon.SetActive(false);
         eyeBtn.TweenBacScale();
 
-        mouseTab.SetActive(true);
+        mouseScroll.SetActive(true);
         mouseIcon.SetActive(true);
         mouseBtn.TweenForScale();
+        mouseBtn.transform.SetAsLastSibling();
+
+        LayoutRebuilder.ForceRebuildLayoutImmediate(mouseTab.GetComponent<RectTransform>());
     }
 
     public static void OnEyeTabClick()
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
 
-        eyeTab.SetActive(true);
+        eyeScroll.SetActive(true);
         eyeIcon.SetActive(true);
         eyeBtn.TweenForScale();
+        eyeBtn.transform.SetAsLastSibling();
 
-        mouseTab.SetActive(false);
+        mouseScroll.SetActive(false);
         mouseIcon.SetActive(false);
         mouseBtn.TweenBacScale();
+
+        LayoutRebuilder.ForceRebuildLayoutImmediate(eyeTab.GetComponent<RectTransform>());
     }
 
     public static void OnCloseClick()

+ 1 - 0
Assets/Script/Manage/Panel/EyeCloseItem.cs

@@ -33,5 +33,6 @@ public class EyeCloseItem
         Object.Destroy(ChangeMousePanel.player.gameObject);
         ChangeMousePanel.currentDressIds[5] = closeItem.ID;
         ChangeMousePanel.BuildPlayer(ChangeMousePanel.currentDressIds);
+        ChangeMousePanel.SetCostText();
     }
 }

+ 1 - 0
Assets/Script/Manage/Panel/MouseCloseItem.cs

@@ -32,5 +32,6 @@ public class MouseCloseItem
         Object.Destroy(ChangeMousePanel.player.gameObject);
         ChangeMousePanel.currentDressIds[6] = closeItem.ID;
         ChangeMousePanel.BuildPlayer(ChangeMousePanel.currentDressIds);
+        ChangeMousePanel.SetCostText();
     }
 }

+ 0 - 1
ProjectSettings/GraphicsSettings.asset

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

+ 1 - 1
ProjectSettings/UnityConnectSettings.asset

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

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