增加公告功能

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -254,6 +254,7 @@ MonoBehaviour:
   - {fileID: 4900000, guid: c73fc4d1ada1ad744ba552dd68b77db2, type: 3}
   - {fileID: 4900000, guid: 075016097d3fe144aad23832fbad02d2, type: 3}
   - {fileID: 4900000, guid: 68a23da1aaa13bd40b898e3011d11f96, type: 3}
+  - {fileID: 4900000, guid: c772e4a074d644a4aa3bdb7ed17ba7a2, type: 3}
   DiscardList:
   - {fileID: 1422722603004606, guid: f66999d8c3be4ff46b7dbde0417af018, type: 2}
   - {fileID: 1178346060137818, guid: e2d62becad3f170428db59673f313354, type: 2}

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -1394,6 +1394,25 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1565225231317410
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224270387276606410}
+  - component: {fileID: 222848240476544830}
+  - component: {fileID: 114958739766765546}
+  - component: {fileID: 114755238032018034}
+  - component: {fileID: 225257719410529230}
+  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 &1580878763643000
 GameObject:
   m_ObjectHideFlags: 1
@@ -5885,6 +5904,8 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+  VerticalMinSize: 1
+  VerticalMaxSize: 29
 --- !u!114 &114597100579211732
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6705,6 +6726,47 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u89E3\u9501\u4E00\u5757\u571F\u5730"
+--- !u!114 &114755238032018034
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1565225231317410}
+  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: 114958739766765546}
+  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 &114768857124744064
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7537,6 +7599,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114958739766765546
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1565225231317410}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114968028061115344
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8302,6 +8391,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1760594964275230}
+--- !u!222 &222848240476544830
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1565225231317410}
 --- !u!222 &222857786308180446
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -9008,6 +9103,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.5}
   m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224270387276606410
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1565225231317410}
+  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: 224476342221405536}
+  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: 140, y: -0.05003}
+  m_SizeDelta: {x: 46.1, y: 46.1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224292133597169256
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9644,6 +9757,7 @@ RectTransform:
   m_Children:
   - {fileID: 224143706629484300}
   - {fileID: 224517132005796266}
+  - {fileID: 224270387276606410}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11056,6 +11170,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225257719410529230
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1565225231317410}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225258390236582028
 CanvasGroup:
   m_ObjectHideFlags: 1

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -30,6 +30,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1002679203403518
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224701569410070820}
+  - component: {fileID: 222411080627944226}
+  - component: {fileID: 114552830487073394}
+  m_Layer: 0
+  m_Name: K_NotifyImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1006427425384980
 GameObject:
   m_ObjectHideFlags: 1
@@ -845,14 +862,14 @@ GameObject:
   m_Component:
   - component: {fileID: 224245895851058856}
   - component: {fileID: 222849114785870628}
-  - component: {fileID: 114076312176365902}
+  - component: {fileID: 114192376548404976}
   m_Layer: 5
-  m_Name: K_Tit
+  m_Name: K_NotifyLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1574018712738396
 GameObject:
   m_ObjectHideFlags: 1
@@ -1073,6 +1090,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1733238351267212
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224754680288089100}
+  - component: {fileID: 222337525671240522}
+  - component: {fileID: 114076312176365902}
+  m_Layer: 5
+  m_Name: K_Tit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1742722100593922
 GameObject:
   m_ObjectHideFlags: 1
@@ -1742,7 +1776,7 @@ MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1562867076842996}
+  m_GameObject: {fileID: 1733238351267212}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2104,6 +2138,48 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114192376548404976
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1562867076842996}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 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: 21
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 21
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 0
+  RemovePos: 
+  ImageIndex: 
+  RemoveIndex: 
+  NewTextIndex: 
+  NewTextPos: []
 --- !u!114 &114195169755804006
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3183,6 +3259,34 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 2
+--- !u!114 &114552830487073394
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002679203403518}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f7e6e302f395b744be6ac65d53a2240, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  Draw: 0
 --- !u!114 &114555831220191402
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4353,6 +4457,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1841279750753034}
+--- !u!222 &222337525671240522
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1733238351267212}
 --- !u!222 &222337585713997760
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4395,6 +4505,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1937697851145028}
+--- !u!222 &222411080627944226
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002679203403518}
 --- !u!222 &222412246479802524
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4968,14 +5084,15 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 224701569410070820}
   m_Father: {fileID: 224786476895471532}
-  m_RootOrder: 0
+  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: 50, y: -20}
-  m_SizeDelta: {x: 384, y: 40}
+  m_AnchoredPosition: {x: 50.000015, y: -283}
+  m_SizeDelta: {x: 384, y: 169}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224260345720222558
 RectTransform:
@@ -5786,6 +5903,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224701569410070820
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002679203403518}
+  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: 224245895851058856}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224702851814715122
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5940,6 +6075,24 @@ RectTransform:
   m_AnchoredPosition: {x: 72.15328, y: -14.489051}
   m_SizeDelta: {x: 134.30656, y: 18.978102}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224754680288089100
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1733238351267212}
+  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: 224786476895471532}
+  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: 50, y: -20}
+  m_SizeDelta: {x: 384, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224782786808807644
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5972,9 +6125,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224245895851058856}
+  - {fileID: 224754680288089100}
   - {fileID: 224952061365785792}
   - {fileID: 224378969073810080}
+  - {fileID: 224245895851058856}
   m_Father: {fileID: 224708669857040244}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/XML/PlayerConfig.xml

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

Assets/Script/Manage/Initializer.cs

@@ -46,7 +46,8 @@ public class Initializer : MonoBehaviour
         ManaServer.Login(ManaCenter.LoginCallbackInitial);
         ManaServer.MailRequest();
         ManaServer.IOSAlipayRequest();
-
+        ManaServer.NotificationRequest();
+        
         Instance = this;
         Transform = transform;
 

Assets/Script/Manage/ManaCenter.cs

@@ -870,6 +870,7 @@ public class ManaCenter : Regist
                     (
                         Language.GetStr("Common", "ShortCoin"),
                         Language.GetStr("Common", "NavigateCoin"),
+                        null,
                         ManaReso.LoadSprite("金币", Folder.UI),
                         () =>
                         {
@@ -910,6 +911,7 @@ public class ManaCenter : Regist
                     (
                         Language.GetStr("Common", "ShortCoin"),
                         null,
+                        null,
                         ManaReso.LoadSprite("金币", Folder.UI)
                     );
                 }
@@ -941,6 +943,7 @@ public class ManaCenter : Regist
                     (
                         Language.GetStr("Common", "ShortDiamond"),
                         Language.GetStr("Common", "NavigateDiamond"),
+                        null,
                         ManaReso.LoadSprite("钻石", Folder.UI),
                         () =>
                         {
@@ -981,6 +984,7 @@ public class ManaCenter : Regist
                     (
                         Language.GetStr("Common", "ShortDiamond"),
                         null,
+                        null,
                         ManaReso.LoadSprite("钻石", Folder.UI)
                     );
                 }
@@ -1070,7 +1074,7 @@ public class ManaCenter : Regist
             ManaServer.SerialNumber = ManaData.GetPlayerString("SerialNumber");
 
 
-            Bubble.Show(null, Language.GetStr("UI", "La_Lab0"), null, () => { Application.Quit(); }, null, false);
+            Bubble.Show(null, Language.GetStr("UI", "La_Lab0"), null, null, () => { Application.Quit(); }, null, false);
 
 
             SaveLock = true;

Assets/Script/Manage/ManaData.cs

@@ -969,6 +969,13 @@ public class ManaData : Regist
             To1(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 2)
+        {
+            Debug.LogWarning("UpdateArchive to 2");
+
+            To2(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -993,4 +1000,15 @@ public class ManaData : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument To2(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 2.ToString();
+
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("NotificationIndex");
+
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/ManaServer.cs

@@ -99,8 +99,13 @@ public class ManaServer : Regist
     public static bool Connect_;
     public static bool PackLock_;
 
-    public static int PraiseAmt;
     public static int Counter;
+    public static int PraiseAmt;
+
+    public static int NotificationIndex;
+    public static string NotificationStr;
+    public static Sprite NotificationSprite;
+
     public static float Timer;
     public static bool Complete;
     public static bool FirstConnect = true;
@@ -208,7 +213,34 @@ public class ManaServer : Regist
     }
 
 
-    public static void DownloadAllTexture(List<WWW> wwwList)
+    public static void NotificationRequest()
+    {
+        //URLRequestData urlData = new URLRequestData();
+
+        //URLRequest.CreateURLRequest
+        //(
+        //    "https://garden.dashgame.com/index.php/home/index/index",
+        //    urlData,
+        //    data =>
+        //    {
+        //        NotificationCallback(data);
+        //    }
+        //);
+    }
+
+    public static void NotificationCallback(JsonData jsonData)
+    {
+        if (jsonData.Inst_Object.ContainsKey("error"))
+        {
+
+        }
+        else
+        {
+
+        }
+    }
+
+    public static void PullTexturesCallback(List<WWW> wwwList)
     {
         List<Texture2D> textureList = new List<Texture2D>();
         List<SpriteInfo> spriteInfoList = new List<SpriteInfo>();
@@ -245,10 +277,14 @@ public class ManaServer : Regist
             SpriteAsset.SpriteInfoDic.Add(spriteInfoList[i].Name, spriteInfoList[i]);
         }
 
-        Auxiliary.Instance.Sprite = sprite;
+        //NotificationStr =
+        //NotificationIndex = 
+        NotificationSprite = sprite;
+
+        ManaReso.Get("C_Notify").TweenForCG();
     }
 
-    public static IEnumerator DownloadAllAsset(List<string> urlList, Action<List<WWW>> callback)
+    public static IEnumerator PullAssets(List<string> urlList, Action<List<WWW>> callback)
     {
         List<WWW> wwwList = new List<WWW>();
 

Assets/Script/Manage/ManaSign.cs

@@ -714,6 +714,11 @@ public class ManaSign : Regist
             return true;
         }
 
+        if (ShowNotification())
+        {
+            return true;
+        }
+
         return false;
     }
 
@@ -777,6 +782,31 @@ public class ManaSign : Regist
         return false;
     }
 
+    public static bool ShowNotification()
+    {
+        if (ManaServer.NotificationIndex > ManaData.GetPlayerInt("NotificationIndex"))
+        {
+            ManaData.SavePlayerInt("NotificationIndex", ManaServer.NotificationIndex);
+
+            ShowNotificationCore();
+
+            return true;
+        }
+        else
+        {
+            //Debug.Log("Don't Show");
+
+            return false;
+        }
+    }
+
+    public static void ShowNotificationCore()
+    {
+        ManaReso.Get<Image>("K_NotifyImagePlus").sprite = ManaServer.NotificationSprite;
+
+        Bubble.Show(null, null, ManaServer.NotificationStr);
+    }
+
 
     public static void GetSignReward()
     {

Assets/Script/Manage/ManaSocial.cs

@@ -178,7 +178,7 @@ public class ManaSocial : Regist
 
     public static void NextPage(bool isPlayer, bool isDownload)
     {
-        Debug.Log("NextPage");
+        //Debug.Log("NextPage");
         if (isPlayer)
         {
             int saveAmt = 0;
@@ -244,7 +244,7 @@ public class ManaSocial : Regist
             return;
         }
 
-        Debug.Log("PreviousPage");
+        //Debug.Log("PreviousPage");
 
         if (isPlayer)
         {
@@ -299,7 +299,7 @@ public class ManaSocial : Regist
     {
         PullLock = true;
         UpdateLock = false;
-        Debug.Log("PullPage");
+        //Debug.Log("PullPage");
 
         if (isPlayer)
         {
@@ -365,7 +365,7 @@ public class ManaSocial : Regist
 
         if (isPlayer)
         {
-            Debug.Log("UpdatePlayer");
+            //Debug.Log("UpdatePlayer");
 
             PlayerFirstIndex = 0;
             PlayerLastIndex = -1;

Assets/Script/Manage/ManaUI.cs

@@ -197,11 +197,12 @@ public class ManaUI : Regist
             "Bb_Confirm",
             () =>
             {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
                 ManaReso.Get("B_SignIn").TweenBacCG();
-                ManaReso.Get("Ba_Notice").TweenBacCG();
                 ManaReso.Get("Bb_SignIn").TweenBacCG();
 
-                ManaAudio.PlayClip(Clip.BtnClip);
+                ManaSign.ShowOfflineReward();
             }
         );
 
@@ -480,6 +481,21 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_Notify
+
+        ManaReso.Get("C_Notify").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.AddButtonEvent
+        (
+            "C_Notify",
+            () =>
+            {
+                ManaSign.ShowNotificationCore();
+            }
+        );
+
+        #endregion
+
         #region C_Comment
 
         ManaReso.SetButtonEvent
@@ -1487,7 +1503,7 @@ public class ManaUI : Regist
                     suffix = Language.GetStr("Common", "Buff");
                 }
 
-                Bubble.Show(Language.GetStr("UI", "F_PersonBtn0") + suffix, Language.GetStr("UI", "F_PersonBtn1"), ManaReso.LoadSprite("4大技能1", Folder.UI));
+                Bubble.Show(Language.GetStr("UI", "F_PersonBtn0") + suffix, Language.GetStr("UI", "F_PersonBtn1"), null, ManaReso.LoadSprite("4大技能1", Folder.UI));
             }
         );
 
@@ -1517,7 +1533,7 @@ public class ManaUI : Regist
                     suffix = Language.GetStr("Common", "Buff");
                 }
 
-                Bubble.Show(Language.GetStr("UI", "F_CoinPersonBtn0") + suffix, Language.GetStr("UI", "F_CoinPersonBtn1"), ManaReso.LoadSprite("绿-免费金币", Folder.UI));
+                Bubble.Show(Language.GetStr("UI", "F_CoinPersonBtn0") + suffix, Language.GetStr("UI", "F_CoinPersonBtn1"), null, ManaReso.LoadSprite("绿-免费金币", Folder.UI));
             }
         );
 

Assets/Script/Manage/ManaVisit.cs

@@ -853,6 +853,7 @@ public class ManaVisit
                 Language.GetStr("UI", "C_VisitFail"),
                 null,
                 null,
+                null,
                 () =>
                 {
                     ManaReso.Get("I_BlackMask").TweenForCG();

Assets/Script/Object/Chest.cs

@@ -165,6 +165,7 @@ public class Chest : MonoBehaviour, IPointerClickHandler
         (
             Language.GetStr("Object", "Chest"),
             null,
+            null,
             ManaReso.LoadSprite("宝箱", Folder.Scene),
             () =>
             {

Assets/Script/Object/Player.cs

@@ -607,7 +607,7 @@ public class Player : Regist , IPointerClickHandler
         {
             Bubble.Show
             (
-                null, Language.GetStr("UI", "P_Return"), null,
+                null, Language.GetStr("UI", "P_Return"), null, null,
                 () =>
                 {
                     Reset();

Assets/Script/Tool/Auxiliary.cs

@@ -167,7 +167,9 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            ManaMiniGame.Score += 400;
+            ManaReso.Get("C_Notify").TweenForCG();
+
+            //ManaMiniGame.Score += 400;
 
             //ManaSign.SignTime = new DateTime(2007, 1, 1);
         }
@@ -262,7 +264,7 @@ public class Auxiliary : Regist
         {
             ManaMiniGame.Pause = true;
 
-            Bubble.Show(Language.GetStr("Common", "QuitGame"), null, null, Application.Quit, () => { ManaMiniGame.Pause = false; });
+            Bubble.Show(Language.GetStr("Common", "QuitGame"), null, null, null, Application.Quit, () => { ManaMiniGame.Pause = false; });
         }
 
         if (AnyKeyUp)

Assets/Script/Tool/UI/Bubble.cs

@@ -10,6 +10,7 @@ public class Bubble : Regist
 
     public static Text Tit;
     public static Text Lab;
+    public static Text NotifyLab;
     public static Image Icon;
     public static Button Cancel;
     public static Button Confirm;
@@ -30,6 +31,7 @@ public class Bubble : Regist
 
         Tit = ManaReso.Get<Text>("K_Tit");
         Lab = ManaReso.Get<Text>("K_Lab");
+        NotifyLab = ManaReso.Get<Text>("K_NotifyLab");
         Icon = ManaReso.Get<Image>("K_Icon");
 
         Cancel = ManaReso.Get<Button>("K_Cancel");
@@ -43,7 +45,7 @@ public class Bubble : Regist
     }
 
 
-    public static void Show(string tit = null, string lab = null, Sprite sprite = null, UnityAction confirmAction = null, UnityAction cancelAction = null, bool enableCancle = true)
+    public static void Show(string tit = null, string lab = null, string notifyLab = null, Sprite sprite = null, UnityAction confirmAction = null, UnityAction cancelAction = null, bool enableCancle = true)
     {
         ManaAudio.PlayClip(Clip.BubbleClip);
 
@@ -69,6 +71,16 @@ public class Bubble : Regist
             Lab.SetActive(true);
             Lab.text = lab;
         }
+        
+        if (string.IsNullOrEmpty(notifyLab))
+        {
+            NotifyLab.SetActive(false);
+        }
+        else
+        {
+            NotifyLab.SetActive(true);
+            NotifyLab.text = notifyLab;
+        }
 
         if (sprite == null)
         {

ToDoList.txt

@@ -1,10 +1,3 @@
-公告
-
-ScrollRect的特殊情况
-
-为什么有时要用ScaleFactor有时又不用
-
-
 关闭调试模式
 
 关闭多线程渲染