jet 8 роки тому
батько
коміт
fe8b947598

+ 0 - 9
Assets/Editor.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 5fcd7f3618d0f154995b49930421ea1b
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/metro/UWP.meta

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

+ 0 - 9
Assets/Plugins/metro/WindowsPhone81.meta

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

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

@@ -121,6 +121,7 @@ MonoBehaviour:
   - {fileID: 21300026, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 21300024, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 1073147265121344, guid: 100bc0b1747d64e4db7883a2f0d726c5, type: 2}
+  - {fileID: 1301950428336920, guid: 3251e6b903666f2488364daaf1f2cc88, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

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

@@ -8968,10 +8968,10 @@ RectTransform:
   m_Father: {fileID: 224813247372850516}
   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: 139.20003, y: -22.300049}
-  m_SizeDelta: {x: 235.6, y: 40.4}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 7.9, y: 0.24}
+  m_SizeDelta: {x: 229.5, y: 37.8}
   m_Pivot: {x: 0.5000001, y: 0.49999857}
 --- !u!224 &224230966601901948
 RectTransform:

+ 597 - 2
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -43,6 +43,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1021567901412406
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224921106973203834}
+  - component: {fileID: 222350765229990216}
+  - component: {fileID: 114581268523045066}
+  m_Layer: 5
+  m_Name: R_NotifyBK
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1030241618017872
 GameObject:
   m_ObjectHideFlags: 1
@@ -128,6 +145,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1085305686768246
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224433780169973406}
+  - component: {fileID: 222875035238427832}
+  - component: {fileID: 114290163815171566}
+  - component: {fileID: 114181262799530072}
+  m_Layer: 5
+  m_Name: R_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1087937706018140
 GameObject:
   m_ObjectHideFlags: 1
@@ -302,6 +337,43 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1279836499527996
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224782530703948524}
+  - component: {fileID: 225139117653011648}
+  - component: {fileID: 222406121557858362}
+  - component: {fileID: 114396147522041770}
+  m_Layer: 5
+  m_Name: R_Notify
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &1288559604406698
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224358005319063908}
+  - component: {fileID: 114069790495465478}
+  - component: {fileID: 222122305524819716}
+  - component: {fileID: 114424533455548334}
+  - component: {fileID: 114651371513916514}
+  m_Layer: 5
+  m_Name: R_ScrollRect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1294418056427990
 GameObject:
   m_ObjectHideFlags: 0
@@ -320,6 +392,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1295879960619384
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224587309226476736}
+  - component: {fileID: 222976290318588948}
+  - component: {fileID: 114729576313549898}
+  m_Layer: 5
+  m_Name: R_CloseLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1296505566202500
 GameObject:
   m_ObjectHideFlags: 1
@@ -459,6 +548,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1444812444205710
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224582582284638562}
+  - component: {fileID: 222618874367213538}
+  - component: {fileID: 114451471118664504}
+  m_Layer: 5
+  m_Name: R_NotifyTit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1456638495083814
 GameObject:
   m_ObjectHideFlags: 1
@@ -736,6 +842,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1724352613594788
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224530982106190726}
+  - component: {fileID: 114581569817452318}
+  - component: {fileID: 114570048512481094}
+  m_Layer: 5
+  m_Name: R_Grid
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1727929300464162
 GameObject:
   m_ObjectHideFlags: 1
@@ -1367,6 +1490,37 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114069790495465478
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1288559604406698}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 224530982106190726}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 0
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 0}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114070635513483312
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1678,6 +1832,47 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114181262799530072
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1085305686768246}
+  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: 114290163815171566}
+  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 &114183743212847932
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1866,6 +2061,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114290163815171566
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1085305686768246}
+  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: 1e0c425d384f8644282ea5d7104860e4, 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 &114302399324393264
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1967,6 +2189,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u65B0\u624B\u793C\u5305"
+--- !u!114 &114396147522041770
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1279836499527996}
+  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: 0, g: 0, b: 0, 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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114397757131279372
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2099,6 +2348,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114424533455548334
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1288559604406698}
+  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}
+  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 &114432294221521612
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2191,6 +2467,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114451471118664504
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1444812444205710}
+  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: 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: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u516C\u544A"
 --- !u!114 &114460844045410314
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2498,6 +2807,19 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114570048512481094
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1724352613594788}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &114577444321653960
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2525,6 +2847,55 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114581268523045066
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1021567901412406}
+  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: 3f36639ac83ce4a489bd621d684ea1a5, 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 &114581569817452318
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1724352613594788}
+  m_Enabled: 0
+  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: 5
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 5
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
 --- !u!114 &114581774730213310
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2780,6 +3151,17 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53D1\u578B"
+--- !u!114 &114651371513916514
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1288559604406698}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &114651693244122472
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3030,6 +3412,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8BF7\u8F93\u5165\u7559\u8A00\u5185\u5BB9"
+--- !u!114 &114729576313549898
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295879960619384}
+  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: 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: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD4\u56DE"
 --- !u!114 &114741434322227784
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3863,6 +4278,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1927746862060112}
+--- !u!222 &222122305524819716
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1288559604406698}
 --- !u!222 &222212359181224312
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3929,6 +4350,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1602944605773306}
+--- !u!222 &222350765229990216
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1021567901412406}
 --- !u!222 &222356554977465922
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3941,6 +4368,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1808383842750954}
+--- !u!222 &222406121557858362
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1279836499527996}
 --- !u!222 &222413496744440792
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4013,6 +4446,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1272965741628062}
+--- !u!222 &222618874367213538
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1444812444205710}
 --- !u!222 &222647120335289526
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4103,6 +4542,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1456638495083814}
+--- !u!222 &222875035238427832
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1085305686768246}
 --- !u!222 &222883498103241124
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4133,6 +4578,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1869167270173128}
+--- !u!222 &222976290318588948
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295879960619384}
 --- !u!222 &222987508510619164
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4410,7 +4861,7 @@ RectTransform:
   m_Children:
   - {fileID: 224463042448387068}
   m_Father: {fileID: 224814127152008004}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -4470,7 +4921,7 @@ RectTransform:
   m_Children:
   - {fileID: 224801133016773586}
   m_Father: {fileID: 224814127152008004}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -4533,6 +4984,25 @@ RectTransform:
   m_AnchoredPosition: {x: -25.1, y: 4.7}
   m_SizeDelta: {x: 23.9, y: 21.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224358005319063908
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1288559604406698}
+  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: 224530982106190726}
+  m_Father: {fileID: 224921106973203834}
+  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: -0.000013351, y: 122.999985}
+  m_SizeDelta: {x: 585, y: 280.9}
+  m_Pivot: {x: 0.5, y: 0.99999994}
 --- !u!224 &224358051453031872
 RectTransform:
   m_ObjectHideFlags: 1
@@ -4648,6 +5118,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224433780169973406
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1085305686768246}
+  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: 224587309226476736}
+  m_Father: {fileID: 224921106973203834}
+  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.0000038147, y: -189.5}
+  m_SizeDelta: {x: 161.85, y: 52}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224435996306572860
 RectTransform:
   m_ObjectHideFlags: 1
@@ -4873,6 +5362,24 @@ RectTransform:
   m_AnchoredPosition: {x: -25.1, y: 4.7}
   m_SizeDelta: {x: 23.9, y: 21.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224530982106190726
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1724352613594788}
+  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: 224358005319063908}
+  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.50001, y: 140.45}
+  m_SizeDelta: {x: 584, y: 5}
+  m_Pivot: {x: 0.5, y: 1.0000001}
 --- !u!224 &224549163792536180
 RectTransform:
   m_ObjectHideFlags: 1
@@ -4953,6 +5460,42 @@ RectTransform:
   m_AnchoredPosition: {x: -25.1, y: 4.7}
   m_SizeDelta: {x: 23.9, y: 21.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224582582284638562
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1444812444205710}
+  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: 224921106973203834}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 148.63}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224587309226476736
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1295879960619384}
+  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: 224433780169973406}
+  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 &224590025111341236
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5159,6 +5702,25 @@ RectTransform:
   m_AnchoredPosition: {x: 411.4001, y: -449.99997}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.5, y: 0.00000041350722}
+--- !u!224 &224782530703948524
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1279836499527996}
+  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: 224921106973203834}
+  m_Father: {fileID: 224814127152008004}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224788526416840810
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5236,6 +5798,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224042092064329274}
+  - {fileID: 224782530703948524}
   - {fileID: 224337869017959276}
   - {fileID: 224300270873615824}
   m_Father: {fileID: 0}
@@ -5354,6 +5917,27 @@ RectTransform:
   m_AnchoredPosition: {x: -1155.407, y: -99.603874}
   m_SizeDelta: {x: 87.852, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224921106973203834
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1021567901412406}
+  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: 224433780169973406}
+  - {fileID: 224582582284638562}
+  - {fileID: 224358005319063908}
+  m_Father: {fileID: 224782530703948524}
+  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: 15.07}
+  m_SizeDelta: {x: 621, y: 378}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224956698026267740
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5373,6 +5957,17 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -11.001007}
   m_SizeDelta: {x: 454.5, y: 306}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &225139117653011648
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1279836499527996}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225624207726012666
 CanvasGroup:
   m_ObjectHideFlags: 1

+ 180 - 0
Assets/Resource/Prefab/PrefabUI/NotifyItem.prefab

@@ -0,0 +1,180 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1301950428336920}
+  m_IsPrefabParent: 1
+--- !u!1 &1301950428336920
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224576714409606238}
+  - component: {fileID: 222820759933001066}
+  - component: {fileID: 114327975871632254}
+  - component: {fileID: 114909937099244962}
+  m_Layer: 5
+  m_Name: NotifyItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1410359730056868
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224204986437827020}
+  - component: {fileID: 222618878114654182}
+  - component: {fileID: 114155211660277960}
+  m_Layer: 0
+  m_Name: NotifyImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114155211660277960
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1410359730056868}
+  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 &114327975871632254
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1301950428336920}
+  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: 0, g: 0, b: 0, 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: 16
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 16
+    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 &114909937099244962
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1301950428336920}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!222 &222618878114654182
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1410359730056868}
+--- !u!222 &222820759933001066
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1301950428336920}
+--- !u!224 &224204986437827020
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1410359730056868}
+  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: 224576714409606238}
+  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 &224576714409606238
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1301950428336920}
+  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: 224204986437827020}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 585, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3251e6b903666f2488364daaf1f2cc88
+timeCreated: 1504241686
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

+ 1 - 1
Assets/Resource/XML/PlayerConfig.xml

@@ -29,7 +29,7 @@
   <CircleTimer value="0" />
   <ADPlayTime value="4/23/2017 09:30:00 AM" />
   <MiniGameIndex value="0" />
-  <NotificationIndex value="0" />
+  <NotificationIndex value="-1" />
   <OneTimeReward value="" />
   
   <Player value="PlayerBlond" />

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

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

+ 5 - 0
Assets/Script/Manage/Initializer.cs

@@ -166,6 +166,11 @@ public class Initializer : MonoBehaviour
 
         Complete = true;
 
+        if (ManaServer.NotificationReady)
+        {
+            ManaReso.Get("C_Notify").TweenForCG();
+        }
+
         ManaPlayer.InitializeDressRoom();
 
         GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 7";

+ 125 - 0
Assets/Script/Manage/ManaNotify.cs

@@ -0,0 +1,125 @@
+using System;
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.UI;
+
+public class ManaNotify
+{
+    private class Content
+    {
+        public bool IsImage;
+        public string text;
+        public TextAnchor Alignment;
+
+        public Content(bool isImage, string text, TextAnchor alignment)
+        {
+            this.text = text;
+            this.IsImage = isImage;
+            this.Alignment = alignment;
+        }
+    }
+
+    public static bool Initialized;
+
+    private static List<Text> TextList = new List<Text>();
+    private static Dictionary<string, List<Content>> ContentsDic = new Dictionary<string, List<Content>>();
+
+    public static void AddLine(bool isImage, string language, string content, TextAnchor alignment)
+    {
+        if (language == "null")
+        {
+            AddLine(isImage, "English", content, alignment);
+            AddLine(isImage, "Chinese", content, alignment);
+            AddLine(isImage, "ChineseTraditional", content, alignment);
+        }
+
+        if (!ContentsDic.ContainsKey(language))
+        {
+            ContentsDic.Add(language, new List<Content>());
+        }
+
+        ContentsDic[language].Add(new Content(isImage, content, alignment));
+    }
+
+
+    public static void Show()
+    {
+        if (!Initialized)
+        {
+            Initialize(GetLanguage());
+        }
+        else
+        {
+            SwitchLanguage(GetLanguage());
+        }
+
+        ManaReso.Get("R_Notify").TweenForCG();
+    }
+
+    public static void Initialize(string language)
+    {
+        Initialized = true;
+
+        List<Content> contents = ContentsDic[language];
+
+        for (int i = 0; i < contents.Count; i++)
+        {
+            Transform transform = ManaReso.Get("NotifyItem", Folder.UI, false, ManaReso.Get("R_Grid"), false);
+
+            if (contents[i].IsImage)
+            {
+                transform.GetComponent<Text>().fontSize = 300;
+                transform.GetComponent<Text>().verticalOverflow = VerticalWrapMode.Overflow;
+                transform.GetComponent<Text>().horizontalOverflow = HorizontalWrapMode.Overflow;
+                transform.GetComponent<Text>().resizeTextForBestFit = false;
+                transform.GetComponent<ContentSizeFitter>().enabled = true;
+
+                transform.GetChild(0).GetComponent<Image>().sprite = ManaServer.NotificationSprite;
+            }
+
+            transform.GetComponent<Text>().text = contents[i].text;
+            transform.GetComponent<Text>().alignment = contents[i].Alignment;
+
+            TextList.Add(transform.GetComponent<Text>());
+        }
+
+        Auxiliary.Instance.DelayCall
+            (
+                () =>
+                {
+                    ManaReso.Get<VerticalLayoutGroup>("R_Grid").enabled = true;
+                },
+                1
+            );
+    }
+
+    public static void SwitchLanguage(string language)
+    {
+        for (int i = 0; i < TextList.Count; i++)
+        {
+            TextList[i].text = ContentsDic[language][i].text;
+        }
+    }
+
+    public static string GetLanguage()
+    {
+        if (ManaLan.CurrentLan == Lan.ChineseSimplified)
+        {
+            return "Chinese";
+        }
+        else if (ManaLan.CurrentLan == Lan.ChineseTraditional)
+        {
+            return "ChineseTraditional";
+        }
+        else if (ManaLan.CurrentLan == Lan.English)
+        {
+            return "English";
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+}

+ 12 - 0
Assets/Script/Manage/ManaNotify.cs.meta

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

+ 149 - 33
Assets/Script/Manage/ManaServer.cs

@@ -102,7 +102,8 @@ public class ManaServer : Regist
     public static int Counter;
     public static int PraiseAmt;
 
-    public static int NotificationIndex;
+    public static int NotificationIndex = -1;
+    public static bool NotificationReady;
     public static string NotificationStr;
     public static Sprite NotificationSprite;
 
@@ -215,32 +216,93 @@ public class ManaServer : Regist
 
     public static void NotificationRequest()
     {
-        //URLRequestData urlData = new URLRequestData();
-
-        //URLRequest.CreateURLRequest
-        //(
-        //    "https://garden.dashgame.com/index.php/home/index/index",
-        //    urlData,
-        //    data =>
-        //    {
-        //        NotificationCallback(data);
-        //    }
-        //);
+        //Debug.Log("A");
+        IndexRequest
+            (
+                data =>
+                {
+                    //Debug.Log("B");
+                    URLRequestData urlData = new URLRequestData();
+                    URLRequest.CreateStrURLRequest
+                        (
+                            data["l"][3]["val"].ToString(),
+                            urlData,
+                            notificationXml =>
+                            {
+                                //Debug.Log("C");
+                                NotificationCallback(notificationXml);
+                            }
+                        );
+                }
+            );
     }
 
-    public static void NotificationCallback(JsonData jsonData)
+    public static void NotificationCallback(string xml)
     {
-        if (jsonData.Inst_Object.ContainsKey("error"))
+        //Debug.Log("D");
+        XmlNode rootNode;
+        XmlDocument document = new XmlDocument();
+
+        try
         {
+            document.LoadXml(xml);
+
+            rootNode = document.SelectSingleNode("announce");
+
+            NotificationIndex = int.Parse(rootNode.SelectSingleNode("version").InnerText);
+
+            XmlNodeList nodeList = rootNode.SelectNodes("item");
 
+            List<string> urlList = new List<string>();
+
+            for (int i = 0; i < nodeList.Count; i++)
+            {
+                DecodeNotificationItem(nodeList[i], urlList);
+            }
+
+            Auxiliary.Instance.StartCoroutine(PullNotifyTexs(urlList, PullNotifyTexsCallback));
         }
-        else
+        catch (Exception)
+        {
+
+        }
+        finally
+        {
+            
+        }
+    }
+
+    public static void DecodeNotificationItem(XmlNode node, List<string> urlList)
+    {
+        XmlNodeList nodeList = node.SelectNodes("title");
+
+        for (int i = 0; i < nodeList.Count; i++)
         {
+            ManaNotify.AddLine(false, nodeList[i].Attributes[0].Value, nodeList[i].InnerText, TextAnchor.MiddleLeft);
+        }
+
+        ManaNotify.AddLine(false, "null", node.SelectSingleNode("date").InnerText, TextAnchor.MiddleLeft);
+
+        nodeList = node.SelectSingleNode("content").ChildNodes;
 
+        for (int i = 0; i < nodeList.Count; i++)
+        {
+            if (nodeList[i].Name == "text")
+            {
+                ManaNotify.AddLine(false, nodeList[i].Attributes[0].Value, nodeList[i].InnerText, TextAnchor.MiddleLeft);
+            }
+            else if (nodeList[i].Name == "image")
+            {
+                urlList.UniqueAdd(nodeList[i].InnerText);
+
+                ManaNotify.AddLine(true, "null", $"<({Path.GetFileNameWithoutExtension(nodeList[i].InnerText)})>", TextAnchor.MiddleCenter);
+            }
         }
+
+        ManaNotify.AddLine(false, "null", "", TextAnchor.MiddleLeft);
     }
 
-    public static void PullTexturesCallback(List<WWW> wwwList)
+    public static void PullNotifyTexsCallback(List<WWW> wwwList)
     {
         List<Texture2D> textureList = new List<Texture2D>();
         List<SpriteInfo> spriteInfoList = new List<SpriteInfo>();
@@ -277,14 +339,18 @@ public class ManaServer : Regist
             SpriteAsset.SpriteInfoDic.Add(spriteInfoList[i].Name, spriteInfoList[i]);
         }
 
-        //NotificationStr =
-        //NotificationIndex = 
         NotificationSprite = sprite;
+        NotificationReady = true;
+
+        if (Initializer.Complete)
+        {
+            ManaReso.Get("C_Notify").TweenForCG();
+        }
 
-        ManaReso.Get("C_Notify").TweenForCG();
+        //Debug.Log("Done");
     }
 
-    public static IEnumerator PullAssets(List<string> urlList, Action<List<WWW>> callback)
+    public static IEnumerator PullNotifyTexs(List<string> urlList, Action<List<WWW>> callback)
     {
         List<WWW> wwwList = new List<WWW>();
 
@@ -292,7 +358,7 @@ public class ManaServer : Regist
         {
             wwwList.Add(new WWW(urlList[i]));
         }
-
+        
         for (int i = 0; i < wwwList.Count; i++)
         {
             yield return wwwList[i];
@@ -407,21 +473,47 @@ public class ManaServer : Regist
 
     public static void MailRequest()
     {
+        MailXml = "<mail>" +
+                  "<OneTimeReward>" +
+                  "<id>4</id>" +
+                  "<start>2017-08-18 12:12:12</start>" +
+                  "<end>2017-09-1 11:30:12</end>" +
+                  "<reward>" +
+                  "<coin>1000</coin>" +
+                  "<diamond>10</diamond>" +
+                  "</reward>" +
+                  "<targets>" +
+                  "<id>90arbl</id>" +
+                  "</targets>" +
+                  "</OneTimeReward>" +
+                  "<OneTimeReward>" +
+                  "<id>3</id>" +
+                  "<start>2017-08-21 12:12:12</start>" +
+                  "<end>2017-09-01 18:12:12</end>" +
+                  "<reward>" +
+                  "<coin>10000</coin>" +
+                  "<diamond>100</diamond>" +
+                  "</reward>" +
+                  "<targets>" +
+                  "<id>90arbl</id>" +
+                  "</targets>" +
+                  "</OneTimeReward>" +
+                  "</mail>";
+
         IndexRequest
             (
                 data =>
                 {
                     URLRequestData urlData = new URLRequestData();
-
                     URLRequest.CreateStrURLRequest
-                    (
-                        data["l"][1]["val"].ToJson().Trim('"'),
-                        urlData,
-                        mailXml =>
-                        {
-                            MailXml = mailXml;
-                        }
-                    );
+                        (
+                            data["l"][1]["val"].ToJson().Trim('"'),
+                            urlData,
+                            mailXml =>
+                            {
+                                //MailXml = mailXml;
+                            }
+                        );
                 }
             );
     }
@@ -434,8 +526,16 @@ public class ManaServer : Regist
         }
     }
 
+    //public static List<MailReward> MergeMailRewards(List<MailReward> mailRewards)
+    //{
+    //    List<MailReward> newMailRewards = new List<MailReward>();
+
+
+    //} 
+
     public static void GetMailReward(MailReward mailReward)
     {
+        //Debug.Log(mailReward.Id);
         ManaData.SavePlayerString("OneTimeReward", $"{ManaData.GetPlayerString("OneTimeReward")} {mailReward.Id}".Trim(' '));
 
         if (mailReward.Key == "pack")
@@ -605,7 +705,7 @@ public class ManaServer : Regist
         MailRewardList = new List<MailReward>();
 
         XmlDocument xmlDoc = new XmlDocument();
-
+        //Debug.Log("Decode");
         try
         {
             xmlDoc.LoadXml(mailXml);
@@ -616,18 +716,34 @@ public class ManaServer : Regist
         }
 
         XmlNodeList rewardNodeList = xmlDoc.SelectSingleNode("mail").SelectNodes("OneTimeReward");
-
+        //Debug.Log(ManaData.GetPlayerString("OneTimeReward"));
         List<string> receivedIdList = Auxiliary.StringListParse(' ', ManaData.GetPlayerString("OneTimeReward"), new List<string>());
 
+        //Debug.Log("");
+        //foreach (var id in receivedIdList)
+        //{
+        //    Debug.Log(id);
+        //}
+        //Debug.Log("");
+
         for (int i = 0; i < rewardNodeList.Count; i++)
         {
             string id = rewardNodeList[i].SelectSingleNode("id").InnerText;
-            
+            //Debug.Log(id);
             if (receivedIdList.Contains(id))
             {
                 continue;
             }
 
+            DateTime startTime = DateTime.Parse(rewardNodeList[i].SelectSingleNode("start").InnerText);
+            DateTime endTime = DateTime.Parse(rewardNodeList[i].SelectSingleNode("end").InnerText);
+
+            if (Time < startTime || Time > endTime)
+            {
+                Debug.Log("Skip");
+                continue;
+            }
+
             XmlNodeList targetIdNodeList = rewardNodeList[i].SelectSingleNode("targets").SelectNodes("id");
 
             for (int j = 0; j < targetIdNodeList.Count; j++)

+ 2 - 9
Assets/Script/Manage/ManaSign.cs

@@ -784,11 +784,11 @@ public class ManaSign : Regist
 
     public static bool ShowNotification()
     {
-        if (ManaServer.NotificationIndex > ManaData.GetPlayerInt("NotificationIndex"))
+        if (ManaServer.NotificationIndex > ManaData.GetPlayerInt("NotificationIndex") && ManaServer.NotificationReady)
         {
             ManaData.SavePlayerInt("NotificationIndex", ManaServer.NotificationIndex);
 
-            ShowNotificationCore();
+            ManaNotify.Show();
 
             return true;
         }
@@ -800,13 +800,6 @@ public class ManaSign : Regist
         }
     }
 
-    public static void ShowNotificationCore()
-    {
-        ManaReso.Get<Image>("K_NotifyImagePlus").sprite = ManaServer.NotificationSprite;
-
-        Bubble.Show(null, null, ManaServer.NotificationStr);
-    }
-
 
     public static void GetSignReward()
     {

+ 8 - 1
Assets/Script/Manage/ManaSocial.cs

@@ -389,7 +389,7 @@ public class ManaSocial : Regist
         }
         else
         {
-            Debug.Log("UpdateVisitee");
+            //Debug.Log("UpdateVisitee");
 
             VisiteeFirstIndex = 0;
             VisiteeLastIndex = -1;
@@ -461,6 +461,13 @@ public class ManaSocial : Regist
 
     public static void Comment()
     {
+        if (string.IsNullOrEmpty(InputField.text))
+        {
+            Bubble.Show(Language.GetStr("UI", "Lb_Send2"));
+
+            return;
+        }
+
         if ((DateTime.Now - CommentTime).TotalSeconds > 30)
         {
             CommentTime = DateTime.Now;

+ 23 - 1
Assets/Script/Manage/ManaUI.cs

@@ -490,7 +490,7 @@ public class ManaUI : Regist
             "C_Notify",
             () =>
             {
-                ManaSign.ShowNotificationCore();
+                ManaNotify.Show();
             }
         );
 
@@ -2605,6 +2605,28 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region R
+
+        tween = ManaReso.Get("R_Notify").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart +=
+            () =>
+            {
+                ManaReso.Get("R_NotifyBK").TweenForScale();
+            };
+
+        tween.OnBackwardStart +=
+            () =>
+            {
+                ManaReso.Get("R_NotifyBK").TweenBacScale();
+            };
+
+        ManaReso.Get("R_NotifyBK").CreateTweenScale(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.AddButtonEvent("R_Close", () => { ManaReso.Get("R_Notify").TweenBacCG(); });
+
+        #endregion
+
         if (!ManaTutorial.TutorialA)
         {
             HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();

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

@@ -167,11 +167,11 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            ManaReso.Get("C_Notify").TweenForCG();
+            //ManaReso.Get("C_Notify").TweenForCG();
 
-            //ManaMiniGame.Score += 400;
+            ManaMiniGame.Score += 400;
 
-            //ManaSign.SignTime = new DateTime(2007, 1, 1);
+            ManaSign.SignTime = new DateTime(2007, 1, 1);
         }
 
         //if (Input.GetKeyDown(KeyCode.M))

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

@@ -380,6 +380,8 @@ public class Bundle : MonoBehaviour
         yield return LoadAtlas();
         yield return LoadEffect();
 
+        SpriteAsset.AddBundleSpriteInfo();
+
         if (callback != null)
         {
             callback.Invoke();

+ 2 - 9
Assets/Script/Tool/UI/SpriteAsset.cs

@@ -48,21 +48,16 @@ public class SpriteAsset : MonoBehaviour
     {
         get
         {
-            if (_SpriteInfoDic == null)
-            {
-                GetSpriteInfo();
-            }
-
             return _SpriteInfoDic;
         }
         set { _SpriteInfoDic = value; }
     }
 
-    public static Dictionary<string, SpriteInfo> _SpriteInfoDic;
+    public static Dictionary<string, SpriteInfo> _SpriteInfoDic = new Dictionary<string, SpriteInfo>();
 
     #endregion
 
-    public static void GetSpriteInfo()
+    public static void AddBundleSpriteInfo()
     {
         Object[] objects = new Object[0];
 
@@ -85,8 +80,6 @@ public class SpriteAsset : MonoBehaviour
             texture = Bundle.Atlas.LoadAsset<Texture2D>("Atlas");
         }
 
-        _SpriteInfoDic = new Dictionary<string, SpriteInfo>();
-
         for (int i = 0; i < objects.Length; i++)
         {
             if (objects[i] is Sprite)

+ 5 - 0
ToDoList.txt

@@ -1,3 +1,8 @@
+修改了MailXML
+
+修改了公告XML
+
+
 关闭调试模式
 
 关闭多线程渲染