Parcourir la source

增加昵称同步和消息同步

LiuQilin il y a 8 ans
Parent
commit
9154d5fe24

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex.json


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


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

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d523bac11c2f3742ab88a2cbd71bf39
-timeCreated: 1506211245
+timeCreated: 1506218634
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -252,8 +252,8 @@ TextureImporter:
       name: "\u8111\u58F31"
       rect:
         serializedVersion: 2
-        x: 953
-        y: 1050
+        x: 1623
+        y: 1298
         width: 644
         height: 389
       alignment: 0
@@ -382,8 +382,8 @@ TextureImporter:
       name: "\u4E0A\u88631\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 2269
-        y: 1298
+        x: 3108
+        y: 2609
         width: 60
         height: 59
       alignment: 0
@@ -422,7 +422,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3938
-        y: 3075
+        y: 2962
         width: 119
         height: 111
       alignment: 0
@@ -435,7 +435,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3938
-        y: 3414
+        y: 3301
         width: 119
         height: 111
       alignment: 0
@@ -474,7 +474,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1
-        y: 779
+        y: 355
         width: 546
         height: 422
       alignment: 0
@@ -525,8 +525,8 @@ TextureImporter:
       name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 2479
-        y: 2943
+        x: 4058
+        y: 3548
         width: 37
         height: 46
       alignment: 0
@@ -603,8 +603,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 3361
-        y: 3442
+        x: 1948
+        y: 2991
         width: 570
         height: 653
       alignment: 0
@@ -616,8 +616,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7EFF\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1948
-        y: 2991
+        x: 3361
+        y: 3442
         width: 570
         height: 653
       alignment: 0
@@ -629,7 +629,7 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u68D5\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1221
+        x: 1
         y: 2505
         width: 608
         height: 504
@@ -642,7 +642,7 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
+        x: 1221
         y: 2505
         width: 608
         height: 504
@@ -668,8 +668,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1735
+        x: 1831
+        y: 2221
         width: 380
         height: 768
       alignment: 0
@@ -681,8 +681,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 1419
-        y: 3063
+        x: 998
+        y: 602
         width: 447
         height: 446
       alignment: 0
@@ -694,8 +694,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 1831
-        y: 2221
+        x: 1
+        y: 1735
         width: 380
         height: 768
       alignment: 0
@@ -707,8 +707,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 998
-        y: 602
+        x: 1419
+        y: 3063
         width: 447
         height: 446
       alignment: 0
@@ -720,7 +720,7 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 383
+        x: 765
         y: 1735
         width: 380
         height: 768
@@ -733,8 +733,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 1599
-        y: 850
+        x: 549
+        y: 602
         width: 447
         height: 446
       alignment: 0
@@ -746,7 +746,7 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 765
+        x: 383
         y: 1735
         width: 380
         height: 768
@@ -759,8 +759,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 549
-        y: 602
+        x: 1599
+        y: 850
         width: 447
         height: 446
       alignment: 0
@@ -785,7 +785,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 650
+        x: 1299
         y: 3511
         width: 647
         height: 584
@@ -798,7 +798,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u84DD\u8272)"
       rect:
         serializedVersion: 2
-        x: 1299
+        x: 650
         y: 3511
         width: 647
         height: 584
@@ -811,7 +811,7 @@ TextureImporter:
       name: "\u5934\u53D18(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 1
+        x: 710
         y: 3011
         width: 707
         height: 498
@@ -850,7 +850,7 @@ TextureImporter:
       name: "\u5934\u53D18(\u9ED1)"
       rect:
         serializedVersion: 2
-        x: 710
+        x: 1
         y: 3011
         width: 707
         height: 498
@@ -863,8 +863,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u68D5\u8272)"
       rect:
         serializedVersion: 2
-        x: 1623
-        y: 1298
+        x: 2099
+        y: 1830
         width: 644
         height: 389
       alignment: 0
@@ -876,8 +876,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 2099
-        y: 1830
+        x: 953
+        y: 1050
         width: 644
         height: 389
       alignment: 0
@@ -889,8 +889,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 355
+        x: 2213
+        y: 2518
         width: 546
         height: 422
       alignment: 0
@@ -902,8 +902,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u9EC4\u8272)"
       rect:
         serializedVersion: 2
-        x: 2213
-        y: 2518
+        x: 1
+        y: 779
         width: 546
         height: 422
       alignment: 0
@@ -928,8 +928,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 1147
-        y: 1973
+        x: 1623
+        y: 1689
         width: 474
         height: 530
       alignment: 0
@@ -954,8 +954,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1623
-        y: 1689
+        x: 1147
+        y: 1441
         width: 474
         height: 530
       alignment: 0
@@ -981,7 +981,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1147
-        y: 1441
+        y: 1973
         width: 474
         height: 530
       alignment: 0
@@ -993,7 +993,7 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 549
+        x: 998
         y: 216
         width: 442
         height: 384
@@ -1006,7 +1006,7 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 998
+        x: 549
         y: 216
         width: 442
         height: 384
@@ -1019,8 +1019,8 @@ TextureImporter:
       name: "\u8863\u670D10\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 21
+        x: 2761
+        y: 2608
         width: 345
         height: 332
       alignment: 0
@@ -1045,8 +1045,8 @@ TextureImporter:
       name: "\u8863\u670D10"
       rect:
         serializedVersion: 2
-        x: 2761
-        y: 2608
+        x: 1
+        y: 21
         width: 345
         height: 332
       alignment: 0
@@ -1071,8 +1071,8 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2048
-        y: 997
+        x: 1886
+        y: 549
         width: 383
         height: 299
       alignment: 0
@@ -1097,8 +1097,8 @@ TextureImporter:
       name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
-        x: 1886
-        y: 549
+        x: 2048
+        y: 997
         width: 383
         height: 299
       alignment: 0
@@ -1163,7 +1163,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3687
-        y: 2476
+        y: 2709
         width: 285
         height: 231
       alignment: 0
@@ -1176,7 +1176,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3687
-        y: 2709
+        y: 2476
         width: 285
         height: 231
       alignment: 0
@@ -1227,7 +1227,7 @@ TextureImporter:
       name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 3085
+        x: 2745
         y: 1975
         width: 338
         height: 274
@@ -1240,7 +1240,7 @@ TextureImporter:
       name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 2745
+        x: 3085
         y: 1975
         width: 338
         height: 274
@@ -1279,8 +1279,8 @@ TextureImporter:
       name: 5
       rect:
         serializedVersion: 2
-        x: 4058
-        y: 3596
+        x: 1899
+        y: 3028
         width: 36
         height: 66
       alignment: 0
@@ -1305,8 +1305,8 @@ TextureImporter:
       name: 7
       rect:
         serializedVersion: 2
-        x: 1899
-        y: 3028
+        x: 4058
+        y: 3596
         width: 36
         height: 66
       alignment: 0
@@ -1383,8 +1383,8 @@ TextureImporter:
       name: 13
       rect:
         serializedVersion: 2
-        x: 4058
-        y: 3548
+        x: 2479
+        y: 2943
         width: 37
         height: 46
       alignment: 0
@@ -1461,8 +1461,8 @@ TextureImporter:
       name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 2271
-        y: 1523
+        x: 2433
+        y: 1216
         width: 349
         height: 305
       alignment: 0
@@ -1474,8 +1474,8 @@ TextureImporter:
       name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 2433
-        y: 1216
+        x: 2271
+        y: 1523
         width: 349
         height: 305
       alignment: 0
@@ -1540,7 +1540,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3938
-        y: 2962
+        y: 3188
         width: 119
         height: 111
       alignment: 0
@@ -1553,7 +1553,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3938
-        y: 3188
+        y: 3414
         width: 119
         height: 111
       alignment: 0
@@ -1604,8 +1604,8 @@ TextureImporter:
       name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 953
-        y: 1454
+        x: 3495
+        y: 2409
         width: 184
         height: 119
       alignment: 0
@@ -1656,8 +1656,8 @@ TextureImporter:
       name: "\u4E0A\u886311(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 3495
-        y: 2409
+        x: 953
+        y: 1454
         width: 184
         height: 119
       alignment: 0
@@ -1683,7 +1683,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3938
-        y: 3301
+        y: 3075
         width: 119
         height: 111
       alignment: 0
@@ -1734,8 +1734,8 @@ TextureImporter:
       name: "\u4E0A\u886312\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4021
-        y: 4029
+        x: 4026
+        y: 3732
         width: 66
         height: 66
       alignment: 0
@@ -1748,7 +1748,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3974
-        y: 2899
+        y: 2836
         width: 61
         height: 61
       alignment: 0
@@ -1760,8 +1760,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1868
-        y: 3096
+        x: 4021
+        y: 4029
         width: 66
         height: 66
       alignment: 0
@@ -1773,8 +1773,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u84DD\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 1809
-        y: 602
+        x: 3974
+        y: 2899
         width: 61
         height: 61
       alignment: 0
@@ -1786,8 +1786,8 @@ TextureImporter:
       name: "\u4E0A\u886313\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1744
-        y: 2265
+        x: 1868
+        y: 3096
         width: 66
         height: 66
       alignment: 0
@@ -1800,7 +1800,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2060
-        y: 486
+        y: 423
         width: 61
         height: 61
       alignment: 0
@@ -1812,8 +1812,8 @@ TextureImporter:
       name: "\u4E0A\u88632\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 3108
-        y: 2609
+        x: 2269
+        y: 1298
         width: 60
         height: 59
       alignment: 0
@@ -1838,8 +1838,8 @@ TextureImporter:
       name: "\u4E0A\u88636\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 1831
-        y: 2995
+        x: 4026
+        y: 3664
         width: 66
         height: 66
       alignment: 0
@@ -1864,8 +1864,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4026
-        y: 3664
+        x: 1744
+        y: 2265
         width: 66
         height: 66
       alignment: 0
@@ -1878,7 +1878,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2060
-        y: 423
+        y: 486
         width: 61
         height: 61
       alignment: 0
@@ -1890,8 +1890,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u53F3"
       rect:
         serializedVersion: 2
-        x: 3974
-        y: 2836
+        x: 1809
+        y: 602
         width: 61
         height: 61
       alignment: 0
@@ -1903,8 +1903,8 @@ TextureImporter:
       name: "\u4E0A\u88637\u7C89\u8896\u5B50\u5DE6"
       rect:
         serializedVersion: 2
-        x: 4026
-        y: 3732
+        x: 1831
+        y: 2995
         width: 66
         height: 66
       alignment: 0

+ 2 - 0
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -123,6 +123,8 @@ MonoBehaviour:
   - {fileID: 1073147265121344, guid: 100bc0b1747d64e4db7883a2f0d726c5, type: 2}
   - {fileID: 1301950428336920, guid: 3251e6b903666f2488364daaf1f2cc88, type: 2}
   - {fileID: 1089668954114348, guid: 6dd9933035ffa7645bbd45c1ccd66774, type: 2}
+  - {fileID: 1883440964438570, guid: 11e55fe29ace64347b31ab7593e7ea51, type: 2}
+  - {fileID: 1203281534794934, guid: c9dfe3f9d9cf0f2428f731dc26ac10b5, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

+ 58 - 0
Assets/Resource/Prefab/Object/Player.prefab

@@ -135,6 +135,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1692040671488372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4096510784813918}
+  m_Layer: 0
+  m_Name: NickName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1862534773714198
 GameObject:
   m_ObjectHideFlags: 0
@@ -150,6 +165,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1982040039250802
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4066961497983484}
+  m_Layer: 0
+  m_Name: MessageBox
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!4 &4007373572171746
 Transform:
   m_ObjectHideFlags: 1
@@ -190,6 +220,19 @@ Transform:
   m_Father: {fileID: 4072475945792000}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4066961497983484
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1982040039250802}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 2.5, y: 4.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4072475945792000}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4072475945792000
 Transform:
   m_ObjectHideFlags: 1
@@ -207,9 +250,24 @@ Transform:
   - {fileID: 4560986378048750}
   - {fileID: 4065049769947314}
   - {fileID: 4645389164054564}
+  - {fileID: 4096510784813918}
+  - {fileID: 4066961497983484}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4096510784813918
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1692040671488372}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.2, y: 5.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4072475945792000}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4281633466977820
 Transform:
   m_ObjectHideFlags: 1

+ 52 - 11
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -1034,12 +1034,12 @@ GameObject:
   - component: {fileID: 224558911611703640}
   - component: {fileID: 222664017337139210}
   m_Layer: 5
-  m_Name: A_HudParent
+  m_Name: W_HudParent
   m_TagString: Hint
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1621982422926790
 GameObject:
   m_ObjectHideFlags: 1
@@ -1208,6 +1208,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1712023317783834
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224177086846269720}
+  - component: {fileID: 222311292697555228}
+  m_Layer: 5
+  m_Name: A_HudParent
+  m_TagString: Hint
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1722153107442498
 GameObject:
   m_ObjectHideFlags: 0
@@ -4833,6 +4849,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1537381490176488}
+--- !u!222 &222311292697555228
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1712023317783834}
 --- !u!222 &222314739712866818
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5467,6 +5489,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224177086846269720
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1712023317783834}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224734146220428892}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224183512490426362
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5533,7 +5573,7 @@ RectTransform:
   m_Children:
   - {fileID: 224876090094067368}
   m_Father: {fileID: 224734146220428892}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5683,7 +5723,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224734146220428892}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5798,7 +5838,7 @@ RectTransform:
   m_Children:
   - {fileID: 224938232921887762}
   m_Father: {fileID: 224734146220428892}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -6173,7 +6213,7 @@ RectTransform:
   - {fileID: 224796331429632620}
   - {fileID: 224665213722018086}
   m_Father: {fileID: 224734146220428892}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -6269,11 +6309,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224734146220428892}
-  m_RootOrder: 6
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.000015258789}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224568098510377646
@@ -6455,7 +6495,7 @@ RectTransform:
   m_Children:
   - {fileID: 224708669857040244}
   m_Father: {fileID: 224734146220428892}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -6585,12 +6625,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224445605922611920}
+  - {fileID: 224558911611703640}
   - {fileID: 224200828016002576}
   - {fileID: 224277826825650648}
   - {fileID: 224358377575468156}
   - {fileID: 224506676209611818}
   - {fileID: 224691548330788530}
-  - {fileID: 224558911611703640}
+  - {fileID: 224177086846269720}
   - {fileID: 224983169175360330}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -7035,7 +7076,7 @@ RectTransform:
   - {fileID: 224027571262383294}
   - {fileID: 224345275296035146}
   m_Father: {fileID: 224734146220428892}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

+ 247 - 0
Assets/Resource/Prefab/PrefabUI/MessageBox.prefab

@@ -0,0 +1,247 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1203281534794934}
+  m_IsPrefabParent: 1
+--- !u!1 &1203281534794934
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224680566000850672}
+  - component: {fileID: 222195963422680926}
+  - component: {fileID: 114441359897983664}
+  - component: {fileID: 225440468210449602}
+  m_Layer: 5
+  m_Name: MessageBox
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1283005557691056
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224396237782273722}
+  - component: {fileID: 222043793631706948}
+  - component: {fileID: 114049154407234384}
+  m_Layer: 5
+  m_Name: MessageBoxLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1413388137880234
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224908578938273794}
+  - component: {fileID: 222120922929916068}
+  - component: {fileID: 114720333516532270}
+  m_Layer: 0
+  m_Name: MessageBoxImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114049154407234384
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1283005557691056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 0
+  RemovePos: 
+  ImageIndex: 
+  RemoveIndex: 
+  NewTextIndex: 
+  NewTextPos: []
+--- !u!114 &114441359897983664
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1203281534794934}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: d023127dc7f3b3d4b9721272bf9acf35, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114720333516532270
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413388137880234}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f7e6e302f395b744be6ac65d53a2240, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  Draw: 0
+--- !u!222 &222043793631706948
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1283005557691056}
+--- !u!222 &222120922929916068
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413388137880234}
+--- !u!222 &222195963422680926
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1203281534794934}
+--- !u!224 &224396237782273722
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1283005557691056}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224908578938273794}
+  m_Father: {fileID: 224680566000850672}
+  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: 8.1, y: -0.0000094988}
+  m_SizeDelta: {x: 144, y: 34.4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224680566000850672
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1203281534794934}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.755, y: 0.755, z: 0.755}
+  m_Children:
+  - {fileID: 224396237782273722}
+  m_Father: {fileID: 0}
+  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: -86.333, y: -22.167}
+  m_SizeDelta: {x: 172.66667, y: 44.333332}
+  m_Pivot: {x: 0.0000000018626451, y: -0.0000002416607}
+--- !u!224 &224908578938273794
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413388137880234}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224396237782273722}
+  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: 0, y: -0.000015258789}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &225440468210449602
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1203281534794934}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0

+ 8 - 0
Assets/Resource/Prefab/PrefabUI/MessageBox.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c9dfe3f9d9cf0f2428f731dc26ac10b5
+timeCreated: 1506215595
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

+ 102 - 0
Assets/Resource/Prefab/PrefabUI/NickName.prefab

@@ -0,0 +1,102 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1883440964438570}
+  m_IsPrefabParent: 1
+--- !u!1 &1883440964438570
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224987327227951220}
+  - component: {fileID: 222288698068039410}
+  - component: {fileID: 114901862979993682}
+  - component: {fileID: 114938117872125972}
+  m_Layer: 5
+  m_Name: NickName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114901862979993682
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1883440964438570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 1, g: 0.9643002, b: 0.6764706, a: 0.7882353}
+  m_EffectDistance: {x: 0.5, y: -0.5}
+  m_UseGraphicAlpha: 1
+--- !u!114 &114938117872125972
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1883440964438570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: NickName
+--- !u!222 &222288698068039410
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1883440964438570}
+--- !u!224 &224987327227951220
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1883440964438570}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 408, y: 77}
+  m_Pivot: {x: 0.5, y: 0.5}

+ 8 - 0
Assets/Resource/Prefab/PrefabUI/NickName.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 11e55fe29ace64347b31ab7593e7ea51
+timeCreated: 1506212574
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

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

@@ -195,7 +195,7 @@ public class ManaPlayer : Regist
 
             Player.Build();
         }
-        
+
 
         BuildPlayer(DressData);
 

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

@@ -49,6 +49,8 @@ public enum ObjType
     EventSystem,
     MainCamera,
 
+    NickName,
+    MessageBox,
     HudText,
     MailItem,
     InfoItem,

+ 15 - 15
Assets/Script/Manage/ManaUI.cs

@@ -431,24 +431,24 @@ public class ManaUI : Regist
         #region C_DressRoom
 
         ManaReso.SetButtonEvent
-            (
-                "C_DressRoom",
-                () =>
-                {
-                    ManaAudio.PlayClip(Clip.BtnClip);
+        (
+            "C_DressRoom",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
 
-                    if (ManaCenter.Level < 13)
-                    {
-                        Toast.Show(1.5f, Language.GetStr("UI", "C_DressRoom"));
-                    }
-                    else
-                    {
-                        ManaReso.Get("I_BlackMask").GetTweenCG().Duration = 0.5f;
+                if (ManaCenter.Level < 13)
+                {
+                    Toast.Show(1.5f, Language.GetStr("UI", "C_DressRoom"));
+                }
+                else
+                {
+                    ManaReso.Get("I_BlackMask").GetTweenCG().Duration = 0.5f;
 
-                        ManaPlayer.Player.EnterDressRoom();
-                    }
+                    ManaPlayer.Player.EnterDressRoom();
                 }
-            );
+            }
+        );
 
         #endregion
 

+ 11 - 67
Assets/Script/Object/Player.cs

@@ -587,19 +587,18 @@ public class Player : Regist , IPointerClickHandler
 
         Auxiliary.CompileDic(transform, ChildDic);
 
-
         Vector3 bigShadowScale = new Vector3(1.820952f, 2.418199f, 1.820952f);
         Vector3 smallShadowScale = new Vector3(1.081191f, 1.435807f, 1.081191f);
 
         ChildDic["Shadow"].CreateStreamScale
-            (
-                new List<float>() {0, 0, 0},
-                new List<float>() {0.33f, 0.33f, 0.33f, 0.33f},
-                new List<VecPair>() {new VecPair(bigShadowScale, smallShadowScale), new VecPair(smallShadowScale, bigShadowScale), new VecPair(bigShadowScale, smallShadowScale), new VecPair(smallShadowScale, bigShadowScale)},
-                true,
-                true,
-                Curve.EaseOutQuad
-            );
+        (
+            new List<float>() {0, 0, 0},
+            new List<float>() {0.33f, 0.33f, 0.33f, 0.33f},
+            new List<VecPair>() {new VecPair(bigShadowScale, smallShadowScale), new VecPair(smallShadowScale, bigShadowScale), new VecPair(bigShadowScale, smallShadowScale), new VecPair(smallShadowScale, bigShadowScale)},
+            true,
+            true,
+            Curve.EaseOutQuad
+        );
 
         return false;
     }
@@ -920,8 +919,6 @@ public class Player : Regist , IPointerClickHandler
             return;
         }
 
-        ChildDic["ShadowParent"].SetActive(true);
-
         ManaReso.Get("B_SignIn0").TweenBacCG();
 
         InDressRoom = true;
@@ -948,7 +945,8 @@ public class Player : Regist , IPointerClickHandler
                         ManaGarden.PlantList[i].Flower.RetrieveElf();
                     }
 
-                    //ChildDic["ShadowParent"].SetActive(true);
+                    ChildDic["ShadowParent"].SetActive(true);
+                    ChildDic["ShadowParent"].SetLZ(3);
 
                     transform.SetParent(ManaReso.Get("DressRoom"));
 
@@ -1151,7 +1149,7 @@ public class Player : Regist , IPointerClickHandler
         }
 
         DressSlot.UnityTransform.SetLZ(-0.002f);
-        //Debug.Log(DressSlot.UnityTransform.name);
+
         if (DressSlot.UnityTransform.childCount > 1)
         {
             DressSlot.UnityTransform.GetChild(0).SetLZ(0.002f);
@@ -1166,66 +1164,12 @@ public class Player : Regist , IPointerClickHandler
         NeckSlot.SetLZ(0.001f);
         LeftHandSlot.SetLZ(-0.001f);
         RightHandSlot.SetLZ(-0.001f);
-        //Debug.Log(LeftLongSleeveSlot.UnityTransform.name);
-
-        //Debug.Log(LeftShortSleeveSlot.UnityTransform.name);
-        //Debug.Log(RightShortSleeveSlot.UnityTransform.name);
 
         LeftShortSleeveSlot.SetLZ(-0.0015f);
         RightShortSleeveSlot.SetLZ(-0.0015f);
 
         LeftLongSleeveUAC.transform.SetLZ(-0.0015f);
         RightLongSleeveUAC.transform.SetLZ(-0.0015f);
-
-        //		Debug.Log (LeftLongSleeveSlot.armature.UnityTransform.name);
-        //		Debug.Log (LeftShortSleeveSlot.armature.UnityTransform.name);
-        //		Debug.Log (RightLongSleeveSlot.armature.UnityTransform.name);
-        //		Debug.Log (RightShortSleeveSlot.armature.UnityTransform.name);
-
-        //
-        //        UAC.transform.SetLZ(2.5f);
-        //        
-        //        if (Wing != "Empty")
-        //        {
-        //            transform.FindChild("Armature/" + Wing).SetLZ(0.003f);
-        //        }
-        //
-        //        transform.FindChild("Armature/" + Eye).SetLZ(-0.001f);
-        //        transform.FindChild("Armature/" + Top).SetLZ(-0.003f);
-        //        transform.FindChild("Armature/" + Mouse).SetLZ(-0.001f);
-        //        transform.FindChild("Armature/" + HeadWear).SetLZ(-0.001f);
-        //
-        //        Transform tempTra = transform.FindChild("Armature/" + Head);
-        //        
-        //        tempTra.SetLZ(0);
-        //        if (tempTra.childCount > 1)
-        //        {
-        //            tempTra.GetChild(0).SetLZ(0.002f);
-        //            tempTra.GetChild(1).SetLZ(0f);
-        //        }
-        //
-        //
-        //        tempTra = transform.FindChild("Armature/" + Dress);
-        //
-        //        tempTra.SetLZ(-0.002f);
-        //        if (tempTra.childCount > 1)
-        //        {
-        //            tempTra.GetChild(0).SetLZ(0.002f);
-        //            tempTra.GetChild(1).SetLZ(0f);
-        //        }
-        //
-        //
-        //        tempTra = transform.FindChild("Armature/" + Shoe);
-        //        tempTra.SetLZ(-0.001f);
-        //
-        //        transform.FindChild("Armature").GetChild(tempTra.GetSiblingIndex() + 1).SetLZ(-0.001f);
-        //
-        //
-        //        transform.FindChild("Armature/左腿").SetLZ(0);
-        //        transform.FindChild("Armature/右腿").SetLZ(0);
-        //        transform.FindChild("Armature/脖子").SetLZ(0.001f);
-        //        transform.FindChild("Armature/左手").SetLZ(-0.001f);
-        //        transform.FindChild("Armature/右手").SetLZ(-0.001f);
     }
 
     public void ChangeClose(BodyPart bodyPart, string armatureName, bool setDepth = true)

+ 1 - 0
Assets/Script/SFS/ID/DataID.cs

@@ -6,4 +6,5 @@
     Close = 3,
     Position = 4,
     PlayerDirection = 5,
+    NickName = 6,
 }

+ 68 - 7
Assets/Script/SFS/Manager/PlazaRoomManager.cs

@@ -8,18 +8,49 @@ using Sfs2X.Entities;
 using Sfs2X.Entities.Data;
 using Sfs2X.Requests;
 using Sfs2X.Entities.Variables;
+using UnityEngine.UI;
 
 public class PlazaRoomManager 
 {
     public class PlazaRoomPlayer
     {
         public Player Player;
+        public Transform NickName;
+        public Transform MessageBox;
         public List<TweenRoot> TweenRoots;
 
-        public PlazaRoomPlayer(Player player)
+        public PlazaRoomPlayer(Player player, string nickname)
         {
             Player = player;
             TweenRoots = new List<TweenRoot>();
+
+
+            NickName = ManaReso.Get("NickName", Folder.UI, false, ManaReso.Get("W_HudParent"), false, ObjType.NickName);
+
+            HudTarget hudTarget = NickName.GetComponent<HudTarget>();
+
+            if (hudTarget == null)
+            {
+                hudTarget = NickName.AddComponent<HudTarget>();
+            }
+
+            hudTarget.PosTra = Player.ChildDic["NickName"];
+
+            NickName.GetComponent<Text>().text = string.IsNullOrEmpty(nickname) ? Language.GetStr("UI", "未命名") : nickname;
+
+
+            MessageBox = ManaReso.Get("MessageBox", Folder.UI, false, ManaReso.Get("W_HudParent"), false, ObjType.MessageBox);
+
+            hudTarget = MessageBox.GetComponent<HudTarget>();
+
+            if (hudTarget == null)
+            {
+                hudTarget = MessageBox.AddComponent<HudTarget>();
+            }
+
+            hudTarget.PosTra = Player.ChildDic["MessageBox"];
+
+            MessageBox.CreateTweenCG(0, 1, 0.25f, true, true, Curve.EaseOutQuad).InOrigin = true;
         }
 
         public void Save()
@@ -30,6 +61,8 @@ public class PlazaRoomManager
             }
 
             ManaReso.Save(Player);
+            ManaReso.Save(NickName);
+            ManaReso.Save(MessageBox);
         }
 
         public bool IsMoving;
@@ -72,6 +105,21 @@ public class PlazaRoomManager
 
             Player.PlayAnim(Player.IdleAnimationName);
         }
+
+        public float MessgeTime = 3f;
+        public Coroutine MessgeCoroutine;
+        public void ShowMessage(string message)
+        {
+            if (MessgeCoroutine != null)
+            {
+                Auxiliary.Instance.StopCoroutine(MessgeCoroutine);
+            }
+
+            MessageBox.GetChild(0).GetComponent<Text>().text = message;
+            MessageBox.TweenForCG();
+
+            MessgeCoroutine = Auxiliary.Instance.DelayCall(() => { MessageBox.TweenBacCG(); }, MessgeTime);
+        }
     }
 
     #region Variable
@@ -150,6 +198,8 @@ public class PlazaRoomManager
 
         if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Failed)
         {
+            QuitPlazaRoom();
+
             Bubble.Show(null, Language.GetStr("UI", "加入房间失败"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG();},null,false);
 
             EnteringPlazaRoom = false;
@@ -174,11 +224,12 @@ public class PlazaRoomManager
         ManaReso.SetActive("C_Main", false);
         ManaReso.SetActive("Garden", false);
         ManaReso.SetActive("PlazaRoom", true);
+        ManaReso.SetActive("W_HudParent", true);
     }
 
     public void ExitPlazaRoom()
     {
-        ManaCenter.SceneSwitchLock = false;
+        QuitPlazaRoom();
 
         TweenRoot tweenRoot = ManaReso.Get("V_BlackMask").TweenBacCG();
 
@@ -192,6 +243,8 @@ public class PlazaRoomManager
                     ManaReso.SetActive("C_Main", true);
                     ManaReso.SetActive("Garden", true);
                     ManaReso.SetActive("PlazaRoom", false);
+                    ManaReso.SetActive("W_HudParent", false);
+
                     ManaReso.Get("V_BlackMask").TweenForCG();
 
                     foreach (var kv in UserInstanceDictionary)
@@ -204,6 +257,12 @@ public class PlazaRoomManager
             );
     }
 
+    public void QuitPlazaRoom()
+    {
+        ManaCenter.SceneSwitchLock = false;
+    }
+
+
     public PlazaRoomManager(GardenSmartFox gardenSmartFox)
     {
         GardenSmartFox = gardenSmartFox;
@@ -293,7 +352,7 @@ public class PlazaRoomManager
         CurrentPlazaRoom = room;
 
         SelfUser = GardenSmartFox.User;
-        SelfInstance = InstantiatePlayer(SelfUser, ManaReso.Get("PlazaRoomDefaultPosition").position, PlayerDirection.Left, ManaData.GetDressDataIDs(ManaPlayer.Player));
+        SelfInstance = InstantiatePlayer(SelfUser, ManaNickName.NickName, ManaReso.Get("PlazaRoomDefaultPosition").position, PlayerDirection.Left, ManaData.GetDressDataIDs(ManaPlayer.Player));
 
         UserInstanceDictionary.Add(SelfUser, SelfInstance);
 
@@ -360,7 +419,7 @@ public class PlazaRoomManager
 
     public void ReceivePublicMessage(string message, User sender)
     {
-        Debug.LogWarning(sender.IsItMe + " : " + message);
+        UserInstanceDictionary[sender].ShowMessage(message);
     }
 
     public void Instantiate(User user, SFSObject parameter)
@@ -384,6 +443,7 @@ public class PlazaRoomManager
         parameter.PutIntArray(DataID.Close.GetHashString(), ManaData.GetDressDataIDs(SelfInstance.Player).ToArray());
         parameter.PutText(DataID.Position.GetHashString(), SelfInstance.Player.transform.position.VectorToString());
         parameter.PutInt(DataID.PlayerDirection.GetHashString(), SelfInstance.Player.PlayerDirection.GetHashCode());
+        parameter.PutText(DataID.NickName.GetHashString(), ManaNickName.NickName);
 
         GardenSmartFox.AddRequest(GardenSmartFox.ConstructCommandParameter(CommandID.Instantiate.GetHashCode(), parameter, receiverID), RequestType.Immediate);
 
@@ -399,7 +459,7 @@ public class PlazaRoomManager
         GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendSynchronizeDestination(destination);
     }
 
-    public PlazaRoomPlayer InstantiatePlayer(User user, Vector3 position, PlayerDirection direction, List<int> dressDataIDs)
+    public PlazaRoomPlayer InstantiatePlayer(User user, string nickName, Vector3 position, PlayerDirection direction, List<int> dressDataIDs)
     {
         Transform tra = ManaReso.Get("Player", Folder.Scene, false, ManaReso.Get("PlazaRoom"), false, ObjType.Player);
 
@@ -425,7 +485,7 @@ public class PlazaRoomManager
 
         tra.localScale = new Vector3(0.5f, 0.5f, 0.5f);
 
-        return new PlazaRoomPlayer(player);
+        return new PlazaRoomPlayer(player, nickName);
     }
 
     public PlazaRoomPlayer InstantiatePlayer(User user, SFSObject parameter)
@@ -433,8 +493,9 @@ public class PlazaRoomManager
         List<int> dressDatas = ManaData.GetDressDataIDs(parameter);
         Vector3 position = parameter.GetText(DataID.Position.GetHashString()).StringToVector();
         PlayerDirection direction = (PlayerDirection) parameter.GetInt(DataID.PlayerDirection.GetHashString());
+        string nickName = parameter.GetText(DataID.NickName.GetHashString());
 
-        PlazaRoomPlayer plazaRoomPlayer = InstantiatePlayer(user, position, direction, dressDatas);
+        PlazaRoomPlayer plazaRoomPlayer = InstantiatePlayer(user, nickName, position, direction, dressDatas);
 
         return plazaRoomPlayer;
     }

+ 2 - 0
Assets/Script/Tool/Auxiliary.cs

@@ -160,6 +160,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.X))
         {
+            GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
+
             //ManaPlayer.Player.PlayAnim("newAnimation");
 
             //StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));

+ 1 - 4
第三期.txt

@@ -1,7 +1,4 @@
-增加玩家昵称
-
-增加消息
-
+MessageBox的层级
 
 SFS使用的随机用户名
 

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff