Browse Source

修改花园界面

LiuQilin 7 years ago
parent
commit
cb532d641e

+ 20 - 20
Assets/Resource/Animations/UIFlashLight.anim

@@ -45,7 +45,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    path: UIFlash
+    path: H_UIFlash
   m_FloatCurves:
   - curve:
       serializedVersion: 2
@@ -60,7 +60,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_AnchoredPosition.x
-    path: UIFlash
+    path: H_UIFlash
     classID: 224
     script: {fileID: 0}
   - curve:
@@ -88,7 +88,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_AnchoredPosition.y
-    path: UIFlash
+    path: H_UIFlash
     classID: 224
     script: {fileID: 0}
   - curve:
@@ -110,7 +110,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_IsActive
-    path: UIFlash
+    path: H_UIFlash
     classID: 1
     script: {fileID: 0}
   - curve:
@@ -132,7 +132,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_IsActive
-    path: UIParticle System
+    path: H_UIParticleSystem
     classID: 1
     script: {fileID: 0}
   - curve:
@@ -154,7 +154,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.r
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   - curve:
@@ -176,7 +176,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.g
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   - curve:
@@ -198,7 +198,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.b
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   - curve:
@@ -226,7 +226,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.a
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_PPtrCurves: []
@@ -326,7 +326,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_AnchoredPosition.x
-    path: UIFlash
+    path: H_UIFlash
     classID: 224
     script: {fileID: 0}
   - curve:
@@ -354,7 +354,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_AnchoredPosition.y
-    path: UIFlash
+    path: H_UIFlash
     classID: 224
     script: {fileID: 0}
   - curve:
@@ -376,7 +376,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalScale.x
-    path: UIFlash
+    path: H_UIFlash
     classID: 224
     script: {fileID: 0}
   - curve:
@@ -404,7 +404,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalScale.y
-    path: UIFlash
+    path: H_UIFlash
     classID: 224
     script: {fileID: 0}
   - curve:
@@ -426,7 +426,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalScale.z
-    path: UIFlash
+    path: H_UIFlash
     classID: 224
     script: {fileID: 0}
   - curve:
@@ -448,7 +448,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_IsActive
-    path: UIFlash
+    path: H_UIFlash
     classID: 1
     script: {fileID: 0}
   - curve:
@@ -470,7 +470,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_IsActive
-    path: UIParticle System
+    path: H_UIParticleSystem
     classID: 1
     script: {fileID: 0}
   - curve:
@@ -492,7 +492,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.r
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   - curve:
@@ -514,7 +514,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.g
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   - curve:
@@ -536,7 +536,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.b
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   - curve:
@@ -564,7 +564,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Color.a
-    path: UIFlash/UIFlash2
+    path: H_UIFlash/H_UIFlash2
     classID: 114
     script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_EulerEditorCurves: []

+ 104 - 270
Assets/Resource/Logo.unity

@@ -91,250 +91,6 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1001 &207634582
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_Name
-      value: Canvas (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 224964317361793810, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 18
-      objectReference: {fileID: 0}
-    - target: {fileID: 224244550881901290, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224429567860854048, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 224297559150198766, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 27
-      objectReference: {fileID: 0}
-    - target: {fileID: 224301720278101990, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224903490475154396, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 24
-      objectReference: {fileID: 0}
-    - target: {fileID: 224317587197903578, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 224441247632943000, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 224509309068479312, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 224886965450808824, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 13
-      objectReference: {fileID: 0}
-    - target: {fileID: 224216203107484194, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 11
-      objectReference: {fileID: 0}
-    - target: {fileID: 224246756044616158, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 25
-      objectReference: {fileID: 0}
-    - target: {fileID: 224460117936396002, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 19
-      objectReference: {fileID: 0}
-    - target: {fileID: 224635568216794974, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 14
-      objectReference: {fileID: 0}
-    - target: {fileID: 224264575441689428, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 224640583794403420, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 21
-      objectReference: {fileID: 0}
-    - target: {fileID: 224866873176071794, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 224216352824261512, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 224102181510017788, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 9
-      objectReference: {fileID: 0}
-    - target: {fileID: 224083969509934846, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224085330785925536, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 22
-      objectReference: {fileID: 0}
-    - target: {fileID: 224499353917912188, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 224694386806689142, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 26
-      objectReference: {fileID: 0}
-    - target: {fileID: 224852284275629218, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 23
-      objectReference: {fileID: 0}
-    - target: {fileID: 224903833123223624, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 16
-      objectReference: {fileID: 0}
-    - target: {fileID: 224315228996335140, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 224522843245776806, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224454876144202192, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 12
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -653,6 +409,110 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1453312201
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_Name
+      value: Canvas (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1511433816
 GameObject:
   m_ObjectHideFlags: 0
@@ -838,7 +698,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1833966245}
   - component: {fileID: 1833966244}
-  - component: {fileID: 1833966246}
   m_Layer: 0
   m_Name: ManagerGame
   m_TagString: Untagged
@@ -874,28 +733,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1833966246
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1833966243}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3cac44ec7ca55734c9dd55ba09a4b72a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  RegistLock: 0
-  String1: 
-  String2: 
-  Sprite: {fileID: 0}
-  TextAsset: {fileID: 0}
-  Texture: {fileID: 0}
-  Texture1: {fileID: 0}
-  Texture2: {fileID: 0}
-  AnimationClip: {fileID: 7400000, guid: fb372b7e1f7d8e8418dfbd552cfebde5, type: 2}
-  Font: {fileID: 0}
-  Go: {fileID: 0}
-  Sprites: []
-  GoList: []
-  SrList: []

+ 225 - 137
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -131,6 +131,25 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1008635231849490
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224648146568475860}
+  - component: {fileID: 222259507856731034}
+  - component: {fileID: 114641923127141758}
+  - component: {fileID: 114528693304582670}
+  - component: {fileID: 225008751828935646}
+  m_Layer: 5
+  m_Name: C_Notify
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1009152768111366
 GameObject:
   m_ObjectHideFlags: 1
@@ -437,6 +456,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1037486862455116
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224233466821498018}
+  - component: {fileID: 114822723788595770}
+  m_Layer: 5
+  m_Name: C_SocialGroup
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1037619081589770
 GameObject:
   m_ObjectHideFlags: 1
@@ -7165,23 +7200,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1545704532929970
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224117231018268650}
-  - component: {fileID: 222702810974525576}
-  - component: {fileID: 114045444115518250}
-  m_Layer: 5
-  m_Name: C_PraiseBK
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1546427938947980
 GameObject:
   m_ObjectHideFlags: 1
@@ -11064,7 +11082,7 @@ GameObject:
   - component: {fileID: 114445741316738682}
   - component: {fileID: 225273218489582060}
   m_Layer: 5
-  m_Name: C_Notify
+  m_Name: C_FriendButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -11326,21 +11344,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1910792964690036
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224099407372256060}
-  m_Layer: 5
-  m_Name: C_NotifyRarent
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
 --- !u!1 &1911348442452138
 GameObject:
   m_ObjectHideFlags: 1
@@ -13676,33 +13679,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114045444115518250
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1545704532929970}
-  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: 5fa525a6a115b9842b1b97e1ab81c539, 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 &114046945412228574
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -14004,6 +13980,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 19.896374
+  MaxLineHeight: Infinity
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
@@ -15438,7 +15415,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.3647059, g: 0.45882356, b: 0.8117648, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -15919,6 +15896,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 10.4
+  MaxLineHeight: Infinity
   RemovePos: 18000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f0000003000000031000000320000003300000034000000350000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f00000050000000510000005200000053000000540000005500000056000000570000005800000059000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c0000007d000000
   ImageIndex: 030000000400000005000000
   RemoveIndex: 04000000050000000600000007000000080000000a0000000b0000000c0000000d0000000e0000001000000011000000120000001300000014000000
@@ -16398,6 +16376,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 32.264736
+  MaxLineHeight: Infinity
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
@@ -19244,7 +19223,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: 5245ab2dc9da313478cd5fdbcf3dc6cc, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -23960,6 +23939,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 0
+  MaxLineHeight: Infinity
   RemovePos: 
   ImageIndex: 
   RemoveIndex: 
@@ -26813,6 +26793,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114528693304582670
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008635231849490}
+  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: 114641923127141758}
+  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 &114531241529181766
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -26910,6 +26931,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 32.264736
+  MaxLineHeight: Infinity
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
@@ -28394,6 +28416,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 0
+  MaxLineHeight: Infinity
   RemovePos: 
   ImageIndex: 
   RemoveIndex: 
@@ -29443,6 +29466,33 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+--- !u!114 &114641923127141758
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008635231849490}
+  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: cd1fa1f0e95e97e4fab880c494213540, 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 &114641955220308932
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -29671,6 +29721,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 32.264736
+  MaxLineHeight: Infinity
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
@@ -30875,6 +30926,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 0
+  MaxLineHeight: Infinity
   RemovePos: 
   ImageIndex: 
   RemoveIndex: 
@@ -34236,7 +34288,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9264706, g: 0.9264706, b: 0.9264706, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -34424,6 +34476,28 @@ MonoBehaviour:
   m_PreferredHeight: -1
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
+--- !u!114 &114822723788595770
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1037486862455116}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
 --- !u!114 &114823194463413398
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -34974,6 +35048,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 0
+  MaxLineHeight: Infinity
   RemovePos: 
   ImageIndex: 
   RemoveIndex: 
@@ -37011,6 +37086,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 32.264736
+  MaxLineHeight: Infinity
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
@@ -37164,6 +37240,7 @@ MonoBehaviour:
   SetY: 0
   Y: 0
   LineHeight: 0
+  MaxLineHeight: Infinity
   RemovePos: 
   ImageIndex: 
   RemoveIndex: 
@@ -42888,6 +42965,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1122253166163172}
+--- !u!222 &222259507856731034
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008635231849490}
 --- !u!222 &222261693091909018
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -44490,12 +44573,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1590297952227094}
---- !u!222 &222702810974525576
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1545704532929970}
 --- !u!222 &222703762720761914
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -47241,25 +47318,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224099407372256060
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1910792964690036}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 224551401617533376}
-  m_Father: {fileID: 224432493767108354}
-  m_RootOrder: 4
-  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: -160.25, y: 0.099998474}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224100712321006736
 RectTransform:
   m_ObjectHideFlags: 1
@@ -47555,25 +47613,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0.000015259, y: 120}
   m_SizeDelta: {x: 665, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224117231018268650
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1545704532929970}
-  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: 224621265546970222}
-  m_Father: {fileID: 224432493767108354}
-  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: 185.6, y: -0.050089}
-  m_SizeDelta: {x: 112, y: 31.3}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224117554064153944
 RectTransform:
   m_ObjectHideFlags: 1
@@ -47914,7 +47953,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224432493767108354}
-  m_RootOrder: 5
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -49092,6 +49131,30 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 21}
   m_SizeDelta: {x: 641, y: 371.25}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224233466821498018
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1037486862455116}
+  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: 224507052889086914}
+  - {fileID: 224895400031723192}
+  - {fileID: 224621265546970222}
+  - {fileID: 224648146568475860}
+  - {fileID: 224551401617533376}
+  - {fileID: 224274538382768356}
+  m_Father: {fileID: 224432493767108354}
+  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: 409, y: -46}
+  m_SizeDelta: {x: 206, y: 46}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224236738206977114
 RectTransform:
   m_ObjectHideFlags: 1
@@ -49700,8 +49763,8 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 224587038277128144}
-  m_Father: {fileID: 224432493767108354}
-  m_RootOrder: 3
+  m_Father: {fileID: 224233466821498018}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -50361,8 +50424,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 60.6, y: 0}
-  m_SizeDelta: {x: 70.1, y: 30}
+  m_AnchoredPosition: {x: -1.36, y: 1.94}
+  m_SizeDelta: {x: 25.2, y: 21.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224322308812844832
 RectTransform:
@@ -50835,7 +50898,7 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1541837202010984}
-  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: []
@@ -50844,7 +50907,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 20, y: 77.2}
+  m_AnchoredPosition: {x: 13.249913, y: 77.20001}
   m_SizeDelta: {x: 285, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224375113551824506
@@ -50987,7 +51050,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 20, y: -101.7}
+  m_AnchoredPosition: {x: 13.24991, y: -101.7}
   m_SizeDelta: {x: 195, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224382968998665408
@@ -51466,11 +51529,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224507052889086914}
-  - {fileID: 224895400031723192}
-  - {fileID: 224117231018268650}
-  - {fileID: 224274538382768356}
-  - {fileID: 224099407372256060}
+  - {fileID: 224233466821498018}
   - {fileID: 224146227275568310}
   m_Father: {fileID: 224246329819966360}
   m_RootOrder: 1
@@ -52703,12 +52762,12 @@ RectTransform:
   m_LocalScale: {x: 0.3231018, y: 0.3231018, z: 1.2924072}
   m_Children:
   - {fileID: 224090220069305142}
-  m_Father: {fileID: 224432493767108354}
+  m_Father: {fileID: 224233466821498018}
   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: 75, y: -23}
+  m_AnchoredPosition: {x: 238.35, y: -81}
   m_SizeDelta: {x: 476.7, y: 162}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224507323795038612
@@ -53120,7 +53179,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 43.2, y: -31.3}
+  m_AnchoredPosition: {x: 43.19995, y: -31.299988}
   m_SizeDelta: {x: 86.4, y: 63.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224531543371555064
@@ -53398,15 +53457,15 @@ RectTransform:
   m_GameObject: {fileID: 1885684124930478}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224099407372256060}
-  m_RootOrder: 0
+  m_Father: {fileID: 224233466821498018}
+  m_RootOrder: 4
   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: 345.3, y: -0.050072}
-  m_SizeDelta: {x: 46.1, y: 46.1}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 36.5, y: -286.5}
+  m_SizeDelta: {x: 73, y: 66}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224553634852416960
 RectTransform:
@@ -54312,12 +54371,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224320973604603478}
-  m_Father: {fileID: 224117231018268650}
-  m_RootOrder: 0
+  m_Father: {fileID: 224233466821498018}
+  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: 2.6981812, y: -15.650078}
+  m_AnchoredPosition: {x: 25.549988, y: -230.84999}
   m_SizeDelta: {x: 51.099976, y: 45.299988}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224621974894048384
@@ -54648,7 +54707,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -39.998, y: -171}
+  m_AnchoredPosition: {x: -39.998047, y: -171}
   m_SizeDelta: {x: 80, y: 221.97998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224640408505757664
@@ -54818,6 +54877,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224648146568475860
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008635231849490}
+  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: 224233466821498018}
+  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: 36.5, y: -286.5}
+  m_SizeDelta: {x: 73, y: 66}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224649002566927796
 RectTransform:
   m_ObjectHideFlags: 1
@@ -56154,7 +56231,7 @@ RectTransform:
   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_AnchoredPosition: {x: 43.19995, y: -31.799988}
   m_SizeDelta: {x: 86.4, y: 63.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224750082116704262
@@ -58113,12 +58190,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224432493767108354}
+  m_Father: {fileID: 224233466821498018}
   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: 185, y: -23.000046}
+  m_AnchoredPosition: {x: 29.65, y: -185.1}
   m_SizeDelta: {x: 59.3, y: 46.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224896510247314690
@@ -59433,6 +59510,17 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 120.2}
   m_SizeDelta: {x: 160, y: 20.7}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &225008751828935646
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1008635231849490}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225021207725745664
 CanvasGroup:
   m_ObjectHideFlags: 1

BIN
Assets/Resource/Sprite/Editor/SpriteUI/公告按钮.png


+ 68 - 0
Assets/Resource/Sprite/Editor/SpriteUI/公告按钮.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: cd1fa1f0e95e97e4fab880c494213540
+timeCreated: 1510823905
+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: 0
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/SpriteUI/好友按钮.png


+ 68 - 0
Assets/Resource/Sprite/Editor/SpriteUI/好友按钮.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 5245ab2dc9da313478cd5fdbcf3dc6cc
+timeCreated: 1510823905
+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: 0
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -53,6 +53,7 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
+    <H_AllPlanted desc=""><![CDATA[已全部种植]]></H_AllPlanted>
     <H_PlantTip desc=""><![CDATA[点击花朵种到花园里]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解锁]]></H_BtnLab2>

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

@@ -53,6 +53,7 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
+    <H_AllPlanted desc=""><![CDATA[已全部種植]]></H_AllPlanted>
     <H_PlantTip desc=""><![CDATA[點擊花朵種到花園裡]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解鎖]]></H_BtnLab2>

+ 1 - 0
Assets/Resource/XML/lan/English.xml

@@ -53,6 +53,7 @@
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[Take all back]]></G_RetrieveLab>
+    <H_AllPlanted desc=""><![CDATA[All planted]]></H_AllPlanted>
     <H_PlantTip desc=""><![CDATA[Tap to plant the flower]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[Take back]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[Locked]]></H_BtnLab2>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 0 - 12
Assets/Script/Editor/EditorAuxiliary.cs

@@ -79,18 +79,6 @@ public class EditorAuxiliary : Editor
 
         if (GUILayout.Button("CopyCurve"))
         {
-            //修改路径
-            EditorCurveBinding[] bindings = AnimationUtility.GetCurveBindings(Script.AnimationClip);
-
-            for (int i = 0; i < bindings.Length; i++)
-            {
-                ObjectReferenceKeyframe[] keyframes = AnimationUtility.GetObjectReferenceCurve(Script.AnimationClip, bindings[i]);
-                bindings[i].path = "H_" + bindings[i].path;
-                bindings[i].path = bindings[i].path.Replace(" ", "");
-                AnimationUtility.SetObjectReferenceCurve(Script.AnimationClip, bindings[i], keyframes);
-            }
-
-
             //复制动画
             //EditorCurveBinding[] bindings = AnimationUtility.GetCurveBindings(Script.ClipOrigin);
 

+ 1 - 1
Assets/Script/Label/LanguageLabel.cs

@@ -5,7 +5,6 @@ using UnityEngine;
 
 public class LanguageLabel
 {
-	
 	public static string UI = "UI";
 	public static string UI__C_MiniGameLab = "UI__C_MiniGameLab";
 	public static string UI__C_GardenLab = "UI__C_GardenLab";
@@ -60,6 +59,7 @@ public class LanguageLabel
 	public static string UI__G_SpecialLab = "UI__G_SpecialLab";
 	public static string UI__G_RegularLab = "UI__G_RegularLab";
 	public static string UI__G_RetrieveLab = "UI__G_RetrieveLab";
+	public static string UI__H_AllPlanted = "UI__H_AllPlanted";
 	public static string UI__H_PlantTip = "UI__H_PlantTip";
 	public static string UI__H_BtnLab1 = "UI__H_BtnLab1";
 	public static string UI__H_BtnLab2 = "UI__H_BtnLab2";

+ 1 - 2
Assets/Script/Manage/AnnounceManager.cs

@@ -84,8 +84,7 @@ public class AnnounceManager
         (
             () =>
             {
-                ResourceManager.Get<VerticalLayoutGroup>(ObjectLabel.R_Grid).CalculateLayoutInputVertical();
-                ResourceManager.Get<VerticalLayoutGroup>(ObjectLabel.R_Grid).SetLayoutVertical();
+                LayoutRebuilder.MarkLayoutForRebuild(ResourceManager.Get<RectTransform>(ObjectLabel.R_Grid));
             },
             1
         );

+ 2 - 2
Assets/Script/Manage/GardenManager.cs

@@ -513,16 +513,16 @@ public class GardenManager : Regist
         {
             ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = false;
             ResourceManager.SetActive(ObjectLabel.H_AmtLab, false);
-            ResourceManager.SetActive(ObjectLabel.H_Desc, false);
             ResourceManager.SetActive(ObjectLabel.H_Rotate, false);
+            ResourceManager.SetText(ObjectLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_AllPlanted));
         }
         else
         {
-            ResourceManager.SetActive(ObjectLabel.H_Desc, true);
             ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = true;
             ResourceManager.SetActive(ObjectLabel.H_AmtLab, true);
             ResourceManager.SetText(ObjectLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
             ResourceManager.SetActive(ObjectLabel.H_Rotate, true);
+            ResourceManager.SetText(ObjectLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_PlantTip));
         }
     }
 

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

@@ -306,7 +306,7 @@ public class HttpManager : Regist
 
             rootNode = document.SelectSingleNode("announce");
 
-            AnnounceIndex = int.Parse(rootNode.SelectSingleNode(PlayerConfigLabel.Version).InnerText);
+            AnnounceIndex = int.Parse(rootNode.SelectSingleNode("version").InnerText);
 
             XmlNodeList nodeList = rootNode.SelectNodes(ConfigLabel.ChildNode);
 
@@ -319,9 +319,9 @@ public class HttpManager : Regist
 
             Auxiliary.Instance.StartCoroutine(PullAnnounceSprite(urlList, PullAnnounceSpriteCallback));
         }
-        catch (Exception)
+        catch (Exception e)
         {
-            
+            Debug.LogWarning(e);
         }
     }
 

+ 5 - 4
Assets/Script/Manage/SignManager.cs

@@ -688,10 +688,10 @@ public class SignManager : Regist
             return true;
         }
 
-        //if (ShowNotification())
-        //{
-        //    return true;
-        //}
+        if (ShowAnnouncePanel())
+        {
+            return true;
+        }
 
         if (NickNameManager.ShowNickNameSettingPanelFirstTime())
         {
@@ -757,6 +757,7 @@ public class SignManager : Regist
 
     public static bool ShowAnnouncePanel()
     {
+        //ConfigManager.SaveIntToConfig(PlayerConfigLabel.NotificationIndex, -1);
         if (HttpManager.AnnounceIndex > ConfigManager.GetIntFormConfig(PlayerConfigLabel.NotificationIndex) && HttpManager.IsAnnounceReady)
         {
             ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();

+ 7 - 6
Assets/Script/Manage/UIManager.cs

@@ -33,14 +33,14 @@ public class UIManager : Regist
     #endregion
 
 
-    public static void Init()
+    public static void Init(bool debugMode)
     {
         if (Initd)
         {
             return;
         }
 
-        if (Bundle.UI == null)
+        if (Bundle.UI == null && !debugMode)
         {
             return;
         }
@@ -74,7 +74,7 @@ public class UIManager : Regist
 
     public override void InstantiatePrefabs()
     {
-        Init();
+        Init(Initializer.Instance.DebugMode);
     }
 
 
@@ -1288,6 +1288,9 @@ public class UIManager : Regist
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Fg_Lab), new MulLanStr(LanguageLabel.UI__Fg_Lab0));
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Fg_BtnLab), new MulLanStr(LanguageLabel.UI__Fg_BtnLab));
 
+        TextPlus textPlus = ResourceManager.Get<TextPlus>(ObjectLabel.Fe_BtnLab);
+        textPlus.MaxLineHeight = 16.71891f;
+
         ResourceManager.Get(ObjectLabel.F_TipBK).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         #region F_Close
@@ -1760,8 +1763,6 @@ public class UIManager : Regist
 
         #region H
 
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.H_Desc), new MulLanStr(LanguageLabel.UI__H_PlantTip));
-
         #region H_Close
 
         ResourceManager.AddButtonEvent
@@ -3431,13 +3432,13 @@ public class UIManager : Regist
         if (skillRoot != null)
         {
             MoveRoot moveRoot;
+            ResourceManager.Get<CanvasGroup>(ObjectLabel.F_Manage0).interactable = false;
             TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage).GetTweenGra();
             tweenRoot.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get<CanvasGroup>(ObjectLabel.F_Manage0).interactable = false;
                     if (skillRoot.SkillType == SkillType.Skill || skillRoot.SkillType == SkillType.BigSkill)
                     {
                         ResourceManager.Get<Button>(ObjectLabel.F_Garden).onClick.Invoke();

+ 13 - 1
Assets/Script/Tool/DashGame/Logo.cs

@@ -20,6 +20,18 @@ public class Logo : MonoBehaviour
         
         AudioManager.LoadPrefs();
         AudioManager.SetLogoVolume();
+
+        DelayCall.Call
+        (
+            1,
+            () =>
+            {
+                if (Initializer.Instance.DebugMode)
+                {
+                    Finish();
+                }
+            }
+        );
     }
 
     public void Begin()
@@ -34,7 +46,7 @@ public class Logo : MonoBehaviour
 
         Camera.SetActive(false);
 
-        UIManager.Init();
+        UIManager.Init(Initializer.Instance.DebugMode);
 
         SceneManager.LoadScene(1);
 

+ 2 - 2
Assets/Script/Tool/DashGame/Logo.cs.meta

@@ -1,11 +1,11 @@
 fileFormatVersion: 2
 guid: d995bd93e747b4143812c28df116ed09
-timeCreated: 1489136792
+timeCreated: 1510821984
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 50
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 1 - 1
Assets/Script/Tool/LabelUtility/SerializeObject.prefab

@@ -51,7 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e4a9dafa00b004e4e94c57cd88b01101, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Script: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
+  Script: {fileID: 11500000, guid: 3420c8d0e7f483a46942a0adcfbee477, type: 3}
   Languages:
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   Prefabs:

+ 4 - 1
Assets/Script/Tool/UI/TextPlus.cs

@@ -46,6 +46,7 @@ public class TextPlus : Text
     public bool SetY = false;
     public float Y = 0;
     public float LineHeight;
+    public float MaxLineHeight = Mathf.Infinity;
     public VertexHelper ToFill;
 
     public List<int> RemovePos = new List<int>();
@@ -188,7 +189,9 @@ public class TextPlus : Text
     protected void Initialize()
     {
         LineHeight = preferredHeight/cachedTextGenerator.lineCount;
-        
+        LineHeight = Mathf.Min(LineHeight, MaxLineHeight);
+        //Debug.Log(transform.name + " " + LineHeight);
+
         ImageIndex = new List<int>();
         RemovePos = new List<int>();
         RemoveIndex = new List<int>();