Browse Source

留言板调整

LiuQilin 7 years ago
parent
commit
8293221ce9

+ 131 - 11
Assets/Resource/Logo.unity

@@ -330,25 +330,145 @@ Prefab:
       propertyPath: m_Name
       value: Canvas (1)
       objectReference: {fileID: 0}
-    - target: {fileID: 224621265546970222, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224903490475154396, guid: 8647d80b558fa724a84d05f9e6aee9bc,
         type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 1
+      propertyPath: m_RootOrder
+      value: 25
       objectReference: {fileID: 0}
-    - target: {fileID: 224621265546970222, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224315228996335140, guid: 8647d80b558fa724a84d05f9e6aee9bc,
         type: 2}
-      propertyPath: m_AnchorMax.y
+      propertyPath: m_RootOrder
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 224509309068479312, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224454876144202192, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 224964317361793810, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 224216203107484194, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 224244550881901290, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 224903833123223624, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 224635568216794974, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 224522843245776806, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224621265546970222, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224297559150198766, guid: 8647d80b558fa724a84d05f9e6aee9bc,
         type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 25.549988
+      propertyPath: m_RootOrder
+      value: 28
       objectReference: {fileID: 0}
-    - target: {fileID: 224621265546970222, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224460117936396002, guid: 8647d80b558fa724a84d05f9e6aee9bc,
         type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
+      propertyPath: m_RootOrder
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 224085330785925536, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 224246756044616158, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 26
+      objectReference: {fileID: 0}
+    - target: {fileID: 224301720278101990, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224317587197903578, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 224866873176071794, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 224441247632943000, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224886965450808824, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 224852284275629218, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 224264575441689428, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 224694386806689142, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 27
+      objectReference: {fileID: 0}
+    - target: {fileID: 224216352824261512, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 21
+      objectReference: {fileID: 0}
+    - target: {fileID: 224499353917912188, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 224083969509934846, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 224102181510017788, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 224429567860854048, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 224640583794403420, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 22
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}

File diff suppressed because it is too large
+ 741 - 11
Assets/Resource/Prefab/PrefabUI/Canvas.prefab


+ 420 - 40
Assets/Resource/Prefab/PrefabUI/CommentItem.prefab

@@ -36,6 +36,7 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 224042633406990250}
+  - component: {fileID: 222768088266857450}
   m_Layer: 5
   m_Name: CommentItem
   m_TagString: Untagged
@@ -77,6 +78,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1591153422434592
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224038447440644656}
+  - component: {fileID: 222824022254742042}
+  - component: {fileID: 114988629463372794}
+  m_Layer: 5
+  m_Name: SendMessageText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1646116839508110
 GameObject:
   m_ObjectHideFlags: 0
@@ -89,7 +107,7 @@ GameObject:
   - component: {fileID: 114327637007703412}
   - component: {fileID: 114803250711698834}
   m_Layer: 5
-  m_Name: VisitButton
+  m_Name: AddFriendButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -112,6 +130,59 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1715369502979390
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224847788724545900}
+  - component: {fileID: 222039781527285768}
+  - component: {fileID: 114351147521320122}
+  - component: {fileID: 114573957120250212}
+  m_Layer: 5
+  m_Name: VisitButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1834173919294452
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224965444617846838}
+  - component: {fileID: 222928894655134972}
+  - component: {fileID: 114073248858848408}
+  - component: {fileID: 114707504174532198}
+  m_Layer: 5
+  m_Name: SendMessageButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &1934844755920172
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224363969115887962}
+  - component: {fileID: 222063584478428280}
+  - component: {fileID: 114110795075804430}
+  m_Layer: 5
+  m_Name: AddFriendTitle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1974864418794842
 GameObject:
   m_ObjectHideFlags: 0
@@ -129,6 +200,33 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &114073248858848408
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1834173919294452}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
+  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: 9bb7920cf00be4a41a9c6ce43b1b258f, 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 &114098198944178808
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -141,7 +239,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.8627451}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -150,10 +248,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 20
+    m_FontSize: 17
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 1
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -165,24 +263,58 @@ MonoBehaviour:
   Draw: 0
   SetY: 0
   Y: 0
-  LineHeight: 19.591837
+  LineHeight: 16.718914
+  MaxLineHeight: Infinity
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
   NewTextIndex: 0600000007000000
   NewTextPos:
-  - {x: -1.5213356, y: 8.163265, z: 0}
-  - {x: 10.72356, y: 8.163265, z: 0}
-  - {x: 10.72356, y: -8.163265, z: 0}
-  - {x: 10.72356, y: -8.163265, z: 0}
-  - {x: -1.5213356, y: -8.163265, z: 0}
-  - {x: -1.5213356, y: 8.163265, z: 0}
-  - {x: 9.090908, y: 8.163265, z: 0}
-  - {x: 21.335808, y: 8.163265, z: 0}
-  - {x: 21.335808, y: -8.163265, z: 0}
-  - {x: 21.335808, y: -8.163265, z: 0}
-  - {x: 9.090908, y: -8.163265, z: 0}
-  - {x: 9.090908, y: 8.163265, z: 0}
+  - {x: -1.5768986, y: 6.6875653, z: 0}
+  - {x: 9.290394, y: 6.6875653, z: 0}
+  - {x: 9.290394, y: -7.523511, z: 0}
+  - {x: 9.290394, y: -7.523511, z: 0}
+  - {x: -1.5768986, y: -7.523511, z: 0}
+  - {x: -1.5768986, y: 6.6875653, z: 0}
+  - {x: 7.6185036, y: 6.6875653, z: 0}
+  - {x: 18.485798, y: 6.6875653, z: 0}
+  - {x: 18.485798, y: -7.523511, z: 0}
+  - {x: 18.485798, y: -7.523511, z: 0}
+  - {x: 7.6185036, y: -7.523511, z: 0}
+  - {x: 7.6185036, y: 6.6875653, z: 0}
+--- !u!114 &114110795075804430
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1934844755920172}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.45098042, g: 0.70980394, b: 0.29803923, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u52A0\u4E3A\u597D\u53CB"
 --- !u!114 &114218369184391990
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -209,13 +341,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4F60\u597D1"
+  m_Text: "\u8FD8\u8981\u52A0\u6CB9\u54DF~!"
   VerticalMinSize: 1
   VerticalMaxSize: 20
 --- !u!114 &114327637007703412
@@ -237,6 +369,33 @@ 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: 3bb1c24c193126c479901843899b8ba3, 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 &114351147521320122
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1715369502979390}
+  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: e5dfd70a17554584ea2919cf341ad979, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -268,16 +427,16 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 3
+    m_MaxSize: 25
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 87257
+  m_Text: 123uyl
 --- !u!114 &114509740565883278
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -305,7 +464,89 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
-  Draw: 0
+  Draw: 1
+--- !u!114 &114573957120250212
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1715369502979390}
+  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: 114351147521320122}
+  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 &114707504174532198
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1834173919294452}
+  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: 114073248858848408}
+  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 &114803250711698834
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -374,6 +615,51 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114988629463372794
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1591153422434592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 80
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u79C1\u4FE1"
+--- !u!222 &222039781527285768
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1715369502979390}
+--- !u!222 &222063584478428280
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1934844755920172}
 --- !u!222 &222406504289961844
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -392,12 +678,30 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1646116839508110}
+--- !u!222 &222768088266857450
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1115339575636394}
+--- !u!222 &222824022254742042
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1591153422434592}
 --- !u!222 &222846138815763298
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1509332223137652}
+--- !u!222 &222928894655134972
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1834173919294452}
 --- !u!222 &222930173278085740
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -410,6 +714,24 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1143252165116650}
+--- !u!224 &224038447440644656
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1591153422434592}
+  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: 224965444617846838}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0.0000038146973}
+  m_SizeDelta: {x: 220, y: 162}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224042633406990250
 RectTransform:
   m_ObjectHideFlags: 1
@@ -422,15 +744,17 @@ RectTransform:
   m_Children:
   - {fileID: 224735141033996776}
   - {fileID: 224397078160467034}
-  - {fileID: 224125420440601976}
   - {fileID: 224043093304935004}
+  - {fileID: 224847788724545900}
+  - {fileID: 224125420440601976}
+  - {fileID: 224965444617846838}
   m_Father: {fileID: 0}
   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: 332.5, y: -55.99997}
-  m_SizeDelta: {x: 637.4, y: 102}
+  m_AnchoredPosition: {x: 332.5, y: -57.249}
+  m_SizeDelta: {x: 637.4, y: 71}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224043093304935004
 RectTransform:
@@ -443,11 +767,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224042633406990250}
-  m_RootOrder: 3
+  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: -1.8999786, y: -49.49997}
+  m_AnchoredPosition: {x: -1.9029617, y: -34.000397}
   m_SizeDelta: {x: 633.6, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224125420440601976
@@ -460,14 +784,32 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224889834567627892}
+  - {fileID: 224363969115887962}
   m_Father: {fileID: 224042633406990250}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -43.799957, y: -8}
-  m_SizeDelta: {x: 84.224, y: 73}
+  m_AnchoredPosition: {x: -92.89003, y: -9.0504}
+  m_SizeDelta: {x: 44.6, y: 40.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224363969115887962
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1934844755920172}
+  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: 224125420440601976}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.00008392334, y: 30.14995}
+  m_SizeDelta: {x: 44.605, y: 19.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224397078160467034
 RectTransform:
@@ -484,8 +826,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 320.29, y: 1.0000305}
-  m_SizeDelta: {x: 462.39, y: 100}
+  m_AnchoredPosition: {x: 317.40005, y: 2.999588}
+  m_SizeDelta: {x: 397.6, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224735141033996776
 RectTransform:
@@ -502,8 +844,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 39.40003, y: 1.0000305}
-  m_SizeDelta: {x: 75, y: 30}
+  m_AnchoredPosition: {x: 59.286983, y: 2.999588}
+  m_SizeDelta: {x: 118.58, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224740833775021098
 RectTransform:
@@ -523,6 +865,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224847788724545900
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1715369502979390}
+  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: 224889834567627892}
+  m_Father: {fileID: 224042633406990250}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -43.80008, y: -9.020401}
+  m_SizeDelta: {x: 47.2, y: 40.9}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224889834567627892
 RectTransform:
   m_ObjectHideFlags: 1
@@ -534,11 +895,30 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224740833775021098}
-  m_Father: {fileID: 224125420440601976}
+  m_Father: {fileID: 224847788724545900}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0.056026, y: 11.01}
-  m_SizeDelta: {x: 84.112, y: 18.6}
+  m_AnchoredPosition: {x: 0.0029926, y: 10.54}
+  m_SizeDelta: {x: 47.194, y: 17.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224965444617846838
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1834173919294452}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.15000002, y: 0.15000002, z: 1}
+  m_Children:
+  - {fileID: 224038447440644656}
+  m_Father: {fileID: 224042633406990250}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 541.53, y: -9.019989}
+  m_SizeDelta: {x: 337.72, y: 162}
   m_Pivot: {x: 0.5, y: 0.5}

BIN
Assets/Resource/Sprite/Editor/SpriteUI/加好友图标.png


+ 68 - 0
Assets/Resource/Sprite/Editor/SpriteUI/加好友图标.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 3bb1c24c193126c479901843899b8ba3
+timeCreated: 1510891277
+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: 

+ 2 - 2
Assets/Resource/Sprite/Editor/SpriteUI/打开按钮.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b070139c782da6b4cb35cc70c7d66274
-timeCreated: 1504666133
+timeCreated: 1510889703
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -39,7 +39,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 62, y: 0, z: 61, w: 0}
   spritePixelsToUnits: 100
   alphaUsage: 1
   alphaIsTransparency: 1

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 8 - 0
Assets/Script/Extension/ExAction.cs

@@ -13,4 +13,12 @@ public static class ExAction
             action.Invoke();
         }
     }
+
+    public static void SafeInvoke(this Action<double> action, double arg)
+    {
+        if (action != null)
+        {
+            action.Invoke(arg);
+        }
+    }
 }

+ 9 - 1
Assets/Script/Label/ObjectLabel.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 using UnityEngine;
@@ -45,6 +45,8 @@ public class ObjectLabel
 	public static string C_Group = "C_Group";
 	public static string C_Group1 = "C_Group1";
 	public static string C_Manage = "C_Manage";
+	public static string C_LevelBK = "C_LevelBK";
+	public static string C_LevelText = "C_LevelText";
 	public static string C_ManageArrow0 = "C_ManageArrow0";
 	public static string C_Achieve = "C_Achieve";
 	public static string C_Setting = "C_Setting";
@@ -543,6 +545,12 @@ public class ObjectLabel
 	public static string AA_Tip = "AA_Tip";
 	public static string W_HudParent = "W_HudParent";
 	public static string X_PlazaRoom = "X_PlazaRoom";
+	public static string X_Coin = "X_Coin";
+	public static string X_CoinBK = "X_CoinBK";
+	public static string X_CoinText = "X_CoinText";
+	public static string X_Diamond = "X_Diamond";
+	public static string X_DiamondBK = "X_DiamondBK";
+	public static string X_DiamondText = "X_DiamondText";
 	public static string X_InfoParent = "X_InfoParent";
 	public static string X_InfoBK = "X_InfoBK";
 	public static string X_InfoMask = "X_InfoMask";

+ 126 - 105
Assets/Script/Manage/Initializer.cs

@@ -25,6 +25,7 @@ public class Initializer : MonoBehaviour
     public GameObject DebugModeGo;
 
     public static bool Inited;
+    public static string InitScriptProgress;
     public static Text DebugText;
     public static Initializer Instance;
     public static List<Regist> RegistList = new List<Regist>();
@@ -33,137 +34,173 @@ public class Initializer : MonoBehaviour
 
     private void Awake()
     {
-        try
+        if (CatchException)
+        {
+            try
+            {
+                InitDataEye();
+            }
+            catch (Exception)
+            {
+
+            }
+        }
+        else
         {
             InitDataEye();
         }
-        catch (Exception)
+
+        if (CatchException)
+        {
+            try
+            {
+                InitScript();
+            }
+            catch (Exception e)
+            {
+                Text debugText = GameObject.Find(LogoSceneLabel.DebugText).GetComponent<Text>();
+                debugText.SetAlpha(1);
+                debugText.text = InitScriptProgress + "\n" + e;
+                throw new Exception();
+            }
+        }
+        else
         {
+            InitScript();
+        }
+    }
 
+    private void InitDataEye()
+    {
+        if (Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            DataEyeGA.Init("C5790DBD2CFE97BD18C7BE9A95482C05", DataEyeGA.PlatformType.IOS, "Official", "IOS");
+        }
+        else if (Application.isMobilePlatform)
+        {
+            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.ADR, "Official", "Android");
+        }
+        else if (Application.isEditor)
+        {
+            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
         }
+    }
 
-        string progress = "";
+    private void InitScript()
+    {
+        InitScriptProgress = "1";
+        Application.targetFrameRate = 50;
 
-        try
-        {
-            progress = "1";
-            Application.targetFrameRate = 50;
+        InitScriptProgress = "2";
+        DontDestroyOnLoad(gameObject);
 
-            progress = "2";
-            DontDestroyOnLoad(gameObject);
+        InitScriptProgress = "3";
+        HttpManager.Login(Manager.FirstTimeLoginCallback);
 
-            progress = "3";
-            HttpManager.Login(Manager.FirstTimeLoginCallback);
+        InitScriptProgress = "4";
+        HttpManager.GetMailAwardData();
 
-            progress = "4";
-            HttpManager.GetMailAwardData();
+        InitScriptProgress = "5";
+        HttpManager.GetRankData();
 
-            progress = "5";
-            HttpManager.GetRankData();
+        InitScriptProgress = "6";
+        HttpManager.GetAlipayFlag();
 
-            progress = "6";
-            HttpManager.GetAlipayFlag();
+        InitScriptProgress = "7";
+        HttpManager.GetAnnounceData();
 
-            progress = "7";
-            HttpManager.GetAnnounceData();
+        Instance = this;
 
-            Instance = this;
+        InitScriptProgress = "8";
+        if (DebugMode)
+        {
+            Instantiate(DebugModeGo, transform);
+        }
+        else
+        {
+            gameObject.AddComponent<Bundle>();
+        }
 
-            progress = "8";
-            if (DebugMode)
-            {
-                Instantiate(DebugModeGo, transform);
-            }
-            else
-            {
-                gameObject.AddComponent<Bundle>();
-            }
+        InitScriptProgress = "9";
+        gameObject.AddComponent<IAPManager>();
 
-            progress = "9";
-            gameObject.AddComponent<IAPManager>();
+        InitScriptProgress = "10";
+        gameObject.AddComponent<VisitManager>();
 
-            progress = "10";
-            gameObject.AddComponent<VisitManager>();
+        InitScriptProgress = "11";
+        gameObject.AddComponent<DebugManager>();
 
-            progress = "11";
-            gameObject.AddComponent<DebugManager>();
+        InitScriptProgress = "12";
+        gameObject.AddScript<Auxiliary>();
 
-            progress = "12";
-            gameObject.AddScript<Auxiliary>();
+        InitScriptProgress = "13";
+        gameObject.AddScript<ConfigManager>();
 
-            progress = "13";
-            gameObject.AddScript<ConfigManager>();
+        InitScriptProgress = "14";
+        gameObject.AddScript<ResourceManager>();
 
-            progress = "14";
-            gameObject.AddScript<ResourceManager>();
+        InitScriptProgress = "15";
+        gameObject.AddScript<TutorialManager>();
 
-            progress = "15";
-            gameObject.AddScript<TutorialManager>();
+        InitScriptProgress = "16";
+        gameObject.AddScript<LanguageManager>();
 
-            progress = "16";
-            gameObject.AddScript<LanguageManager>();
+        InitScriptProgress = "17";
+        gameObject.AddScript<AnimManager>();
 
-            progress = "17";
-            gameObject.AddScript<AnimManager>();
+        InitScriptProgress = "18";
+        gameObject.AddScript<AudioManager>();
 
-            progress = "18";
-            gameObject.AddScript<AudioManager>();
+        InitScriptProgress = "19";
+        gameObject.AddScript<AchieveManager>();
 
-            progress = "19";
-            gameObject.AddScript<AchieveManager>();
+        InitScriptProgress = "20";
+        gameObject.AddScript<UIManager>();
 
-            progress = "20";
-            gameObject.AddScript<UIManager>();
+        InitScriptProgress = "21";
+        gameObject.AddScript<SignManager>();
 
-            progress = "21";
-            gameObject.AddScript<SignManager>();
+        InitScriptProgress = "22";
+        gameObject.AddScript<Manager>();
 
-            progress = "22";
-            gameObject.AddScript<Manager>();
+        InitScriptProgress = "23";
+        gameObject.AddScript<GardenManager>();
 
-            progress = "23";
-            gameObject.AddScript<GardenManager>();
+        InitScriptProgress = "24";
+        gameObject.AddScript<PlayerManager>();
 
-            progress = "24";
-            gameObject.AddScript<PlayerManager>();
+        InitScriptProgress = "25";
+        gameObject.AddScript<HttpManager>();
 
-            progress = "25";
-            gameObject.AddScript<HttpManager>();
+        InitScriptProgress = "26";
+        gameObject.AddScript<MiniGameManager>();
 
-            progress = "26";
-            gameObject.AddScript<MiniGameManager>();
+        InitScriptProgress = "27";
+        gameObject.AddScript<InfoBoxManager>();
 
-            progress = "27";
-            gameObject.AddScript<InfoBoxManager>();
+        InitScriptProgress = "28";
+        gameObject.AddScript<SocialManager>();
 
-            progress = "28";
-            gameObject.AddScript<SocialManager>();
+        InitScriptProgress = "29";
+        gameObject.AddScript<NickNameManager>();
 
-            progress = "29";
-            gameObject.AddScript<NickNameManager>();
+        InitScriptProgress = "30";
+        gameObject.AddScript<SFSManager>();
 
-            progress = "30";
-            gameObject.AddScript<SFSManager>();
+        InitScriptProgress = "31";
+        gameObject.AddScript<PlazaRoomManager>();
 
-            progress = "31";
-            gameObject.AddScript<PlazaRoomManager>();
+        InitScriptProgress = "31-1";
+        gameObject.AddScript<ChestManager>();
 
-            progress = "31-1";
-            gameObject.AddScript<ChestManager>();
+        InitScriptProgress = "31-2";
+        gameObject.AddScript<RobotManager>();
 
-            progress = "31-2";
-            gameObject.AddScript<RobotManager>();
+        InitScriptProgress = "32";
+        gameObject.AddScript<FriendManager>();
 
-            progress = "32";
-            StartCoroutine(WaitToInit());
-        }
-        catch (Exception e)
-        {
-            Text debugText = GameObject.Find(LogoSceneLabel.DebugText).GetComponent<Text>();
-            debugText.SetAlpha(1);
-            debugText.text = progress + "\n" + e;
-            throw new Exception();
-        }
+        InitScriptProgress = "33";
+        StartCoroutine(WaitToInit());
     }
 
 
@@ -305,22 +342,6 @@ public class Initializer : MonoBehaviour
         }
     }
 
-    private void InitDataEye()
-    {
-        if (Application.platform == RuntimePlatform.IPhonePlayer)
-        {
-            DataEyeGA.Init("C5790DBD2CFE97BD18C7BE9A95482C05", DataEyeGA.PlatformType.IOS, "Official", "IOS");
-        }
-        else if (Application.isMobilePlatform)
-        {
-            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.ADR, "Official", "Android");
-        }
-        else if (Application.isEditor)
-        {
-            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
-        }
-    }
-
     public IEnumerator WaitToInit()
     {
         while (!Logo.Complete)

+ 15 - 6
Assets/Script/Manage/Manager.cs

@@ -223,7 +223,10 @@ public class Manager : Regist
 
     #endregion
 
-    public static Action OnLevelChange;
+    public static string LevelTextPrefix = "Lv";
+    public static Action<int> OnLevelChange;
+    public static Action<double> OnCoinChange;
+    public static Action<double> OnDiamondChange;
 
     public static int GardenLevel
     {
@@ -237,12 +240,9 @@ public class Manager : Regist
                 return;
             }
 
-            VisitManager.UpdateVisitCost();
+            ResourceManager.SetText(ObjectLabel.C_LevelText, LevelTextPrefix + gardenLevel);
 
-            if (OnLevelChange != null)
-            {
-                OnLevelChange.Invoke();
-            }
+            VisitManager.UpdateVisitCost();
 
             AchieveManager.UpdateStatus(AchieveType.GardenLevel, gardenLevel);
             
@@ -256,6 +256,11 @@ public class Manager : Regist
                 kv.Value.OnLevelChange();
             }
 
+            if (OnLevelChange != null)
+            {
+                OnLevelChange.Invoke(gardenLevel);
+            }
+
             if (gardenLevel >= TutorialManager.MemoryMinigameTutorialLevel)
             {
                 if (TutorialManager.memoryMinigameTutorial)
@@ -440,6 +445,8 @@ public class Manager : Regist
             ResourceManager.SetText(ObjectLabel.P_CoinLab, Auxiliary.ShrinkNumberStr(coin));
 
             AchieveManager.UpdateStatus(AchieveType.CurrentCoin, coin);
+
+            OnCoinChange.SafeInvoke(coin);
         }
     }
     public static double coin;
@@ -453,6 +460,8 @@ public class Manager : Regist
 
             ResourceManager.SetText(ObjectLabel.F_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
             ResourceManager.SetText(ObjectLabel.P_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
+
+            OnDiamondChange.SafeInvoke(diamond);
         }
     }
     public static double diamond;

+ 10 - 0
Assets/Script/Manage/PlazaRoomManager.cs

@@ -88,6 +88,16 @@ public class PlazaRoomManager : Regist
         CreateRoom_DurationSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
         CreateRoom_MaxPlayerSlider.onValueChanged.AddListener(OnSliderValueChange);
         CreateRoom_MaxPlayerSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
+
+        Manager.OnCoinChange += coin =>
+        {
+            ResourceManager.SetText(ObjectLabel.X_CoinText, ResourceManager.Get<Text>(ObjectLabel.F_CoinLab).text);
+        };
+
+        Manager.OnDiamondChange += diamond =>
+        {
+            ResourceManager.SetText(ObjectLabel.X_DiamondText, ResourceManager.Get<Text>(ObjectLabel.F_DiamondLab).text);
+        };
     }
 
 

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

@@ -113,12 +113,14 @@ public class SocialManager : Regist
 
     public static void EnablePraise()
     {
+        PraiseText.color = Lib.PraiseTextBlue;
         PraiseButton.image.color = Color.white;
         PraiseButton.interactable = true;
     }
 
     public static void DisablePraise()
     {
+        PraiseText.color = Lib.PraiseTextWhite;
         PraiseButton.image.color = Lib.Pink;
         PraiseButton.interactable = false;
     }

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

@@ -572,9 +572,8 @@ public class UIManager : Regist
 
         #endregion
 
-        #region C_SocialPanel
+        #region C_CommentParent
 
-        ResourceManager.Get(ObjectLabel.C_FriendButton).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(ObjectLabel.C_CommentParent).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         #endregion

+ 1 - 0
Assets/Script/Manage/VisitManager.cs

@@ -715,6 +715,7 @@ public class VisitManager : Regist
 
         SocialManager.PraiseButton.interactable = false;
         SocialManager.PraiseButton.image.color = Color.white;
+        SocialManager.PraiseText.color =Lib.PraiseTextBlue;
     }
 
     public static void SetVisiteePraise(XmlDocument document)

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

@@ -91,7 +91,7 @@ public class CommentItem : Regist
 
         VisitButton.onClick.AddListener(Visit);
         
-        Manager.OnLevelChange += () =>
+        Manager.OnLevelChange += (level) =>
         {
             ContentText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
         };

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

@@ -52,7 +52,7 @@ public class Ranktem : Regist
 
         VisitBtn.onClick.AddListener(Visit);
 
-        Manager.OnLevelChange += () =>
+        Manager.OnLevelChange += (level) =>
         {
             VisitText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
         };

+ 0 - 0
Assets/Script/Function.meta → Assets/Script/Social.meta


+ 30 - 0
Assets/Script/Social/FriendManager.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class FriendManager : Regist
+{
+    #region Config
+
+    public static int ActivateLevel = TutorialManager.VisitTutorialLevel;
+    
+    #endregion
+
+    public override void RegistReference()
+    {
+        ResourceManager.Get(ObjectLabel.C_FriendButton).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        Manager.OnLevelChange += level =>
+        {
+            if (level >= ActivateLevel)
+            {
+                ResourceManager.Get(ObjectLabel.C_FriendButton).TweenForCG();
+            }
+        };
+    }
+
+    public override void FirstInit()
+    {
+        
+    }
+}

+ 12 - 0
Assets/Script/Social/FriendManager.cs.meta

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

+ 1 - 1
Assets/Script/Tool/Auxiliary.cs

@@ -152,7 +152,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.A))
         {
-
+            DebugManager.ResetGardenLevel(30);
         }
 
         if (Input.GetKeyDown(KeyCode.S))

+ 3 - 0
Assets/Script/Tool/Lib.cs

@@ -24,6 +24,9 @@ public class Lib
     public static Color RoomClosing = new Color(240/255f, 103/255f, 101/255f, 1);
     public static Color RoomRunning = new Color(90/255f, 170/255f, 39/255f, 1);
 
+    public static Color PraiseTextWhite = new Color(1, 1, 1, 1);
+    public static Color PraiseTextBlue = new Color(94/255f, 114/255f, 216/255f, 1);
+
     public static Sprite PackSprite
     {
         get { return ResourceManager.LoadSprite(ResourceLabel.Pack, Folder.UI); }

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