修复刷花Bug

Assets/AtlasUtility/AtlasReferenceTable.txt

@@ -7,5 +7,13 @@ fileID: 21300010, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid:
 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
+fileID: 21300018, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 7cc4a16667b19dc40ad8b65a61a9bc19
+fileID: 21300020, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 2d359cf5b038abd499e278b51e50c35f
+fileID: 21300022, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 1b2b5d88627c8c74cb8f0d33cfb0514a
+fileID: 21300024, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 3e572d3038c60b649a77c0eec05e4eef
+fileID: 21300026, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: d1fefade0be446946a32e5ce3b44c788
+fileID: 21300028, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: ebd5f0f0e87a8ff4aa467206b880efbc
+fileID: 21300030, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 9713db053daf72743be0fa799d2e101a
+fileID: 21300032, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: a9d1487454f0d1244ab051071480b0de
+fileID: 21300034, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 187a8c01c3f18684b92532dccf8a35d4
+fileID: 21300036, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: a4a9714d1600e0f4c968a0140ad64e5c

Assets/AtlasUtility/SerializeObject.prefab

@@ -75,6 +75,14 @@ MonoBehaviour:
   - {fileID: 2800000, guid: ce27c24b2b22c954ca2348c4d33f48bb, type: 3}
   - {fileID: 2800000, guid: a4a9714d1600e0f4c968a0140ad64e5c, type: 3}
   - {fileID: 2800000, guid: 1f1210050a455994aaf12f941c81ee57, type: 3}
+  - {fileID: 2800000, guid: 7cc4a16667b19dc40ad8b65a61a9bc19, type: 3}
+  - {fileID: 2800000, guid: 2d359cf5b038abd499e278b51e50c35f, type: 3}
+  - {fileID: 2800000, guid: 1b2b5d88627c8c74cb8f0d33cfb0514a, type: 3}
+  - {fileID: 2800000, guid: 3e572d3038c60b649a77c0eec05e4eef, type: 3}
+  - {fileID: 2800000, guid: d1fefade0be446946a32e5ce3b44c788, type: 3}
+  - {fileID: 2800000, guid: ebd5f0f0e87a8ff4aa467206b880efbc, type: 3}
+  - {fileID: 2800000, guid: 9713db053daf72743be0fa799d2e101a, type: 3}
+  - {fileID: 2800000, guid: a9d1487454f0d1244ab051071480b0de, type: 3}
   VirtualTextureList: []
   SlicePadding: 0
   SlicePath: Assets/ZTemp

Assets/Resource/Logo.unity

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

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -244,17 +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}
+  - {fileID: 21300000, guid: a4a9714d1600e0f4c968a0140ad64e5c, type: 3}
+  - {fileID: 21300000, guid: 35b3d802264a08e4a97cf8dfd8f4ce67, type: 3}
+  - {fileID: 21300000, guid: ce27c24b2b22c954ca2348c4d33f48bb, type: 3}
+  - {fileID: 21300000, guid: 155422630b0a1014fb4b37563c4f325e, type: 3}
+  - {fileID: 21300000, guid: 19831c53e49f01a419213cdc9fdc769c, type: 3}
+  - {fileID: 21300000, guid: 57729e89d40ed604fbe0a319c5d0e467, type: 3}
+  - {fileID: 21300000, guid: 923c03b8f4f92f0498652d078f1891a1, type: 3}
+  - {fileID: 21300000, guid: 191aacffa8ebc9e4996cf2bc23e6dfc7, type: 3}
+  - {fileID: 21300000, guid: cd07b03a9c0fa8244a7a5815e044a581, type: 3}
+  - {fileID: 21300000, guid: 187a8c01c3f18684b92532dccf8a35d4, type: 3}
+  - {fileID: 21300000, guid: 1f1210050a455994aaf12f941c81ee57, type: 3}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -304,23 +304,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1163396092586334
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224588576781544220}
-  - component: {fileID: 222105483494082980}
-  - component: {fileID: 114332123280392340}
-  m_Layer: 5
-  m_Name: X_Blue
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1170010006860152
 GameObject:
   m_ObjectHideFlags: 1
@@ -649,23 +632,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1306983246054062
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224443690809342574}
-  - component: {fileID: 222305919246575720}
-  - component: {fileID: 114115902990248514}
-  m_Layer: 5
-  m_Name: X_Sweat
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1322083849250766
 GameObject:
   m_ObjectHideFlags: 0
@@ -766,23 +732,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1347600314912868
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224190282930992402}
-  - component: {fileID: 222709416842437240}
-  - component: {fileID: 114553781256478946}
-  m_Layer: 5
-  m_Name: X_Ogle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1359208630098628
 GameObject:
   m_ObjectHideFlags: 1
@@ -1384,23 +1333,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1659149717501784
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224796867568620316}
-  - component: {fileID: 222607731037523366}
-  - component: {fileID: 114707669596307016}
-  m_Layer: 5
-  m_Name: X_Cry
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1674459439079112
 GameObject:
   m_ObjectHideFlags: 0
@@ -1419,23 +1351,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
---- !u!1 &1681642097838544
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224531680808634152}
-  - component: {fileID: 222458984363484528}
-  - component: {fileID: 114818562318419390}
-  m_Layer: 5
-  m_Name: X_Surprise
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1681976888411520
 GameObject:
   m_ObjectHideFlags: 1
@@ -1552,23 +1467,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1712991060911460
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224086966565509550}
-  - component: {fileID: 222151861606214022}
-  - component: {fileID: 114220619937262686}
-  m_Layer: 5
-  m_Name: X_Happy
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1722153107442498
 GameObject:
   m_ObjectHideFlags: 0
@@ -1587,23 +1485,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
---- !u!1 &1733208052925228
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224370556085376942}
-  - component: {fileID: 222040975981306966}
-  - component: {fileID: 114949975096965560}
-  m_Layer: 5
-  m_Name: X_Hope
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1733238351267212
 GameObject:
   m_ObjectHideFlags: 1
@@ -2088,23 +1969,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1939067788690442
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224086704845808160}
-  - component: {fileID: 222321376505631388}
-  - component: {fileID: 114085539456093328}
-  m_Layer: 5
-  m_Name: X_Chagrin
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1940451862678738
 GameObject:
   m_ObjectHideFlags: 0
@@ -2665,7 +2529,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 9713db053daf72743be0fa799d2e101a, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2725,7 +2589,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 57729e89d40ed604fbe0a319c5d0e467, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2787,33 +2651,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114085539456093328
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1939067788690442}
-  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: ce27c24b2b22c954ca2348c4d33f48bb, 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 &114086581405551534
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2890,33 +2727,6 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
---- !u!114 &114115902990248514
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1306983246054062}
-  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: 21300002, guid: 980c962c52249774e9266e82d2496d13, 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 &114122577850642050
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3132,7 +2942,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 3e572d3038c60b649a77c0eec05e4eef, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3500,33 +3310,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114220619937262686
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1712991060911460}
-  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: 155422630b0a1014fb4b37563c4f325e, 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 &114221540204290548
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4155,34 +3938,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300018, guid: 980c962c52249774e9266e82d2496d13, 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 &114332123280392340
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1163396092586334}
-  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: 21300012, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 187a8c01c3f18684b92532dccf8a35d4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4269,7 +4025,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: a9d1487454f0d1244ab051071480b0de, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4674,7 +4430,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 7cc4a16667b19dc40ad8b65a61a9bc19, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5043,7 +4799,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 1b2b5d88627c8c74cb8f0d33cfb0514a, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5070,7 +4826,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: d1fefade0be446946a32e5ce3b44c788, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5138,7 +4894,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 2d359cf5b038abd499e278b51e50c35f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5255,33 +5011,6 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
---- !u!114 &114553781256478946
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1347600314912868}
-  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: 21300010, guid: 980c962c52249774e9266e82d2496d13, 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 &114555831220191402
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5686,33 +5415,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
---- !u!114 &114707669596307016
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1659149717501784}
-  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: 21300004, guid: 980c962c52249774e9266e82d2496d13, 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 &114714839516048288
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5828,7 +5530,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300020, guid: 980c962c52249774e9266e82d2496d13, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a4a9714d1600e0f4c968a0140ad64e5c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5921,7 +5623,7 @@ MonoBehaviour:
   m_ChildAlignment: 4
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 65, y: 65}
+  m_CellSize: {x: 73.282, y: 53.698}
   m_Spacing: {x: 5, y: 5}
   m_Constraint: 1
   m_ConstraintCount: 3
@@ -6117,33 +5819,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114818562318419390
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1681642097838544}
-  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: 19831c53e49f01a419213cdc9fdc769c, 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 &114821402301218020
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6190,7 +5865,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: ebd5f0f0e87a8ff4aa467206b880efbc, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6540,33 +6215,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114949975096965560
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1733208052925228}
-  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: 923c03b8f4f92f0498652d078f1891a1, 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 &114972770803610256
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6903,12 +6551,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1325384103514146}
---- !u!222 &222040975981306966
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1733208052925228}
 --- !u!222 &222068627492778048
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -6945,12 +6587,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1839121821120312}
---- !u!222 &222105483494082980
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1163396092586334}
 --- !u!222 &222110892624259878
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -6981,12 +6617,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1479337399648268}
---- !u!222 &222151861606214022
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1712991060911460}
 --- !u!222 &222180189501175834
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7065,12 +6695,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1292088140522656}
---- !u!222 &222305919246575720
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1306983246054062}
 --- !u!222 &222308044829728810
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7095,12 +6719,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1981244183533122}
---- !u!222 &222321376505631388
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1939067788690442}
 --- !u!222 &222325453775194228
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7233,12 +6851,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1742722100593922}
---- !u!222 &222458984363484528
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1681642097838544}
 --- !u!222 &222478548496297992
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7341,12 +6953,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1195978307382430}
---- !u!222 &222607731037523366
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1659149717501784}
 --- !u!222 &222616904213236340
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7401,12 +7007,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1688683450281480}
---- !u!222 &222709416842437240
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1347600314912868}
 --- !u!222 &222724445030695118
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7708,15 +7308,14 @@ RectTransform:
   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: 224370556085376942}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 137, y: -35.5}
-  m_SizeDelta: {x: 65, y: 65}
+  m_AnchoredPosition: {x: 137, y: -46.801994}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224072709933129824
 RectTransform:
@@ -7777,24 +7376,6 @@ RectTransform:
   m_AnchoredPosition: {x: 49.999966, y: -49.999996}
   m_SizeDelta: {x: 125, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224086704845808160
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1939067788690442}
-  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: 224902832803275878}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224086882154842556
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7804,33 +7385,14 @@ RectTransform:
   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: 224588576781544220}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 137, y: -105.5}
-  m_SizeDelta: {x: 65, y: 65}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224086966565509550
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1712991060911460}
-  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: 224466717374125408}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224094529361259848
 RectTransform:
@@ -8026,15 +7588,14 @@ RectTransform:
   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: 224443690809342574}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   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: 67, y: -175.5}
-  m_SizeDelta: {x: 65, y: 65}
+  m_AnchoredPosition: {x: 58.718002, y: -164.198}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224183512490426362
 RectTransform:
@@ -8072,24 +7633,6 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000032295302, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224190282930992402
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1347600314912868}
-  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: 224623798786139952}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224195307125891872
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8250,15 +7793,14 @@ RectTransform:
   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: 224531680808634152}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 207, y: -35.5}
-  m_SizeDelta: {x: 65, y: 65}
+  m_AnchoredPosition: {x: 215.28198, y: -46.801994}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224271189924942482
 RectTransform:
@@ -8561,24 +8103,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0.0000008888619, y: -52.4}
   m_SizeDelta: {x: 84.8, y: 20.2}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224370556085376942
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1733208052925228}
-  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: 224069614396576508}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224372745690861194
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8749,24 +8273,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224443690809342574
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1306983246054062}
-  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: 224177807352931218}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224445605922611920
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8834,15 +8340,14 @@ RectTransform:
   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: 224086966565509550}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   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: 67, y: -35.5}
-  m_SizeDelta: {x: 65, y: 65}
+  m_AnchoredPosition: {x: 58.718002, y: -46.801994}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224472897739009488
 RectTransform:
@@ -8998,24 +8503,6 @@ RectTransform:
   m_AnchoredPosition: {x: 97, y: -48.499985}
   m_SizeDelta: {x: 108.96057, y: 97}
   m_Pivot: {x: 0.000000018626451, y: 0.5}
---- !u!224 &224531680808634152
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1681642097838544}
-  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: 224270128463171648}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224548622107083228
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9145,24 +8632,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 125, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224588576781544220
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1163396092586334}
-  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: 224086882154842556}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224621130213581382
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9191,15 +8660,14 @@ RectTransform:
   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: 224190282930992402}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 207, y: -105.5}
-  m_SizeDelta: {x: 65, y: 65}
+  m_AnchoredPosition: {x: 215.28198, y: -105.5}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224638629657757286
 RectTransform:
@@ -9210,15 +8678,14 @@ RectTransform:
   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: 224796867568620316}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 137, y: -175.5}
-  m_SizeDelta: {x: 65, y: 65}
+  m_AnchoredPosition: {x: 137, y: -164.198}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224639982390873574
 RectTransform:
@@ -9690,24 +9157,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -160}
   m_SizeDelta: {x: 182, y: 58.974}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224796867568620316
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1659149717501784}
-  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: 224638629657757286}
-  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: 32.50001, y: -32.499992}
-  m_SizeDelta: {x: 58.3, y: 29}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224804264497831280
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9868,15 +9317,14 @@ RectTransform:
   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: 224086704845808160}
+  m_Children: []
   m_Father: {fileID: 224678249240147704}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 67, y: -105.5}
-  m_SizeDelta: {x: 65, y: 65}
+  m_AnchoredPosition: {x: 58.718002, y: -105.5}
+  m_SizeDelta: {x: 73.282, y: 53.698}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224928266697132482
 RectTransform:

Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 980c962c52249774e9266e82d2496d13
-timeCreated: 1506747431
+timeCreated: 1506865567
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -13,8 +13,16 @@ TextureImporter:
     21300012: "\u90C1\u95F7"
     21300014: "\u60CA\u8BB6"
     21300016: "\u671F\u5F85"
-    21300018: "\u8868\u60C5\u6309\u94AE"
-    21300020: "\u53D1\u9001\u6309\u94AE"
+    21300018: "\u6C57\u989C\u6309\u94AE"
+    21300020: "\u671F\u5F85\u6309\u94AE"
+    21300022: "\u5F00\u5FC3\u6309\u94AE"
+    21300024: "\u54ED\u6309\u94AE"
+    21300026: "\u8272\u54AA\u54AA\u6309\u94AE"
+    21300028: "\u90C1\u95F7\u6309\u94AE"
+    21300030: "\u60CA\u8BB6\u6309\u94AE"
+    21300032: "\u59D4\u5C48\u6309\u94AE"
+    21300034: "\u8868\u60C5\u6309\u94AE"
+    21300036: "\u53D1\u9001\u6309\u94AE"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -69,30 +77,6 @@ TextureImporter:
     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:
@@ -214,11 +198,115 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8868\u60C5\u6309\u94AE"
+      name: "\u6C57\u989C\u6309\u94AE"
       rect:
         serializedVersion: 2
         x: 298
         y: 467
+        width: 232
+        height: 170
+      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\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 298
+        y: 639
+        width: 232
+        height: 170
+      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\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 298
+        y: 811
+        width: 232
+        height: 170
+      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\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 537
+        y: 127
+        width: 232
+        height: 188
+      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\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 537
+        y: 317
+        width: 232
+        height: 170
+      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\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 537
+        y: 489
+        width: 232
+        height: 170
+      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\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 537
+        y: 661
+        width: 232
+        height: 170
+      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\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 537
+        y: 833
+        width: 232
+        height: 170
+      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: 861
+        y: 1
         width: 130
         height: 123
       alignment: 9
@@ -230,8 +318,8 @@ TextureImporter:
       name: "\u53D1\u9001\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 298
-        y: 592
+        x: 861
+        y: 126
         width: 130
         height: 123
       alignment: 9

Assets/Resource/Sprite/Editor/PlazaRoom/表情/哭按钮.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 3e572d3038c60b649a77c0eec05e4eef
+timeCreated: 1506862625
+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.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: a9d1487454f0d1244ab051071480b0de
+timeCreated: 1506862626
+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.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 1b2b5d88627c8c74cb8f0d33cfb0514a
+timeCreated: 1506862625
+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.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 9713db053daf72743be0fa799d2e101a
+timeCreated: 1506862626
+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.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 2d359cf5b038abd499e278b51e50c35f
+timeCreated: 1506862625
+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.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 7cc4a16667b19dc40ad8b65a61a9bc19
+timeCreated: 1506862625
+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.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: d1fefade0be446946a32e5ce3b44c788
+timeCreated: 1506862626
+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.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: ebd5f0f0e87a8ff4aa467206b880efbc
+timeCreated: 1506862626
+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/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="5" />
+  <Version value="6" />
 
   <ID value="Default" />
   <SerialNumber value="Default" />
@@ -28,6 +28,7 @@
   <SignRound value="1" />
   <CircleTimer value="0" />
   <ADPlayTime value="4/23/2017 09:30:00 AM" />
+  <NewFlowerFlag value="1" />
   <MiniGameIndex value="0" />
   <NotificationIndex value="-1" />
   <OneTimeReward value="" />

Assets/Script/Manage/ManaData.cs

@@ -1110,6 +1110,13 @@ public class ManaData : Regist
             To5(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 6)
+        {
+            Debug.LogWarning("UpdateArchive to 6");
+
+            To6(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1254,4 +1261,15 @@ public class ManaData : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument To6(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
+
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("NewFlowerFlag");
+
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/ManaInfoBox.cs

@@ -28,12 +28,15 @@ public class ManaInfoBox : Regist
         public float DurationTimer;
         public string InfoItemName;
         public List<InfoText> TextList = new List<InfoText>();
+
+        public ObjType ObjType;
         public Transform Grid;
         public CanvasGroup CanvasGroup;
 
-        public InfoBox(int maxCount, float duration, string infoItemName, Transform grid)
+        public InfoBox(int maxCount, float duration, string infoItemName, ObjType objType, Transform grid)
         {
             Grid = grid;
+            ObjType = objType;
             DurationTime = duration;
             MaxCount = maxCount;
             InfoItemName = infoItemName;
@@ -79,7 +82,7 @@ public class ManaInfoBox : Regist
             }
 
 
-            TextPlus text = ManaReso.GetInfoItem(InfoItemName);
+            TextPlus text = ManaReso.GetInfoItem(InfoItemName, ObjType);
             text.ImagePlus.sprite = atlas;
             text.SetParent(Grid);
             text.rectTransform.SetAsFirstSibling();
@@ -114,8 +117,8 @@ public class ManaInfoBox : Regist
 
     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"));
+        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, "C_InfoItem", ObjType.C_InfoItem,  ManaReso.Get("C_Info"));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, "X_InfoItem", ObjType.X_InfoItem, ManaReso.Get("X_Info"));
     }
 
     public void Update()

Assets/Script/Manage/ManaMiniGame.cs

@@ -1239,11 +1239,12 @@ public class ManaMiniGame : Regist
         }
     }
 
-    public static void InitializeAward()
+
+    public static void SetNewFlowerStatus()
     {
-        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+        bool newFlowerFlag = ManaData.GetPlayerBool("NewFlowerFlag");
 
-        if (Random.Range(0, 1f) <= flowerRate)
+        if (newFlowerFlag)
         {
             if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
             {
@@ -1270,6 +1271,35 @@ public class ManaMiniGame : Regist
         }
     }
 
+    public static void ResetNewFlowerStatus()
+    {
+        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+        
+        if (Random.Range(0, 1f) <= flowerRate)
+        {
+            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
+            {
+                foreach (var kv in ManaGarden.FlowerInfoDic)
+                {
+                    if (kv.Value.Unlock == false)
+                    {
+                        ManaData.SavePlayerBool("NewFlowerFlag", true);
+
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                ManaData.SavePlayerBool("NewFlowerFlag", false);
+            }
+        }
+        else
+        {
+            ManaData.SavePlayerBool("NewFlowerFlag", false);
+        }
+    }
+
 
     public static void GameEnd()
     {
@@ -1280,6 +1310,8 @@ public class ManaMiniGame : Regist
             ManaCenter.MiniLock = false;
 
             ManaCenter.MiniTimer = Mathf.Lerp(180, 300, Random.Range(0, 1f));
+
+            ResetNewFlowerStatus();
         }
 
 
@@ -1344,12 +1376,12 @@ public class ManaMiniGame : Regist
             {
                 InitializeMode();
 
-                InitializeAward();
-
                 FlowerLock = true;
             }
         }
 
+        SetNewFlowerStatus();
+
         if (ManaTutorial.TutorialB)
         {
             InitializeMode();
@@ -1561,6 +1593,8 @@ public class ManaMiniGame : Regist
 
     public static void GameBegin()
     {
+        ManaData.SavePlayerBool("NewFlowerFlag", false);
+
         Game = true;
         MiniGameIndex++;
 

Assets/Script/Manage/ManaReso.cs

@@ -54,7 +54,8 @@ public enum ObjType
     MessageBox,
     HudText,
     MailItem,
-    InfoItem,
+    C_InfoItem,
+    X_InfoItem,
     SkillItem,
     SignItem,
     RankItem,
@@ -705,9 +706,9 @@ public class ManaReso : Regist
     }
 
 
-    public static TextPlus GetInfoItem(string infoItemName)
+    public static TextPlus GetInfoItem(string infoItemName, ObjType objType)
     {
-        Transform tra = Get(infoItemName, Folder.UI, false, Get("Canvas"), false, ObjType.InfoItem);
+        Transform tra = Get(infoItemName, Folder.UI, false, Get("Canvas"), false, objType);
 
         tra.SetAsFirstSibling();
 

Assets/Script/Object/Player.cs

@@ -536,10 +536,10 @@ public class Player : Regist , IPointerClickHandler
 
     public Dictionary<string, Transform> ChildDic = new Dictionary<string, Transform>();
 
-    public static Dictionary<string, Vector3> ExpressionPositionDictionary = new Dictionary<string, Vector3>
+    public static Dictionary<string, Vector3> LeftExpressionPositionDictionary = new Dictionary<string, Vector3>
     {
         {"郁闷", new Vector3(0, -0.22f, -0.001f)},
-        {"汗颜", new Vector3(0.29f, 0.91f, -0.001f)},
+        {"汗颜", new Vector3(0.35f, 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)},
@@ -548,6 +548,18 @@ public class Player : Regist , IPointerClickHandler
         {"委屈", new Vector3(0f, -0.27f, -0.001f)},
     };
 
+    public static Dictionary<string, Vector3> RightExpressionPositionDictionary = new Dictionary<string, Vector3>
+    {
+        {"郁闷", new Vector3(0, -0.22f, -0.001f)},
+        {"汗颜", new Vector3(-0.22f, 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;
@@ -733,21 +745,25 @@ public class Player : Regist , IPointerClickHandler
         MouseSlot.UnityTransform.GetChild(0).SetActive(true);
     }
 
+    private string ExpressionName;
+    private Coroutine ResetExpressionCoroutine;
     public void ChangeExpression(string expressionName, float duration)
     {
-        Vector3 position = ExpressionPositionDictionary[expressionName];
-        //position.x *= transform.lossyScale.x;
-        //position.y *= transform.lossyScale.y;
+        ExpressionName = expressionName;
 
         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
+        FlipExpression(expressionName, PlayerDirection);
+
+        if (ResetExpressionCoroutine != null)
+            Auxiliary.Instance.StopCoroutine(ResetExpressionCoroutine);
+
+        ResetExpressionCoroutine = Auxiliary.Instance.DelayCall
         (
             () =>
             {
@@ -760,18 +776,51 @@ public class Player : Regist , IPointerClickHandler
 
     public void Flip(PlayerDirection direction)
     {
+        FlipExpression(ExpressionName, direction);
+
         if (direction == PlayerDirection.Left)
         {
             UAC.armature.flipX = false;
-            ExpressionSr.flipX = false;
+
             playerDirection = PlayerDirection.Left;
         }
+        else if (direction == PlayerDirection.Right)
+        {
+            UAC.armature.flipX = true;
+
+            playerDirection = PlayerDirection.Right;
+        }
         else
         {
+            throw new Exception();
+        }
+    }
+
+    public void FlipExpression(string expressionName, PlayerDirection direction)
+    {
+        if (string.IsNullOrEmpty(ExpressionName))
+        {
+            return;
+        }
+
+        if (direction == PlayerDirection.Left)
+        {
+            ExpressionSr.flipX = false;
+            ExpressionSr.transform.localPosition = LeftExpressionPositionDictionary[ExpressionName];
+        }
+        else if (direction == PlayerDirection.Right)
+        {
             UAC.armature.flipX = true;
+
             ExpressionSr.flipX = true;
+            ExpressionSr.transform.localPosition = RightExpressionPositionDictionary[ExpressionName];
+
             playerDirection = PlayerDirection.Right;
         }
+        else
+        {
+            throw new Exception();
+        }
     }
 
 

Assets/Script/SFS/Manager/PlazaRoomManager.cs

@@ -488,7 +488,7 @@ public class PlazaRoomManager
         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));
+        ManaInfoBox.Show(InfoCategory.PlazaRoom, $"{plazaRoomPlayer.NickName} : <({expressionName}按钮)>", 10, ManaReso.LoadSprite("Expression", Folder.Scene));
     }
 
     public void ReceivePublicMessage(string message, User sender)

Assets/Script/Tool/Auxiliary.cs

@@ -153,20 +153,20 @@ public class Auxiliary : Regist
 
             //PlayerPrefs.SetString("config", ToString(md5.ComputeHash(bytes)));
 
-            //ManaCenter.MiniTimer = 0;
+            ManaCenter.MiniTimer = 0;
 
-            GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
+            //GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
+            //GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
 
             //ManaPlayer.Player.PlayAnim("newAnimation");
 
             //StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
 
-            //ManaMiniGame.GameTimer = 45;
+            ManaMiniGame.GameTimer = 45;
 
             //Lottery.TempTypeList = new List<int>();
             //Lottery.TempValueList = new List<int>();
@@ -181,7 +181,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
+            //GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
 
             //SFSObject sfsObject = new SFSObject();
             //sfsObject.PutInt(DataID.SenderID.GetHashString(), 0);
@@ -197,7 +197,7 @@ public class Auxiliary : Regist
 
             //ManaReso.Get("C_Notify").TweenForCG();
 
-            //ManaMiniGame.Score += 400;
+            ManaMiniGame.Score += 400;
 
             //ManaSign.SignTime = new DateTime(2007, 1, 1);
         }

第三期.txt

@@ -1,3 +1,5 @@
+留声机缺了一块
+
 黑色遮罩还没播放完就加载出Plaza了
 
 进入Plaza后不弹出宝箱 星星等