浏览代码

增加PlazaRoom表情

LiuQilin 8 年之前
父节点
当前提交
7333e63713
共有 62 个文件被更改,包括 2830 次插入920 次删除
  1. 11 0
      Assets/AtlasUtility/AtlasReferenceTable.txt
  2. 14 77
      Assets/AtlasUtility/SerializeObject.prefab
  3. 2 3
      Assets/Resource/Logo.unity
  4. 14 1
      Assets/Resource/Prefab/Object/DebugMode.prefab
  5. 65 0
      Assets/Resource/Prefab/Object/Player.prefab
  6. 4 2
      Assets/Resource/Prefab/PrefabUI/C_InfoItem.prefab
  7. 0 0
      Assets/Resource/Prefab/PrefabUI/C_InfoItem.prefab.meta
  8. 9 9
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  9. 767 31
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  10. 0 614
      Assets/Resource/Prefab/PrefabUI/GroupE.prefab
  11. 184 0
      Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab
  12. 8 0
      Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab.meta
  13. 9 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情.meta
  14. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png
  15. 246 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png.meta
  16. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/发送按钮.png
  17. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/发送按钮.png.meta
  18. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/哭.png
  19. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/哭.png.meta
  20. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/委屈.png
  21. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/委屈.png.meta
  22. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/开心.png
  23. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/开心.png.meta
  24. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/惊讶.png
  25. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/惊讶.png.meta
  26. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/打字框.png
  27. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/打字框.png.meta
  28. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/期待.png
  29. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/期待.png.meta
  30. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/汗颜.png
  31. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/汗颜.png.meta
  32. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/色咪咪.png
  33. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/色咪咪.png.meta
  34. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/表情按钮.png
  35. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/表情按钮.png.meta
  36. 二进制
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/郁闷.png
  37. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/郁闷.png.meta
  38. 1 1
      Assets/Script/Editor/EditorSpriteAsste.cs
  39. 1 1
      Assets/Script/Manage/Initializer.cs
  40. 0 102
      Assets/Script/Manage/ManaInfo.cs
  41. 142 0
      Assets/Script/Manage/ManaInfoBox.cs
  42. 2 2
      Assets/Script/Manage/ManaInfoBox.cs.meta
  43. 3 3
      Assets/Script/Manage/ManaReso.cs
  44. 5 5
      Assets/Script/Manage/ManaServer.cs
  45. 137 2
      Assets/Script/Manage/ManaUI.cs
  46. 50 0
      Assets/Script/Object/Player.cs
  47. 1 1
      Assets/Script/Object/PlazaRoom.cs
  48. 1 1
      Assets/Script/Object/Skill/BigSkill.cs
  49. 1 1
      Assets/Script/Object/Skill/Pack.cs
  50. 2 2
      Assets/Script/Object/Skill/Skill.cs
  51. 1 1
      Assets/Script/Object/Star.cs
  52. 1 0
      Assets/Script/SFS/ID/CommandID.cs
  53. 1 0
      Assets/Script/SFS/ID/DataID.cs
  54. 11 0
      Assets/Script/SFS/ID/ExpressionID.cs
  55. 12 0
      Assets/Script/SFS/ID/ExpressionID.cs.meta
  56. 38 8
      Assets/Script/SFS/Manager/PlazaRoomManager.cs
  57. 28 1
      Assets/Script/SFS/SFSExtension/PlazaRoomExtension.cs
  58. 2 0
      Assets/Script/Tool/Auxiliary.cs
  59. 9 3
      Assets/Script/Tool/Bundle.cs
  60. 32 45
      Assets/Script/Tool/UI/SpriteAsset.cs
  61. 3 3
      ProjectSettings/GraphicsSettings.asset
  62. 1 1
      第三期.txt

+ 11 - 0
Assets/AtlasUtility/AtlasReferenceTable.txt

@@ -0,0 +1,11 @@
+fileID: 21300000, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 57729e89d40ed604fbe0a319c5d0e467
+fileID: 21300002, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 191aacffa8ebc9e4996cf2bc23e6dfc7
+fileID: 21300004, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 35b3d802264a08e4a97cf8dfd8f4ce67
+fileID: 21300006, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 155422630b0a1014fb4b37563c4f325e
+fileID: 21300008, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: ce27c24b2b22c954ca2348c4d33f48bb
+fileID: 21300010, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: cd07b03a9c0fa8244a7a5815e044a581
+fileID: 21300012, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 1f1210050a455994aaf12f941c81ee57
+fileID: 21300014, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 19831c53e49f01a419213cdc9fdc769c
+fileID: 21300016, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 923c03b8f4f92f0498652d078f1891a1
+fileID: 21300018, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 187a8c01c3f18684b92532dccf8a35d4
+fileID: 21300020, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: a4a9714d1600e0f4c968a0140ad64e5c

+ 14 - 77
Assets/AtlasUtility/SerializeObject.prefab

@@ -51,7 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5855deb34ca797c4ab1b14de79906080, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PackAtlasFunction: 0
+  PackAtlasFunction: 1
   SliceAtlasFunction: 0
   SearchReferenceFunction: 0
   PlatformControllFunction: 0
@@ -59,85 +59,22 @@ MonoBehaviour:
   DebugFunction: 0
   PackSize: 2048
   PackPadding: 1
-  PackName: Atlas
-  PackPath: Assets/AtlasUtility
+  PackName: Expression
+  PackPath: "Assets/Resource/Sprite/Editor/PlazaRoom/\u8868\u60C5"
   PackPlan: 1
   PackAtlas: {fileID: 0}
   TextureList:
-  - {fileID: 2800000, guid: af48058312dc15c429274dc84ed7f3a6, type: 3}
-  - {fileID: 2800000, guid: e5dfd70a17554584ea2919cf341ad979, type: 3}
-  - {fileID: 2800000, guid: 92a5ece01d4540843acc3aec37c06b7f, type: 3}
-  - {fileID: 2800000, guid: b16cdbf5493f6154f803ebab4d1b318c, type: 3}
-  - {fileID: 2800000, guid: bfab2c37ce8348c4da36157d43ac8526, type: 3}
-  - {fileID: 2800000, guid: 0c8b3e95869409340b7fdcde9ede22b4, type: 3}
-  - {fileID: 0}
-  - {fileID: 2800000, guid: cc406256d3e6c6544af7f91fee3855cd, type: 3}
-  - {fileID: 2800000, guid: 2b7c9c874516dee428611dc70e42c56d, type: 3}
-  - {fileID: 2800000, guid: c11fa6575b949f14fab3373b1a463232, type: 3}
-  - {fileID: 2800000, guid: 20af4e62d33cc694f8754f2105934ea0, type: 3}
-  - {fileID: 2800000, guid: d2b776327fb8f9244af6766cf0f5e859, type: 3}
-  - {fileID: 2800000, guid: 3a966c70f70c2044fbcf3c611eb7b0fa, type: 3}
-  - {fileID: 2800000, guid: b2b6e02f3768cb941af8c5519ca9506c, type: 3}
-  - {fileID: 0}
-  - {fileID: 2800000, guid: cce3d1ce97604c7488f58a61c493a74e, type: 3}
-  - {fileID: 2800000, guid: e093049a9d0290e479dae4debfd75096, type: 3}
-  - {fileID: 2800000, guid: ddb8daadaf6162c4d8928c4c95078606, type: 3}
-  - {fileID: 2800000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
-  - {fileID: 2800000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
-  - {fileID: 2800000, guid: 4000c78c117d00d41900cdd8f4b505f4, type: 3}
-  - {fileID: 2800000, guid: cb9d2b8c06c18ce45b6df901a99bccfb, type: 3}
-  - {fileID: 0}
-  - {fileID: 2800000, guid: 338f3e3e1fde98a45bddde5da22dc383, type: 3}
-  - {fileID: 2800000, guid: 746795de9440b7f409c1c5f27a1a829b, type: 3}
-  - {fileID: 2800000, guid: a62925fe3e1e77f40a09813ac56add4e, type: 3}
-  - {fileID: 2800000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
-  - {fileID: 2800000, guid: 3d9c331d4b4ea874ab5a51cace85bd04, type: 3}
-  - {fileID: 2800000, guid: 88b0815f2d0dc9a4fb2d42302c105a5f, type: 3}
-  - {fileID: 2800000, guid: 15b1f418a81756944b8e15c52e04539a, type: 3}
-  - {fileID: 2800000, guid: bef583849cefe8f4da450ac201d1bad4, type: 3}
-  - {fileID: 2800000, guid: 59f813de7b93e3e46880218db4742ac3, type: 3}
-  - {fileID: 0}
-  - {fileID: 2800000, guid: 6bf7107fcfb942444a73edd96119cf73, type: 3}
-  - {fileID: 2800000, guid: 4e30e472b2aa96e4e996163bc9dc2956, type: 3}
-  - {fileID: 2800000, guid: 896d2ef2d74c6054a8071b2d2b30fb23, type: 3}
-  - {fileID: 2800000, guid: 1276cd71c9e4bf640a500d6964c9cdf4, type: 3}
-  - {fileID: 2800000, guid: 4091a559cf23f05459a28b7ca025869e, type: 3}
-  - {fileID: 2800000, guid: 1b99103238d3dda4e823f21e5aa6cacf, type: 3}
-  - {fileID: 2800000, guid: 731123059d96d714aa18799968c7aefa, type: 3}
-  - {fileID: 2800000, guid: 402c13b6ff9d56e48b2a287ebc74b1fe, type: 3}
-  - {fileID: 2800000, guid: edb735d32097847409537bb4a8783a99, type: 3}
-  - {fileID: 2800000, guid: d34039ffca4617d43b735c7ce52c238d, type: 3}
-  - {fileID: 2800000, guid: 4a295c010b425924c9a3691b5623c0f1, type: 3}
-  - {fileID: 2800000, guid: 9ae0be84a8b2db24a90437414edc2025, type: 3}
-  - {fileID: 2800000, guid: e00067c91541fb545a16eef3d6da2bf6, type: 3}
-  - {fileID: 2800000, guid: fc16431462643704dad53ba82084d771, type: 3}
-  - {fileID: 2800000, guid: 010b6bc279190154797bd671544cf53e, type: 3}
-  - {fileID: 2800000, guid: febd923104c710540a4fb8dfd06238f9, type: 3}
-  - {fileID: 2800000, guid: 40d71226da0f216499d513e981e0a68b, type: 3}
-  - {fileID: 2800000, guid: 27911bde3840a7a4aa0df3b2e486774e, type: 3}
-  - {fileID: 2800000, guid: c86a2e498ee8d4640b9d307351be4ae3, type: 3}
-  - {fileID: 2800000, guid: 5563e5e30dfd0504b9e65d996ee4e2a9, type: 3}
-  - {fileID: 2800000, guid: 3261bef1ceaa50a4a8c6ad96d03eb1d9, type: 3}
-  - {fileID: 2800000, guid: f33c946a27e0b4140847590b244ec4ba, type: 3}
-  - {fileID: 2800000, guid: 9b3401479dca04f49be7199e905f692b, type: 3}
-  - {fileID: 2800000, guid: c3569f15b85ba70489c2c69dcbb9972e, type: 3}
-  - {fileID: 2800000, guid: 1c87354e454c1c2449aa6262998323a5, type: 3}
-  - {fileID: 2800000, guid: ee0edf9b22b628d4ea70367c74baff50, type: 3}
-  - {fileID: 2800000, guid: 7fb48a4c2bbf31948a48b0f42fb6d186, type: 3}
-  - {fileID: 2800000, guid: 6eae399c2aac6894082f96f24b0e84db, type: 3}
-  - {fileID: 2800000, guid: 2f1822ee4f2eb6946aaca145743e91d1, type: 3}
-  - {fileID: 2800000, guid: 5866e4bda2d23774c96d65a371ec82e4, type: 3}
-  - {fileID: 2800000, guid: 42b1dde68720d624fad307339cfc6122, type: 3}
-  - {fileID: 2800000, guid: ace5d0aa4feba1a49ab549796bc7de66, type: 3}
-  - {fileID: 2800000, guid: 0460cc5fd34039442b3ff81e3f0323ba, type: 3}
-  - {fileID: 2800000, guid: ac4d5d106c9035943af87fd66bb4ac39, type: 3}
-  - {fileID: 2800000, guid: 1508c90009aacd04699d75665dea614d, type: 3}
-  - {fileID: 2800000, guid: a21d67000d548d749a3f71bcd4bdc233, type: 3}
-  - {fileID: 2800000, guid: 3e3bb7e51980dd34da4942935c24239b, type: 3}
-  - {fileID: 2800000, guid: d6b81615fc8960f4295598b8032c3ede, type: 3}
-  - {fileID: 2800000, guid: f5c5de3852af09740af335898833916a, type: 3}
-  - {fileID: 2800000, guid: aaae1f576b9f04a4ba083012c255ec86, type: 3}
-  - {fileID: 2800000, guid: faf05abde41549041b23f68fb0b70bfa, type: 3}
+  - {fileID: 2800000, guid: 19831c53e49f01a419213cdc9fdc769c, type: 3}
+  - {fileID: 2800000, guid: 57729e89d40ed604fbe0a319c5d0e467, type: 3}
+  - {fileID: 2800000, guid: 923c03b8f4f92f0498652d078f1891a1, type: 3}
+  - {fileID: 2800000, guid: 191aacffa8ebc9e4996cf2bc23e6dfc7, type: 3}
+  - {fileID: 2800000, guid: cd07b03a9c0fa8244a7a5815e044a581, type: 3}
+  - {fileID: 2800000, guid: 187a8c01c3f18684b92532dccf8a35d4, type: 3}
+  - {fileID: 2800000, guid: 155422630b0a1014fb4b37563c4f325e, type: 3}
+  - {fileID: 2800000, guid: 35b3d802264a08e4a97cf8dfd8f4ce67, type: 3}
+  - {fileID: 2800000, guid: ce27c24b2b22c954ca2348c4d33f48bb, type: 3}
+  - {fileID: 2800000, guid: a4a9714d1600e0f4c968a0140ad64e5c, type: 3}
+  - {fileID: 2800000, guid: 1f1210050a455994aaf12f941c81ee57, type: 3}
   VirtualTextureList: []
   SlicePadding: 0
   SlicePath: Assets/ZTemp

+ 2 - 3
Assets/Resource/Logo.unity

@@ -445,9 +445,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 1
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugMode: 0
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 14 - 1
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -51,7 +51,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 93a1da3798d4c6b44a5a139df98a95f3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Texture: {fileID: 2800000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  AtlasTexture: {fileID: 2800000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  ExpressionTexture: {fileID: 2800000, guid: 980c962c52249774e9266e82d2496d13, type: 3}
   UiList:
   - {fileID: 21300000, guid: 896d2ef2d74c6054a8071b2d2b30fb23, type: 3}
   - {fileID: 21300000, guid: d34039ffca4617d43b735c7ce52c238d, type: 3}
@@ -125,6 +126,7 @@ MonoBehaviour:
   - {fileID: 1089668954114348, guid: 6dd9933035ffa7645bbd45c1ccd66774, type: 2}
   - {fileID: 1883440964438570, guid: 11e55fe29ace64347b31ab7593e7ea51, type: 2}
   - {fileID: 1203281534794934, guid: c9dfe3f9d9cf0f2428f731dc26ac10b5, type: 2}
+  - {fileID: 1494806348296548, guid: 0b51a43aa6ef9574382eb28adc6b0fa7, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
@@ -242,6 +244,17 @@ MonoBehaviour:
   - {fileID: 2800000, guid: 7ac265c5bd69ac5488e5fe03a9b10399, type: 3}
   - {fileID: 1534767049009076, guid: b6c28e79e69b67b41bb8d878bcc3cd54, type: 2}
   - {fileID: 1888753063508628, guid: a9536479b9a1e3945bbff2f92a19715b, type: 2}
+  - {fileID: 21300020, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300004, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300008, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300006, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300014, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300000, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300016, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300002, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300010, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300018, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  - {fileID: 21300012, guid: 980c962c52249774e9266e82d2496d13, type: 3}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}

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

@@ -41,6 +41,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1223101333050066
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4684695634194306}
+  - component: {fileID: 212874557632169304}
+  m_Layer: 0
+  m_Name: ExpressionSr
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1310064156687650
 GameObject:
   m_ObjectHideFlags: 0
@@ -252,6 +268,7 @@ Transform:
   - {fileID: 4645389164054564}
   - {fileID: 4096510784813918}
   - {fileID: 4066961497983484}
+  - {fileID: 4684695634194306}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -320,6 +337,19 @@ Transform:
   m_Father: {fileID: 4072475945792000}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4684695634194306
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1223101333050066}
+  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: 4072475945792000}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4717949673564384
 Transform:
   m_ObjectHideFlags: 1
@@ -431,3 +461,38 @@ SpriteRenderer:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!212 &212874557632169304
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1223101333050066}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0

+ 4 - 2
Assets/Resource/Prefab/PrefabUI/InfoItem.prefab → Assets/Resource/Prefab/PrefabUI/C_InfoItem.prefab

@@ -39,7 +39,7 @@ GameObject:
   - component: {fileID: 222043448060915440}
   - component: {fileID: 114566208526649250}
   m_Layer: 5
-  m_Name: InfoItem
+  m_Name: C_InfoItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -98,7 +98,7 @@ MonoBehaviour:
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -107,6 +107,8 @@ MonoBehaviour:
     m_LineSpacing: 1
   m_Text: "\u63D0\u793A\u5185\u5BB9"
   Draw: 0
+  SetY: 0
+  Y: 0
   LineHeight: 10.4
   RemovePos: 18000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f0000003000000031000000320000003300000034000000350000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f00000050000000510000005200000053000000540000005500000056000000570000005800000059000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c0000007d000000
   ImageIndex: 030000000400000005000000

+ 0 - 0
Assets/Resource/Prefab/PrefabUI/InfoItem.prefab.meta → Assets/Resource/Prefab/PrefabUI/C_InfoItem.prefab.meta


+ 9 - 9
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -180,7 +180,7 @@ GameObject:
   m_IsActive: 1
 --- !u!1 &1056194380739106
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
@@ -190,7 +190,7 @@ GameObject:
   - component: {fileID: 114569977249034850}
   - component: {fileID: 225467522626526942}
   m_Layer: 5
-  m_Name: J_Info
+  m_Name: C_Info
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9325,7 +9325,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224133419404342274}
-  - {fileID: 224422329702985050}
   - {fileID: 224249425076514156}
   - {fileID: 224976257765136696}
   m_Father: {fileID: 0}
@@ -9441,7 +9440,7 @@ RectTransform:
   m_Children:
   - {fileID: 224680089773978208}
   m_Father: {fileID: 224198081419304548}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -9971,16 +9970,16 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1056194380739106}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 224198081419304548}
-  m_RootOrder: 1
+  m_Father: {fileID: 224476342221405536}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -101}
+  m_AnchoredPosition: {x: 195.00502, y: -96.12113}
   m_SizeDelta: {x: 400, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224430338104111620
@@ -10196,6 +10195,7 @@ RectTransform:
   - {fileID: 224270387276606410}
   - {fileID: 224327389779206034}
   - {fileID: 224549513267331424}
+  - {fileID: 224422329702985050}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11571,7 +11571,7 @@ RectTransform:
   - {fileID: 224983814714287144}
   - {fileID: 224805457344542120}
   m_Father: {fileID: 224198081419304548}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

文件差异内容过多而无法显示
+ 767 - 31
Assets/Resource/Prefab/PrefabUI/GroupD.prefab


+ 0 - 614
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -200,23 +200,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1092226629835852
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224752129417099796}
-  - component: {fileID: 222345184210288048}
-  - component: {fileID: 114442419444005856}
-  m_Layer: 5
-  m_Name: X_SendPublicMessageLab
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1102509989326732
 GameObject:
   m_ObjectHideFlags: 1
@@ -374,24 +357,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1197165517111584
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224918418625516130}
-  - component: {fileID: 222741245763408706}
-  - component: {fileID: 114101462058230954}
-  - component: {fileID: 114662105278463662}
-  m_Layer: 5
-  m_Name: X_InputField
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1206729900467156
 GameObject:
   m_ObjectHideFlags: 1
@@ -739,24 +704,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1451209457613740
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224696204889239284}
-  - component: {fileID: 222920896588033716}
-  - component: {fileID: 114470636249044216}
-  - component: {fileID: 114940852357000256}
-  m_Layer: 5
-  m_Name: X_SendPublicMessage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1456638495083814
 GameObject:
   m_ObjectHideFlags: 1
@@ -928,23 +875,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1584362519963980
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224336880314354090}
-  - component: {fileID: 222852353208663306}
-  - component: {fileID: 114534123046101314}
-  m_Layer: 5
-  m_Name: X_InputFieldLab
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1602944605773306
 GameObject:
   m_ObjectHideFlags: 1
@@ -1402,21 +1332,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1884517499118456
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224900269268597000}
-  m_Layer: 5
-  m_Name: X_PlazaRoom
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
 --- !u!1 &1887592193098874
 GameObject:
   m_ObjectHideFlags: 1
@@ -1468,24 +1383,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
---- !u!1 &1903182408867068
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224358520520285324}
-  - component: {fileID: 222305396976349566}
-  - component: {fileID: 114245478290668652}
-  - component: {fileID: 114791936738939496}
-  m_Layer: 5
-  m_Name: X_Quit
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1909796038324812
 GameObject:
   m_ObjectHideFlags: 1
@@ -1559,23 +1456,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
---- !u!1 &1941419219920550
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224015962265307136}
-  - component: {fileID: 222462031097169330}
-  - component: {fileID: 114169223888998188}
-  m_Layer: 5
-  m_Name: X_Placeholder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1987176473717718
 GameObject:
   m_ObjectHideFlags: 1
@@ -2064,33 +1944,6 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
---- !u!114 &114101462058230954
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1197165517111584}
-  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: 10911, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &114105624197808292
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2402,39 +2255,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114169223888998188
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1941419219920550}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
-  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: 14
-    m_FontStyle: 2
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Enter text...
 --- !u!114 &114181262799530072
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2622,33 +2442,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114245478290668652
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1903182408867068}
-  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: 9d315b38800072f4b9e0f7dc9c11c385, 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 &114270083125411832
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3230,39 +3023,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114442419444005856
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1092226629835852}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u53D1\u9001"
 --- !u!114 &114447139725208058
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3349,33 +3109,6 @@ MonoBehaviour:
   m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &114470636249044216
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1451209457613740}
-  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &114483246867038058
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3618,39 +3351,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!114 &114534123046101314
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1584362519963980}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 0
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 
 --- !u!114 &114537670150354550
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4079,69 +3779,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114662105278463662
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1197165517111584}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 114101462058230954}
-  m_TextComponent: {fileID: 114534123046101314}
-  m_Placeholder: {fileID: 114169223888998188}
-  m_ContentType: 0
-  m_InputType: 0
-  m_AsteriskChar: 42
-  m_KeyboardType: 0
-  m_LineType: 0
-  m_HideMobileInput: 0
-  m_CharacterValidation: 0
-  m_CharacterLimit: 0
-  m_OnEndEdit:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
-  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_CustomCaretColor: 0
-  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 
-  m_CaretBlinkRate: 0.85
-  m_CaretWidth: 1
-  m_ReadOnly: 0
 --- !u!114 &114673612659862752
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4499,47 +4136,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114791936738939496
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1903182408867068}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 114245478290668652}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114798544481346068
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5213,47 +4809,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114940852357000256
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1451209457613740}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 114470636249044216}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114967214668617066
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5626,12 +5181,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1792936000059242}
---- !u!222 &222305396976349566
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1903182408867068}
 --- !u!222 &222308301118324566
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5656,12 +5205,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1206729900467156}
---- !u!222 &222345184210288048
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1092226629835852}
 --- !u!222 &222345427005030020
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5722,12 +5265,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1343327778713264}
---- !u!222 &222462031097169330
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1941419219920550}
 --- !u!222 &222464363595504280
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5818,12 +5355,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1655035403781822}
---- !u!222 &222741245763408706
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1197165517111584}
 --- !u!222 &222742105261906608
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5884,12 +5415,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1887592193098874}
---- !u!222 &222852353208663306
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1584362519963980}
 --- !u!222 &222854763754090876
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5932,12 +5457,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1318297364814548}
---- !u!222 &222920896588033716
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1451209457613740}
 --- !u!222 &222922300138179170
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5962,24 +5481,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1038452785096924}
---- !u!224 &224015962265307136
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1941419219920550}
-  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: 224918418625516130}
-  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.5}
-  m_SizeDelta: {x: -20, y: -13}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224035531306328718
 RectTransform:
   m_ObjectHideFlags: 1
@@ -6512,24 +6013,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224336880314354090
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1584362519963980}
-  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: 224918418625516130}
-  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.5}
-  m_SizeDelta: {x: -20, y: -13}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224337869017959276
 RectTransform:
   m_ObjectHideFlags: 1
@@ -6642,24 +6125,6 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000013351, y: 122.999985}
   m_SizeDelta: {x: 585, y: 280.9}
   m_Pivot: {x: 0.5, y: 0.99999994}
---- !u!224 &224358520520285324
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1903182408867068}
-  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: 224900269268597000}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 43.200012, y: -31.800003}
-  m_SizeDelta: {x: 86.4, y: 63.6}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224363928690615490
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7299,25 +6764,6 @@ RectTransform:
   m_AnchoredPosition: {x: 1087.1667, y: -0.08007204}
   m_SizeDelta: {x: -631.1, y: -630}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224696204889239284
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1451209457613740}
-  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: 224752129417099796}
-  m_Father: {fileID: 224900269268597000}
-  m_RootOrder: 2
-  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: -160, y: -210.01997}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224705582934009082
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7372,24 +6818,6 @@ RectTransform:
   m_AnchoredPosition: {x: 129.2, y: 0}
   m_SizeDelta: {x: -258.5, y: 32.5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224752129417099796
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1092226629835852}
-  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: 224696204889239284}
-  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}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224782530703948524
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7528,7 +6956,6 @@ RectTransform:
   - {fileID: 224337869017959276}
   - {fileID: 224219876285234432}
   - {fileID: 224300270873615824}
-  - {fileID: 224900269268597000}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7629,27 +7056,6 @@ RectTransform:
   m_AnchoredPosition: {x: 12.7499695, y: 0.08192444}
   m_SizeDelta: {x: -54, y: -306}
   m_Pivot: {x: 0.49999997, y: 0.99999994}
---- !u!224 &224900269268597000
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1884517499118456}
-  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: 224358520520285324}
-  - {fileID: 224918418625516130}
-  - {fileID: 224696204889239284}
-  m_Father: {fileID: 224814127152008004}
-  m_RootOrder: 5
-  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 &224905892849275844
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7668,26 +7074,6 @@ RectTransform:
   m_AnchoredPosition: {x: -1155.407, y: -99.603874}
   m_SizeDelta: {x: 87.852, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224918418625516130
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1197165517111584}
-  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: 224015962265307136}
-  - {fileID: 224336880314354090}
-  m_Father: {fileID: 224900269268597000}
-  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: -320, y: -210.02}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224921106973203834
 RectTransform:
   m_ObjectHideFlags: 1

+ 184 - 0
Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab

@@ -0,0 +1,184 @@
+%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: 1494806348296548}
+  m_IsPrefabParent: 1
+--- !u!1 &1249726711808988
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224015320767109772}
+  - component: {fileID: 222838871450062952}
+  - component: {fileID: 114997900508646700}
+  m_Layer: 0
+  m_Name: InfoImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1494806348296548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224682630866636858}
+  - component: {fileID: 222196611509190880}
+  - component: {fileID: 114800871698021790}
+  m_Layer: 5
+  m_Name: X_InfoItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114800871698021790
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1494806348296548}
+  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: 1, g: 1, b: 1, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 10
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 20
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u63D0\u793A\u5185\u5BB9"
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 10.4
+  RemovePos: 18000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f0000003000000031000000320000003300000034000000350000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f00000050000000510000005200000053000000540000005500000056000000570000005800000059000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c0000007d000000
+  ImageIndex: 030000000400000005000000
+  RemoveIndex: 04000000050000000600000007000000080000000a0000000b0000000c0000000d0000000e0000001000000011000000120000001300000014000000
+  NewTextIndex: 000000000100000002000000
+  NewTextPos:
+  - {x: -201.76991, y: 72.566376, z: 0}
+  - {x: -187.61063, y: 72.566376, z: 0}
+  - {x: -187.61063, y: 53.097347, z: 0}
+  - {x: -187.61063, y: 53.097347, z: 0}
+  - {x: -201.76991, y: 53.097347, z: 0}
+  - {x: -201.76991, y: 72.566376, z: 0}
+  - {x: -191.15045, y: 72.566376, z: 0}
+  - {x: -176.99115, y: 72.566376, z: 0}
+  - {x: -176.99115, y: 53.097347, z: 0}
+  - {x: -176.99115, y: 53.097347, z: 0}
+  - {x: -191.15045, y: 53.097347, z: 0}
+  - {x: -191.15045, y: 72.566376, z: 0}
+  - {x: -180.53098, y: 72.566376, z: 0}
+  - {x: -166.37169, y: 72.566376, z: 0}
+  - {x: -166.37169, y: 51.327435, z: 0}
+  - {x: -166.37169, y: 51.327435, z: 0}
+  - {x: -180.53098, y: 51.327435, z: 0}
+  - {x: -180.53098, y: 72.566376, z: 0}
+--- !u!114 &114997900508646700
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1249726711808988}
+  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: 21300000, guid: 64ace2edec65be1458f4f6c09ae97699, type: 3}
+  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 &222196611509190880
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1494806348296548}
+--- !u!222 &222838871450062952
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1249726711808988}
+--- !u!224 &224015320767109772
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1249726711808988}
+  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: 224682630866636858}
+  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}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224682630866636858
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1494806348296548}
+  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: 224015320767109772}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}

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

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

+ 9 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 480def005a207634f8a9947a9bfb89d9
+folderAsset: yes
+timeCreated: 1506738737
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png


+ 246 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png.meta

@@ -0,0 +1,246 @@
+fileFormatVersion: 2
+guid: 980c962c52249774e9266e82d2496d13
+timeCreated: 1506747431
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: "\u6253\u5B57\u6846"
+    21300002: "\u6C57\u989C"
+    21300004: "\u54ED"
+    21300006: "\u5F00\u5FC3"
+    21300008: "\u59D4\u5C48"
+    21300010: "\u8272\u54AA\u54AA"
+    21300012: "\u90C1\u95F7"
+    21300014: "\u60CA\u8BB6"
+    21300016: "\u671F\u5F85"
+    21300018: "\u8868\u60C5\u6309\u94AE"
+    21300020: "\u53D1\u9001\u6309\u94AE"
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: "\u6253\u5B57\u6846"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1
+        width: 858
+        height: 124
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u6C57\u989C"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 127
+        width: 295
+        height: 328
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u54ED"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 457
+        width: 287
+        height: 154
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5F00\u5FC3"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 613
+        width: 270
+        height: 135
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u59D4\u5C48"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 750
+        width: 241
+        height: 63
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8272\u54AA\u54AA"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 815
+        width: 240
+        height: 129
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u90C1\u95F7"
+      rect:
+        serializedVersion: 2
+        x: 298
+        y: 127
+        width: 237
+        height: 94
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u60CA\u8BB6"
+      rect:
+        serializedVersion: 2
+        x: 298
+        y: 223
+        width: 235
+        height: 119
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u671F\u5F85"
+      rect:
+        serializedVersion: 2
+        x: 298
+        y: 344
+        width: 235
+        height: 121
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8868\u60C5\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 298
+        y: 467
+        width: 130
+        height: 123
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u53D1\u9001\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 298
+        y: 592
+        width: 130
+        height: 123
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: scene
+  assetBundleVariant: 

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/发送按钮.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/发送按钮.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/哭.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/哭.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/委屈.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/委屈.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/开心.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/开心.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/惊讶.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/惊讶.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/打字框.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/打字框.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/期待.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/期待.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/汗颜.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/汗颜.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/色咪咪.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/色咪咪.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/表情按钮.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/表情按钮.png.meta

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

二进制
Assets/Resource/Sprite/Editor/PlazaRoom/表情/郁闷.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情/郁闷.png.meta

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

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

@@ -19,7 +19,7 @@ public class EditorSpriteAsste : Editor
 
         if (GUILayout.Button("Hit"))
         {
-            SpriteAsset.AddBundleSpriteInfo();
+            SpriteAsset.AddAllBundleSpriteInfo();
         }
 
         ScrollPos = GUILayout.BeginScrollView(ScrollPos, false, false);

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

@@ -128,7 +128,7 @@ public class Initializer : MonoBehaviour
             gameObject.AddScript<ManaMiniGame>();
 
             progress = "27";
-            gameObject.AddScript<ManaInfo>();
+            gameObject.AddScript<ManaInfoBox>();
 
             progress = "28";
             gameObject.AddScript<ManaSocial>();

+ 0 - 102
Assets/Script/Manage/ManaInfo.cs

@@ -1,102 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-
-public class ManaInfo : Regist
-{
-    public class InfoText
-    {
-        public float Timer;
-
-        public Text Text;
-    }
-
-    #region 变量
-
-    public static CanvasGroup CanvasGroup
-    {
-        get
-        {
-            if (CanvasGroup_ == null)
-            {
-                CanvasGroup_ = ManaReso.Get<CanvasGroup>("J_Info");
-            }
-
-            return CanvasGroup_;
-        }
-        set { CanvasGroup_ = value; }
-    }
-
-    public static CanvasGroup CanvasGroup_;
-
-
-    public static bool Lock;
-    public static float Timer;
-
-    public static List<InfoText> TextList = new List<InfoText>();
-
-    #endregion
-
-    public void Update()
-    {
-        Timer -= Time.deltaTime;
-
-        if (Timer <= 0 && Lock)
-        {
-            Lock = false;
-
-            CanvasGroup.TweenBacCG();
-        }
-
-        
-        for (int i = 0; i < TextList.Count; i++)
-        {
-            InfoText infoText = TextList[i];
-
-            infoText.Timer -= Time.deltaTime;
-
-            if (infoText.Timer < 0)
-            {
-                infoText.Text.TweenBacGra();
-
-
-                TextList.RemoveAt(i--);
-            }
-        }
-    }
-
-
-    public static void Show(string str, float time)
-    {
-        CanvasGroup.TweenForCG();
-
-        if (TextList.Count == 4)
-        {
-            ManaReso.Save(TextList[0].Text);
-
-            TextList.RemoveAt(0);
-        }
-
-
-        Text text = ManaReso.GetInfoItem();
-
-        InfoText infoText = new InfoText();
-
-        text.text = str;
-
-        text.SetAlpha(1);
-
-        infoText.Timer = 45;
-
-        infoText.Text = text;
-
-        TextList.Add(infoText);
-
-
-        Lock = true;
-        Timer = time;
-    }
-}

+ 142 - 0
Assets/Script/Manage/ManaInfoBox.cs

@@ -0,0 +1,142 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+
+public enum InfoCategory
+{
+    Garden,
+    PlazaRoom,
+}
+
+public class ManaInfoBox : Regist
+{
+    public class InfoBox
+    {
+        public class InfoText
+        {
+            public float Timer;
+            public Text Text;
+        }
+
+        public int MaxCount;
+        public bool Lock;
+        public float DurationTime;
+        public float DurationTimer;
+        public string InfoItemName;
+        public List<InfoText> TextList = new List<InfoText>();
+        public Transform Grid;
+        public CanvasGroup CanvasGroup;
+
+        public InfoBox(int maxCount, float duration, string infoItemName, Transform grid)
+        {
+            Grid = grid;
+            DurationTime = duration;
+            MaxCount = maxCount;
+            InfoItemName = infoItemName;
+            CanvasGroup = Grid.GetComponent<CanvasGroup>(); 
+        }
+
+        public void Update()
+        {
+            DurationTimer -= Time.deltaTime;
+
+            if (DurationTimer <= 0 && Lock)
+            {
+                Lock = false;
+
+                CanvasGroup.TweenBacCG();
+            }
+
+
+            for (int i = 0; i < TextList.Count; i++)
+            {
+                InfoText infoText = TextList[i];
+
+                infoText.Timer -= Time.deltaTime;
+
+                if (infoText.Timer < 0)
+                {
+                    infoText.Text.TweenBacGra();
+
+                    TextList.RemoveAt(i--);
+                }
+            }
+        }
+
+        public void Show(string str, float time, Sprite atlas)
+        {
+            CanvasGroup.TweenForCG();
+
+            if (TextList.Count == MaxCount)
+            {
+                ManaReso.Save(TextList[0].Text);
+
+                TextList.RemoveAt(0);
+            }
+
+
+            TextPlus text = ManaReso.GetInfoItem(InfoItemName);
+            text.ImagePlus.sprite = atlas;
+            text.SetParent(Grid);
+            text.rectTransform.SetAsFirstSibling();
+
+            InfoText infoText = new InfoText();
+
+            text.text = str;
+
+            text.SetAlpha(1);
+
+            infoText.Timer = DurationTime;
+
+            infoText.Text = text;
+
+            TextList.Add(infoText);
+
+
+            Lock = true;
+            DurationTimer = time;
+        }
+    }
+
+    #region Config
+
+    private const int MaxGardenInfoCount = 4;
+    private const int MaxPlazaRoomCount = 50;
+
+    private static InfoBox GardenInfoBox;
+    private static InfoBox PlazaRoomInfoBox;
+
+    #endregion
+
+    public override void RegistValueA()
+    {
+        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, "C_InfoItem", ManaReso.Get("C_Info"));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, "X_InfoItem", ManaReso.Get("X_Info"));
+    }
+
+    public void Update()
+    {
+        GardenInfoBox.Update();
+        PlazaRoomInfoBox.Update();
+    }
+
+    public static void Show(InfoCategory infoCategory, string str, float time, Sprite atlas = null)
+    {
+        if (infoCategory == InfoCategory.Garden)
+        {
+            GardenInfoBox.Show(str, time, atlas);
+        }
+        else if (infoCategory == InfoCategory.PlazaRoom)
+        {
+            PlazaRoomInfoBox.Show(str, time, atlas);
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+}

+ 2 - 2
Assets/Script/Manage/ManaInfo.cs.meta → Assets/Script/Manage/ManaInfoBox.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 9a8b50b120796d04eb78234fead81edb
-timeCreated: 1495420329
+guid: 9c4f1f081fc630f40a857a063d68a90e
+timeCreated: 1506740020
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 3 - 3
Assets/Script/Manage/ManaReso.cs

@@ -705,13 +705,13 @@ public class ManaReso : Regist
     }
 
 
-    public static Text GetInfoItem()
+    public static TextPlus GetInfoItem(string infoItemName)
     {
-        Transform tra = Get("InfoItem", Folder.UI, false, Get("J_Info"), false, ObjType.InfoItem);
+        Transform tra = Get(infoItemName, Folder.UI, false, Get("Canvas"), false, ObjType.InfoItem);
 
         tra.SetAsFirstSibling();
 
-        Text text = tra.GetComponent<Text>();
+        TextPlus text = tra.GetComponent<TextPlus>();
 
         TweenRoot tween = text.CreateTweenGra(0, 1, 0.25f, true, true, Curve.EaseOutQuad);
 

+ 5 - 5
Assets/Script/Manage/ManaServer.cs

@@ -669,7 +669,7 @@ public class ManaServer : Regist
 
                 mailItem.GetChild(2).GetComponent<Text>().text = pack.Name;
 
-                ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(礼包)>{pack.Name}", 10);
+                ManaInfoBox.Show(InfoCategory.Garden,  $"{Language.GetStr("Common", "Get")} <(礼包)>{pack.Name}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             }
             else
             {
@@ -717,7 +717,7 @@ public class ManaServer : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = closeUnit.Name;
 
-                    ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(服装)>{closeUnit.Name}", 10);
+                    ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(服装)>{closeUnit.Name}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -753,7 +753,7 @@ public class ManaServer : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = flowerInfo.Name;
 
-                    ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(花朵)>{flowerInfo.Name}", 10);
+                    ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(花朵)>{flowerInfo.Name}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -779,7 +779,7 @@ public class ManaServer : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(金币)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10);
+            ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(金币)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
@@ -799,7 +799,7 @@ public class ManaServer : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(钻石)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10);
+            ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(钻石)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
         else
         {

+ 137 - 2
Assets/Script/Manage/ManaUI.cs

@@ -953,7 +953,7 @@ public class ManaUI : Regist
                 ManaReso.Get("GardenMini").TweenBacVec();
                 ManaReso.Get("D_MiniGame").TweenBacCG();
 
-                ManaInfo.Show(Award.Info, 10f);
+                ManaInfoBox.Show(InfoCategory.Garden, Award.Info, 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             }
         );
 
@@ -1802,7 +1802,7 @@ public class ManaUI : Regist
 
         #region J
 
-        ManaReso.Get("J_Info").CreateTweenCG(0, 0.9f, 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("C_Info").CreateTweenCG(0, 0.9f, 0.25f, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -2800,6 +2800,8 @@ public class ManaUI : Regist
 
         #region X
 
+        #region X_Quit
+
         ManaReso.SetButtonEvent
         (
             "X_Quit",
@@ -2811,6 +2813,10 @@ public class ManaUI : Regist
             }
         );
 
+        #endregion
+
+        #region X_SendPublicMessage
+
         ManaReso.SetButtonEvent
         (
             "X_SendPublicMessage",
@@ -2827,6 +2833,135 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region X_Info
+
+        ManaReso.Get("X_Info").CreateTweenCG(0, 0.9f, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
+        #region X_Expression
+
+        ManaReso.AddButtonEvent
+        (
+            "X_Expression",
+            () =>
+            {
+                ManaReso.SetActive("X_Grid", true);
+                ManaReso.SetActive("X_Mask", true);
+            }
+        );
+
+        #endregion
+
+        #region X_Mask
+
+        ManaReso.AddButtonEvent
+        (
+            "X_Mask",
+            () =>
+            {
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        #endregion
+
+        #region Expression
+
+        ManaReso.AddButtonEvent
+        (
+            "X_BlueFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+
+        ManaReso.AddButtonEvent
+        (
+            "X_SweatFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.汗颜);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "X_SurpriseFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.惊讶);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "X_HappyFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.开心);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "X_CryFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.哭);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "X_HopeFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.期待);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "X_OgleFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.色咪咪);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "X_ChagrinFace",
+            () =>
+            {
+                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.委屈);
+                ManaReso.SetActive("X_Grid", false);
+                ManaReso.SetActive("X_Mask", false);
+            }
+        );
+
+        #endregion
+
+        #endregion
+
         if (!ManaTutorial.TutorialA)
         {
             HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();

+ 50 - 0
Assets/Script/Object/Player.cs

@@ -532,8 +532,22 @@ public class Player : Regist , IPointerClickHandler
     public float JumpTime;
     public float JumpTimer;
 
+    public SpriteRenderer ExpressionSr;
+
     public Dictionary<string, Transform> ChildDic = new Dictionary<string, Transform>();
 
+    public static Dictionary<string, Vector3> ExpressionPositionDictionary = new Dictionary<string, Vector3>
+    {
+        {"郁闷", new Vector3(0, -0.22f, -0.001f)},
+        {"汗颜", new Vector3(0.29f, 0.91f, -0.001f)},
+        {"惊讶", new Vector3(0.09f, -0.07f, -0.001f)},
+        {"开心", new Vector3(0.1f, -0.22f, -0.001f)},
+        {"哭", new Vector3(0.07f, -0.64f, -0.001f)},
+        {"期待", new Vector3(0.04f, -0.20f, -0.001f)},
+        {"色咪咪", new Vector3(0.03f, -0.09f, -0.001f)},
+        {"委屈", new Vector3(0f, -0.27f, -0.001f)},
+    };
+
     #region 换装
 
     public string Eye;
@@ -600,6 +614,8 @@ public class Player : Regist , IPointerClickHandler
             Curve.EaseOutQuad
         );
 
+        ExpressionSr = ChildDic["ExpressionSr"].GetComponent<SpriteRenderer>();
+
         return false;
     }
 
@@ -710,16 +726,50 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
+    public void ResetExpression()
+    {
+        ExpressionSr.SetActive(false);
+        EyeSlot.UnityTransform.GetChild(0).SetActive(true);
+        MouseSlot.UnityTransform.GetChild(0).SetActive(true);
+    }
+
+    public void ChangeExpression(string expressionName, float duration)
+    {
+        Vector3 position = ExpressionPositionDictionary[expressionName];
+        //position.x *= transform.lossyScale.x;
+        //position.y *= transform.lossyScale.y;
+
+        ExpressionSr.sprite = ManaReso.LoadSprite(expressionName, Folder.Scene);
+        ExpressionSr.transform.parent = EyeSlot.UnityTransform;
+        ExpressionSr.transform.localPosition = position;
+
+        ExpressionSr.SetActive(true);
+        EyeSlot.UnityTransform.GetChild(0).SetActive(false);
+        MouseSlot.UnityTransform.GetChild(0).SetActive(false);
+
+        Auxiliary.Instance.DelayCall
+        (
+            () =>
+            {
+                ResetExpression();
+            },
+            duration
+        );
+    }
+
+
     public void Flip(PlayerDirection direction)
     {
         if (direction == PlayerDirection.Left)
         {
             UAC.armature.flipX = false;
+            ExpressionSr.flipX = false;
             playerDirection = PlayerDirection.Left;
         }
         else
         {
             UAC.armature.flipX = true;
+            ExpressionSr.flipX = true;
             playerDirection = PlayerDirection.Right;
         }
     }

+ 1 - 1
Assets/Script/Object/PlazaRoom.cs

@@ -166,7 +166,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         {
             plazaRoomPlayer.Player.transform.hasChanged = false;
 
-            plazaRoomPlayer.NickName.SetAsLastSibling();
+            plazaRoomPlayer.NickNameTransform.SetAsLastSibling();
             plazaRoomPlayer.MessageBox.SetAsLastSibling();
         }
     }

+ 1 - 1
Assets/Script/Object/Skill/BigSkill.cs

@@ -478,7 +478,7 @@ public class BigSkill : Skill
                 UseA();
                 UseB();
 
-                ManaInfo.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f);
+                ManaInfoBox.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能,
             StaticsManager.ConsumeModule.Shop

+ 1 - 1
Assets/Script/Object/Skill/Pack.cs

@@ -380,7 +380,7 @@ public class Pack : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            ManaInfo.Show(str, 10f);
+            ManaInfoBox.Show(InfoCategory.Garden, str, 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
 
 

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

@@ -302,7 +302,7 @@ public class Skill : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            ManaInfo.Show(sb.ToString(), 10f);
+            ManaInfoBox.Show(InfoCategory.Garden, sb.ToString(), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
     }
 
@@ -372,7 +372,7 @@ public class Skill : SkillRoot
                 UseA();
                 UseB();
 
-                ManaInfo.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f);
+                ManaInfoBox.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能, 
             StaticsManager.ConsumeModule.Shop

+ 1 - 1
Assets/Script/Object/Star.cs

@@ -150,7 +150,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
         BoxCollider.enabled = false;
 
 
-        ManaInfo.Show(Language.GetStr("Object", "Star") + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f);
+        ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("Object", "Star") + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
 
         ManaCenter.MiniTimer -= CD;
 

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

@@ -4,4 +4,5 @@
     ReceivePublicMessage = 1,
     Synchronize = 2,
     Instantiate = 3,
+    ReceiveExpression = 4,
 }

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

@@ -7,4 +7,5 @@
     Position = 4,
     PlayerDirection = 5,
     NickName = 6,
+    Expression = 7,
 }

+ 11 - 0
Assets/Script/SFS/ID/ExpressionID.cs

@@ -0,0 +1,11 @@
+public enum ExpressionID
+{
+    郁闷 = 0,
+    汗颜 = 1,
+    惊讶 = 2,
+    开心 = 3,
+    哭 = 4,
+    期待 = 5,
+    色咪咪 = 6,
+    委屈 = 7,
+}

+ 12 - 0
Assets/Script/SFS/ID/ExpressionID.cs.meta

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

+ 38 - 8
Assets/Script/SFS/Manager/PlazaRoomManager.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
 using System.Collections.Generic;
 using System.Linq;
@@ -14,30 +15,37 @@ public class PlazaRoomManager
 {
     public class PlazaRoomPlayer
     {
+        #region Config
+
+        public string NickName;
+
         public Player Player;
-        public Transform NickName;
+        public Transform NickNameTransform;
         public Transform MessageBox;
         public List<TweenRoot> TweenRoots;
 
+        #endregion
+
         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);
+            NickNameTransform = ManaReso.Get("NickName", Folder.UI, false, ManaReso.Get("W_HudParent"), false, ObjType.NickName);
 
-            HudTarget hudTarget = NickName.GetComponent<HudTarget>();
+            HudTarget hudTarget = NickNameTransform.GetComponent<HudTarget>();
 
             if (hudTarget == null)
             {
-                hudTarget = NickName.AddComponent<HudTarget>();
+                hudTarget = NickNameTransform.AddComponent<HudTarget>();
             }
 
             hudTarget.PosTra = Player.ChildDic["NickName"];
             hudTarget.SetPosition();
 
-            NickName.GetComponent<Text>().text = string.IsNullOrEmpty(nickname) ? Language.GetStr("UI", "未命名") : nickname;
+            NickName = string.IsNullOrEmpty(nickname) ? Language.GetStr("UI", "未命名") : nickname;
+            NickNameTransform.GetComponent<Text>().text = NickName;
 
 
             MessageBox = ManaReso.Get("MessageBox", Folder.UI, false, ManaReso.Get("W_HudParent"), false, ObjType.MessageBox);
@@ -62,7 +70,7 @@ public class PlazaRoomManager
             }
 
             ManaReso.Save(Player);
-            ManaReso.Save(NickName);
+            ManaReso.Save(NickNameTransform);
             ManaReso.Save(MessageBox);
 
             Player.PlayAnim(Player.IdleAnimationName);
@@ -283,6 +291,7 @@ public class PlazaRoomManager
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onUserExitCurrentPlazaRoom += OnUserExitPlazaRoom;
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onUserEnterCurrentPlazaRoom += OnUserEnterPlazaRoom;
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onSynchronize += Synchronize;
+        GardenSmartFox.ExtensionManager.PlazaRoomExtension.onReceiveExpression += ReceiveExpression;
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onReceivePublicMessage += ReceivePublicMessage;
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onInstantiate += Instantiate;
 
@@ -472,9 +481,23 @@ public class PlazaRoomManager
         UserInstanceDictionary[sender].MoveTo(destination);
     }
 
+    public void ReceiveExpression(int expressionID, User sender)
+    {
+        PlazaRoomPlayer plazaRoomPlayer = UserInstanceDictionary[sender];
+
+        string expressionName = Enum.GetName(typeof(ExpressionID), expressionID);
+        plazaRoomPlayer.Player.ChangeExpression(expressionName, 3);
+
+        ManaInfoBox.Show(InfoCategory.PlazaRoom, $"{plazaRoomPlayer.NickName} : <({expressionName})>", 10, ManaReso.LoadSprite("Expression", Folder.Scene));
+    }
+
     public void ReceivePublicMessage(string message, User sender)
     {
-        UserInstanceDictionary[sender].ShowMessage(message);
+        PlazaRoomPlayer plazaRoomPlayer = UserInstanceDictionary[sender];
+
+        plazaRoomPlayer.ShowMessage(message);
+
+        ManaInfoBox.Show(InfoCategory.PlazaRoom, $"{plazaRoomPlayer.NickName} : {message}", 10, ManaReso.LoadSprite("Expression", Folder.Scene));
     }
 
     public void Instantiate(User user, SFSObject parameter)
@@ -486,6 +509,11 @@ public class PlazaRoomManager
     }
 
 
+    public void SendExpression(ExpressionID expressionID)
+    {
+        GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendExpression(expressionID);
+    }
+
     //private string LastPublicMessage;
     public bool SendPublicMessage(string message)
     {
@@ -509,6 +537,8 @@ public class PlazaRoomManager
 
             GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage(message);
 
+            //ManaInfoBox.Show(InfoCategory.PlazaRoom, $"{SelfUser.Name} : {message}", 10, ManaReso.LoadSprite("Expression", Folder.Scene));
+
             return true;
         }
     }

+ 28 - 1
Assets/Script/SFS/SFSExtension/PlazaRoomExtension.cs

@@ -20,8 +20,9 @@ public class PlazaRoomExtension
     public Action<Room> onJoinPlazaRoom;
     public Action<User> onUserExitCurrentPlazaRoom;
     public Action<User> onUserEnterCurrentPlazaRoom;
-    public Action<User, SFSObject> onSynchronize;
+    public Action<int, User> onReceiveExpression;
     public Action<string, User> onReceivePublicMessage;
+    public Action<User, SFSObject> onSynchronize;
     public Action<User, SFSObject> onInstantiate;
 
     public BaseSFSExtension BaseSFSExtension;
@@ -96,6 +97,17 @@ public class PlazaRoomExtension
         BaseSFSExtension.GardenSmartFox.AddRequest(parameter, RequestType.BatchAndOverride, RequestName.SynchronizeClose.ToString());
     }
 
+    public void SendExpression(ExpressionID expressionID)
+    {
+        SFSObject sfsObject = new SFSObject();
+        sfsObject.PutInt(DataID.SenderID.GetHashString(), BaseSFSExtension.GardenSmartFox.User.Id);
+        sfsObject.PutInt(DataID.Expression.GetHashString(), expressionID.GetHashCode());
+
+        SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.ReceiveExpression.GetHashCode(), sfsObject, -1);
+
+        BaseSFSExtension.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
+    }
+
     public void SendPublicMessage(string message)
     {
         SFSObject sfsObject = new SFSObject();
@@ -136,6 +148,21 @@ public class PlazaRoomExtension
             onSynchronize.Invoke(sender, parameter);
     }
 
+    public void ReceiveExpression(BaseEvent baseEvent)
+    {
+        //DebugManager.PrintKeysAndValuesOfBaseEvent("ReceivePlazaRoomPublicMessage", baseEvent);
+
+        SFSObject parameter = (SFSObject)baseEvent.Params["params"];
+
+        int senderID = parameter.GetInt(DataID.SenderID.GetHashString());
+        int expressionID = parameter.GetInt(DataID.Expression.GetHashString());
+
+        User sender = CurrentPlazaRoom.GetUserById(senderID);
+
+        if (onReceiveExpression != null)
+            onReceiveExpression.Invoke(expressionID, sender);
+    }
+
     public void ReceivePublicMessage(BaseEvent baseEvent)
     {
         //DebugManager.PrintKeysAndValuesOfBaseEvent("ReceivePlazaRoomPublicMessage", baseEvent);

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

@@ -181,6 +181,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
+            GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
+
             //SFSObject sfsObject = new SFSObject();
             //sfsObject.PutInt(DataID.SenderID.GetHashString(), 0);
             //sfsObject.PutText(DataID.Message.GetHashString(), "123");

+ 9 - 3
Assets/Script/Tool/Bundle.cs

@@ -28,7 +28,8 @@ public class Bundle : MonoBehaviour
     public static AssetBundle Discard;
     public static AssetBundle PlazaRoom;
 
-    public Texture2D Texture;
+    public Texture2D AtlasTexture;
+    public Texture2D ExpressionTexture;
     public List<Object> UiList;
     public List<Object> AtlasList;
     public List<Sprite> Atlas2List;
@@ -99,6 +100,11 @@ public class Bundle : MonoBehaviour
             }
             else if (folder == Folder.Scene)
             {
+                if (goName == "Expression")
+                {
+                    return (T)(Object)Sprite.Create(Instance.ExpressionTexture, new Rect(0, 0, Instance.AtlasTexture.width, Instance.AtlasTexture.height), new Vector2(0.5f, 0.5f));
+                }
+
                 for (int i = 0; i < Instance.SceneList.Count; i++)
                 {
                     if (Instance.SceneList[i].name == goName)
@@ -121,7 +127,7 @@ public class Bundle : MonoBehaviour
             {
                 if (goName == "Atlas")
                 {
-                    return (T) (Object) Sprite.Create(Instance.Texture, new Rect(0, 0, Instance.Texture.width, Instance.Texture.height), new Vector2(0.5f, 0.5f));
+                    return (T) (Object) Sprite.Create(Instance.AtlasTexture, new Rect(0, 0, Instance.AtlasTexture.width, Instance.AtlasTexture.height), new Vector2(0.5f, 0.5f));
                 }
 
                 for (int i = 0; i < Instance.AtlasList.Count; i++)
@@ -397,7 +403,7 @@ public class Bundle : MonoBehaviour
         yield return LoadEffect();
         //yield return LoadPlazaRoom();
 
-        SpriteAsset.AddBundleSpriteInfo();
+        SpriteAsset.AddAllBundleSpriteInfo();
 
         if (callback != null)
         {

+ 32 - 45
Assets/Script/Tool/UI/SpriteAsset.cs

@@ -57,57 +57,44 @@ public class SpriteAsset : MonoBehaviour
 
     #endregion
 
-    public static void AddBundleSpriteInfo()
+    public static void AddAllBundleSpriteInfo()
     {
-        Object[] objects = new Object[0];
+        Sprite[] sprites = new Sprite[0];
 
-        Texture2D texture = new Texture2D(0,0);
-        
-        if (Application.isPlaying == false)
-        {
-#if UNITY_EDITOR
+        sprites = Bundle.Atlas.LoadAssetWithSubAssets<Sprite>("Atlas");
+        AddBundleSpriteInfo(sprites);
 
-            objects = AssetDatabase.LoadAllAssetsAtPath("Assets/Resource/Sprite/SpriteUI/Atlas.png");
+        sprites = Bundle.Scene.LoadAssetWithSubAssets<Sprite>("Expression");
+        AddBundleSpriteInfo(sprites);
+    }
 
-            texture = AssetDatabase.LoadAssetAtPath<Texture2D>("Assets/Resource/Sprite/SpriteUI/Atlas.png");
-            
-#endif
-        }
-        else
+    public static void AddBundleSpriteInfo(Sprite[] sprites)
+    {
+        for (int i = 0; i < sprites.Length; i++)
         {
-            objects = Bundle.Atlas.LoadAllAssets();
-            
-            texture = Bundle.Atlas.LoadAsset<Texture2D>("Atlas");
-        }
+            ManaReso.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
 
-        for (int i = 0; i < objects.Length; i++)
-        {
-            if (objects[i] is Sprite)
-            {
-                Sprite sprite = (Sprite)objects[i];
-                SpriteInfo spriteInfo = new SpriteInfo();
-
-                spriteInfo.Sprite = sprite;
-                spriteInfo.Name = sprite.name;
-                spriteInfo.Width = sprite.rect.width;
-                spriteInfo.Height = sprite.rect.height;
-
-                float width = texture.width;
-                float height = texture.height;
-
-                Vector2 llUv = new Vector2(sprite.rect.xMin / width, sprite.rect.yMin / height);
-                Vector2 ulUv = new Vector2(sprite.rect.xMin / width, sprite.rect.yMax / height);
-                Vector2 urUv = new Vector2(sprite.rect.xMax / width, sprite.rect.yMax / height);
-                Vector2 lrUv = new Vector2(sprite.rect.xMax / width, sprite.rect.yMin / height);
-
-                spriteInfo.UvList = new List<Vector2>();
-                spriteInfo.UvList.Add(ulUv);
-                spriteInfo.UvList.Add(urUv);
-                spriteInfo.UvList.Add(lrUv);
-                spriteInfo.UvList.Add(llUv);
-                
-                _SpriteInfoDic.Add(spriteInfo.Name, spriteInfo);
-            }
+            SpriteInfo spriteInfo = new SpriteInfo();
+            spriteInfo.Name = sprites[i].name;
+
+            spriteInfo.Width = sprites[i].rect.width;
+            spriteInfo.Height = sprites[i].rect.height;
+
+            float width = sprites[i].texture.width;
+            float height = sprites[i].texture.height;
+
+            Vector2 llUv = new Vector2(sprites[i].rect.xMin / width, sprites[i].rect.yMin / height);
+            Vector2 ulUv = new Vector2(sprites[i].rect.xMin / width, sprites[i].rect.yMax / height);
+            Vector2 urUv = new Vector2(sprites[i].rect.xMax / width, sprites[i].rect.yMax / height);
+            Vector2 lrUv = new Vector2(sprites[i].rect.xMax / width, sprites[i].rect.yMin / height);
+
+            spriteInfo.UvList = new List<Vector2>();
+            spriteInfo.UvList.Add(ulUv);
+            spriteInfo.UvList.Add(urUv);
+            spriteInfo.UvList.Add(lrUv);
+            spriteInfo.UvList.Add(llUv);
+
+            SpriteInfoDic.Add(spriteInfo.Name, spriteInfo);
         }
     }
 }

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

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

+ 1 - 1
第三期.txt

@@ -36,6 +36,6 @@ DressRoom
 IOS设置Team
 
 
-Drawcall优化(广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集)
+Drawcall优化(表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集)
 
 图片尺寸优化(人物 广场背景 新Logo)

部分文件因为文件数量过多而无法显示