长通知和切换场景保留消息

2022-01-24 15:36:18 +08:00 · 2022-01-24 15:36:18 +08:00 · cd162f3325
commit cd162f3325
parent 7bb5bafbd2
17 changed files with 1341 additions and 99 deletions
--- a/Assets/HomeMessageController.cs
+++ b/Assets/HomeMessageController.cs
@ -18,10 +18,11 @@ public class HomeMessageController : MonoBehaviour
    float timer = 2;
    public float? textWidth = null;
    private bool isAnimated = false;
-    public void Initial()
+    public void Initial(float textWidth)
    {
        transform.Find("TextContainer/Content").localPosition = new Vector2(startX, transform.Find("TextContainer/Content").localPosition.y);
        isAnimated = false;
+        this.textWidth = textWidth;
    }
    float playtime = 0;
 #if UNITY_STANDALONE_WIN
--- a/Assets/LongMessageScript.cs
+++ b/Assets/LongMessageScript.cs
@ -0,0 +1,72 @@
+using DG.Tweening;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class LongMessageScript : MonoBehaviour
+{
+    // Start is called before the first frame update
+    float startX;
+    private void Awake()
+    {
+        startX = transform.Find("TextContainer/Content").localPosition.x;
+#if (UNITY_ANDROID || UNITY_IOS)
+        UIManager.AddEvent(transform.Find("BtnClose").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+         {
+             gameObject.SetActive(false);
+         });
+#endif
+    }
+    void Start()
+    {
+
+    }
+    float timer = 2;
+    public float? textWidth = null;
+    private bool isAnimated = false;
+    public void Initial(string txt)
+    {
+        var txtTransform = transform.Find("TextContainer/Content");
+        txtTransform.GetComponent<Text>().text = txt;
+        LayoutRebuilder.ForceRebuildLayoutImmediate(txtTransform.GetComponent<RectTransform>());
+        txtTransform.localPosition = new Vector2(startX, transform.Find("TextContainer/Content").localPosition.y);
+        isAnimated = false;
+        timer = 2;
+    }
+    float playtime = 0;
+#if UNITY_STANDALONE_WIN
+    float maxWidth = 1087;
+#else
+    float maxWidth = 350;
+#endif
+    // Update is called once per frame
+    void Update()
+    {
+        timer -= Time.deltaTime;
+        if (timer <= 0)
+        {
+            var width = transform.Find("TextContainer/Content").GetComponent<RectTransform>().sizeDelta.x;
+            if (textWidth != width) 
+            {
+                this.textWidth = width;
+            }
+            //do
+            if (textWidth.HasValue && textWidth > maxWidth)
+            {
+                var offset = textWidth.Value - maxWidth;
+                var game = transform.Find("TextContainer/Content");
+                var v = 30 / 0.3f;
+                playtime = offset / v;
+                //匀速播放
+                game.DOLocalMoveX(startX - offset, playtime).onComplete
+                    = () => Invoke("returnAni", 1.5f);
+            }
+            timer += (playtime * 2f + 1.5f + 2f);
+        }
+    }
+    void returnAni()
+    {
+        transform.Find("TextContainer/Content").DOLocalMoveX(startX, playtime);
+    }
+}
--- a/Assets/LongMessageScript.cs.meta
+++ b/Assets/LongMessageScript.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 41ea55049aa944d4d8613ad6e7cec012
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Images/NewDesign/bg_message_app.png
+++ b/Assets/Resources/Images/NewDesign/bg_message_app.png
--- a/Assets/Resources/Images/NewDesign/bg_message_app.png.meta
+++ b/Assets/Resources/Images/NewDesign/bg_message_app.png.meta
@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: deca1e7a817a27c4f872f78a9921e3de
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Images/NewDesign/icon_delete.png
+++ b/Assets/Resources/Images/NewDesign/icon_delete.png
--- a/Assets/Resources/Images/NewDesign/icon_delete.png.meta
+++ b/Assets/Resources/Images/NewDesign/icon_delete.png.meta
@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 598b8993297726b4da5cab9a96376429
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Images/NewDesign/icon_message.png
+++ b/Assets/Resources/Images/NewDesign/icon_message.png
--- a/Assets/Resources/Images/NewDesign/icon_message.png.meta
+++ b/Assets/Resources/Images/NewDesign/icon_message.png.meta
@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 6bf8e03f9ba9ba64da37fbc6c2939906
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab
@ -476,6 +476,80 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  radius: 20
+--- !u!1 &979830512863095920
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8225459854144891598}
+  - component: {fileID: 8476704931823866961}
+  - component: {fileID: 1218695838370556193}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8225459854144891598
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 979830512863095920}
+  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: 5021686153317968446}
+  m_RootOrder: 0
+  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: 10, y: 0}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8476704931823866961
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 979830512863095920}
+  m_CullTransparentMesh: 0
+--- !u!114 &1218695838370556193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 979830512863095920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 6bf8e03f9ba9ba64da37fbc6c2939906, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1056884570710093829
 GameObject:
  m_ObjectHideFlags: 0
@ -1050,6 +1124,95 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  key: 
+--- !u!1 &1760823292303603572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6638878482574731658}
+  - component: {fileID: 6469431270146606060}
+  - component: {fileID: 9172857339700226812}
+  - component: {fileID: 1526862894549736223}
+  m_Layer: 5
+  m_Name: TextContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6638878482574731658
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  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: 5857520441960753819}
+  m_Father: {fileID: 5021686153317968446}
+  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: 48, y: 0}
+  m_SizeDelta: {x: -58, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6469431270146606060
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  m_CullTransparentMesh: 0
+--- !u!114 &9172857339700226812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  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
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1526862894549736223
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &1777885814862178516
 GameObject:
  m_ObjectHideFlags: 0
@ -1086,6 +1249,7 @@ RectTransform:
  - {fileID: 5476117399430850424}
  - {fileID: 565904738278397585}
  - {fileID: 761144064440934135}
+  - {fileID: 5021686153317968446}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1129,6 +1293,99 @@ CanvasGroup:
  m_Interactable: 1
  m_BlocksRaycasts: 1
  m_IgnoreParentGroups: 0
+--- !u!1 &1820078545517810517
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5857520441960753819}
+  - component: {fileID: 4601675833978957791}
+  - component: {fileID: 5666994582578651889}
+  - component: {fileID: 7122294175436086531}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5857520441960753819
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  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: 6638878482574731658}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4601675833978957791
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  m_CullTransparentMesh: 0
+--- !u!114 &5666994582578651889
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.94117653, g: 0.94117653, b: 0.94117653, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &7122294175436086531
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &2215345193639944119
 GameObject:
  m_ObjectHideFlags: 0
@ -3510,6 +3767,109 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8568883967107449780}
  m_CullTransparentMesh: 0
+--- !u!1 &8778292575808578313
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5021686153317968446}
+  - component: {fileID: 2425847121116292237}
+  - component: {fileID: 6637220405354391404}
+  - component: {fileID: 9114990232312110620}
+  - component: {fileID: 1715819549104108146}
+  m_Layer: 5
+  m_Name: LongMessage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5021686153317968446
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  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: 8225459854144891598}
+  - {fileID: 6638878482574731658}
+  m_Father: {fileID: 1777885814862178517}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 320, y: -40}
+  m_SizeDelta: {x: 1145, y: 44}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2425847121116292237
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  m_CullTransparentMesh: 0
+--- !u!114 &6637220405354391404
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  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
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &9114990232312110620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41ea55049aa944d4d8613ad6e7cec012, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1715819549104108146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 22
 --- !u!1 &9155556658501947211
 GameObject:
  m_ObjectHideFlags: 0
@ -4050,6 +4410,24 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3}
+--- !u!1 &2878789241602269182 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4566599628729395000, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+    type: 3}
+  m_PrefabInstance: {fileID: 1777885815653005510}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2878789242754722739 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4566599627569075061, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+    type: 3}
+  m_PrefabInstance: {fileID: 1777885815653005510}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2878789241596989269 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4566599628726286227, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+    type: 3}
+  m_PrefabInstance: {fileID: 1777885815653005510}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4277467338606038296 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 2589794478743172574, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
@ -4062,33 +4440,15 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 1777885815653005510}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &2878789241596989269 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4566599628726286227, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-    type: 3}
-  m_PrefabInstance: {fileID: 1777885815653005510}
-  m_PrefabAsset: {fileID: 0}
--- !u!224 &4277467338018245799 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2589794478191162465, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-    type: 3}
-  m_PrefabInstance: {fileID: 1777885815653005510}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &2878789241602269182 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4566599628729395000, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-    type: 3}
-  m_PrefabInstance: {fileID: 1777885815653005510}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4277467338451912165 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 2589794478360427811, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
    type: 3}
  m_PrefabInstance: {fileID: 1777885815653005510}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &2878789242754722739 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4566599627569075061, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+--- !u!224 &4277467338018245799 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2589794478191162465, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
    type: 3}
  m_PrefabInstance: {fileID: 1777885815653005510}
  m_PrefabAsset: {fileID: 0}
--- a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab
@ -1,5 +1,98 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &39251923491391260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 496625435961015344}
+  - component: {fileID: 3686779470147895163}
+  - component: {fileID: 3454241008329311380}
+  - component: {fileID: 5735880026677687633}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &496625435961015344
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  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: 6123267120473738440}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3686779470147895163
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  m_CullTransparentMesh: 0
+--- !u!114 &3454241008329311380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.94117653, g: 0.94117653, b: 0.94117653, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &5735880026677687633
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &94116701349121391
 GameObject:
  m_ObjectHideFlags: 0
@ -362,6 +455,96 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_HorizontalFit: 0
  m_VerticalFit: 2
+--- !u!1 &739304589139301305
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3101539257439404383}
+  - component: {fileID: 4470537891739565541}
+  - component: {fileID: 3239680947982107728}
+  - component: {fileID: 8772978365302715748}
+  m_Layer: 5
+  m_Name: LongMessage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3101539257439404383
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  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: 53415216725554946}
+  - {fileID: 6123267120473738440}
+  - {fileID: 616424717270607455}
+  m_Father: {fileID: 1777885814862178517}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 102, y: 0}
+  m_SizeDelta: {x: 427, y: 30}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4470537891739565541
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  m_CullTransparentMesh: 0
+--- !u!114 &3239680947982107728
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: deca1e7a817a27c4f872f78a9921e3de, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8772978365302715748
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41ea55049aa944d4d8613ad6e7cec012, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &814462565054075501
 GameObject:
  m_ObjectHideFlags: 0
@ -525,6 +708,80 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  radius: 33
+--- !u!1 &1669859688312970477
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 53415216725554946}
+  - component: {fileID: 4115531399334717754}
+  - component: {fileID: 4700204487958702806}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &53415216725554946
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669859688312970477}
+  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: 3101539257439404383}
+  m_RootOrder: 0
+  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: 10, y: 0}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4115531399334717754
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669859688312970477}
+  m_CullTransparentMesh: 0
+--- !u!114 &4700204487958702806
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669859688312970477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 6bf8e03f9ba9ba64da37fbc6c2939906, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1709217281902147025
 GameObject:
  m_ObjectHideFlags: 0
@ -637,6 +894,7 @@ RectTransform:
  - {fileID: 1128757190696039284}
  - {fileID: 3431565778213871763}
  - {fileID: 825902449212828960}
+  - {fileID: 3101539257439404383}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2073,6 +2331,95 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: New Text
+--- !u!1 &3305547976192018571
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6123267120473738440}
+  - component: {fileID: 4393057312522009308}
+  - component: {fileID: 8334531074317233837}
+  - component: {fileID: 5106731522060201054}
+  m_Layer: 5
+  m_Name: TextContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6123267120473738440
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  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: 496625435961015344}
+  m_Father: {fileID: 3101539257439404383}
+  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: 3.5, y: 0}
+  m_SizeDelta: {x: -77, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4393057312522009308
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  m_CullTransparentMesh: 0
+--- !u!114 &8334531074317233837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  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
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5106731522060201054
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &3462768965301733335
 GameObject:
  m_ObjectHideFlags: 0
@ -6048,6 +6395,80 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  radius: 10
+--- !u!1 &7987125498545214300
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 616424717270607455}
+  - component: {fileID: 9109390686136871026}
+  - component: {fileID: 6395684851358040485}
+  m_Layer: 5
+  m_Name: BtnClose
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &616424717270607455
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7987125498545214300}
+  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: 3101539257439404383}
+  m_RootOrder: 2
+  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: -10, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &9109390686136871026
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7987125498545214300}
+  m_CullTransparentMesh: 0
+--- !u!114 &6395684851358040485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7987125498545214300}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 598b8993297726b4da5cab9a96376429, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8058388555972429588
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/App.cs
+++ b/Assets/Scripts/App.cs
@ -14,12 +14,13 @@ using System.Threading.Tasks;
 using System.Timers;
 using Newtonsoft.Json;
 using Facebook.Unity;
+using Assets.Scenes.Ride.Scripts;

 public delegate void ChangeLanguageDelegate();

 public static class App
 {
-    public static string Host = "http://192.168.0.101:5087/";
+    public static string Host = "http://192.168.0.101:5084/";

    public static string AppVersion = Application.version;

@ -114,6 +115,9 @@ public static class App
    #region 语言改变事件
    public static event ChangeLanguageDelegate ChangeLanguageEvent;
    static Dictionary<string, Dictionary<string, string>> dic;
+
+    //全局队列保留最后5条消息
+    public static Queue<LinkedMessageEvent> globalMessageQueue = null;
    public static string GetLocalLanguage()
    {
        return language;
@ -224,6 +228,7 @@ public static class App
            App._IsRowerMode = bool.Parse(isRower);
        }
        //App.ChangeLanguage("en");
+        globalMessageQueue = new Queue<LinkedMessageEvent>();
        Screen.sleepTimeout = SleepTimeout.NeverSleep;
    }
 }
--- a/Assets/Scripts/Scenes/LoginController.cs
+++ b/Assets/Scripts/Scenes/LoginController.cs
@ -622,7 +622,7 @@ public class LoginController : BaseScene
            //#endif
            App.notifyContent = r.data.Value<string>("Content");

-            if (r.data.Value<int>("Id") != notifyId)//r.data.Value<int>("Id") != notifyId
+            if (r.data.Value<int>("Id") != notifyId && r.data.Value<int>("Id") != 0)//r.data.Value<int>("Id") != notifyId
            {
                UIManager.ShowNewsModal();
                PlayerPrefs.SetInt("notifyId", r.data.Value<int>("Id"));
--- a/Assets/Scripts/Scenes/MainController.cs
+++ b/Assets/Scripts/Scenes/MainController.cs
@ -71,6 +71,7 @@ public class MainController : BaseScene
    CanvasGroup rightMessage;
    private void InitialMessage()
    {
+        Debug.Log("初始化组件");
 #if UNITY_STANDALONE_WIN
        msgLocation = 1 * msg.transform.localPosition;
        var go = transform.Find("GameObject");
@ -100,7 +101,6 @@ public class MainController : BaseScene
        DestroyImmediate(transform.Find("GameObject/Message").gameObject);
        var m = Resources.Load<GameObject>("UI/Prefab/NewRoute/Mobile/Message");
        rightMessage = Instantiate<GameObject>(m).GetComponent<CanvasGroup>();
-        
        rightMessage.transform.SetParent(go);
        rightMessage.transform.localScale = Vector3.one;
        rightMessage.transform.localPosition = 1 * msgLocation;
@ -121,63 +121,38 @@ public class MainController : BaseScene
 #endif
    }

+    private void ShowQueueMessage()
+    {
+        int i = 0,count = App.globalMessageQueue.Count;
+        while (App.globalMessageQueue.Count != 0)
+        {
+            //SetMessage(msgs[i], App.globalMessageQueue.Dequeue());
+            var v = 1 * msgLocation;
+            // 0 1 2
+            // 2 1 0
+            msgs[i].transform.localPosition = new Vector3(v.x, v.y - (count - 1 - i) * moveOffset, v.z);
+            msgs[i].alpha = 1;
+            msgs[i].gameObject.SetActive(true);
+            SetMessage(msgs[i], App.globalMessageQueue.Dequeue());
+            i++;
+        }
+        msgIndex = i;
+    }
+
    private void LinkedMessageHandler(LinkedMessageEvent e)
    {
-        //msg.transform.Find("Content")
+        if (App.globalMessageQueue.Count == 5)
+        {
+            App.globalMessageQueue.Dequeue();
+        }
+        App.globalMessageQueue.Enqueue(e);
        emptyt = 0;
-        //#if UNITY_STANDALONE_WIN
-        //        Debug.Log(e.content);
-        //        if (App.currentPageIsHome)
-        //        {
-        //            DoMessage(e);
-        //        }
-        //        else 
-        //        {
-        //            DoMessageRight(e);
-        //        }
-        //#else
-        //        if (App.currentPageIsHome)
-        //        {
-        //            DoMessage6(e);
-        //        }
-        //#endif
        if (App.currentPageIsHome)
        {
            DoMessage6(e);
        }
    }
-    private void DoMessageRight(LinkedMessageEvent e) 
-    {
-        SetMessage(rightMessage, e);
-        rightMessage.DOFade(1, 0.5f).onComplete = () => Invoke("fade0", 0.8f);
-    }
-    private void DoMessage(LinkedMessageEvent e)
-    {
-        
-        var selectIndex = msgIndex % 3;
-        var m = msgs[selectIndex];
-        if (msgIndex >= 3) //
-        {
-            //msgIndex = 0;
-            m.DOFade(0, 0.5f).onComplete = ()=> 
-            {
-                SetMessage(m, e);
-                m.transform.localPosition = new Vector3(msgLocation.x, msgLocation.y - 54 * 2, msgLocation.z);
-                m.DOFade(1, 0.5f);
-                foreach (var item in msgs.Where((x, i) => i != selectIndex)) 
-                {
-                    item.transform.DOLocalMoveY(item.transform.localPosition.y + 54, 0.5f);
-                }
-            };
-        }
-        else 
-        {
-            SetMessage(m, e);
-            m.transform.localPosition = new Vector3(msgLocation.x, msgLocation.y - 54 * (msgIndex % 3), msgLocation.z);
-            m.DOFade(1, 0.5f);
-        }
-        msgIndex++;
-    }
+
 #if UNITY_STANDALONE_WIN
    float moveOffset = 74;
 #else
@ -187,6 +162,7 @@ public class MainController : BaseScene
    {
        //Resources.UnloadUnusedAssets();
        //GC.Collect();
+        Debug.Log(msgIndex);
        var selectIndex = msgIndex % 5;
        var m = msgs[selectIndex];
        if (msgIndex >= 5) //
@ -208,7 +184,6 @@ public class MainController : BaseScene
        }
        else
        {
-            Debug.Log(191);
            SetMessage(m, e);
            Sequence se = DOTween.Sequence();
            for (int i = 0; i < msgIndex; i++) 
@ -264,20 +239,6 @@ public class MainController : BaseScene
 //#endif
    }

-    void FinishMessageRight() 
-    {
-        msgIndex = 0;
-        rightMessage.DOFade(0, 0.3f);
-    }
-    void FinishMessage6() 
-    {
-        msgIndex = 0;
-        foreach (var m in msgs)
-        {
-            m.alpha = 0;
-            m.GetComponent<RectTransform>().localPosition = 1 * msgLocation;
-        }
-    }
    private void SetMessage(CanvasGroup m,LinkedMessageEvent e) 
    {
        m.GetComponent<Button>().onClick.RemoveAllListeners();
@ -304,9 +265,8 @@ public class MainController : BaseScene
        var txt = m.transform.Find("TextContainer/Content").GetComponent<RectTransform>();
        txt.GetComponent<Text>().text = e.content;
        LayoutRebuilder.ForceRebuildLayoutImmediate(txt);
-        Debug.Log(e.content + txt.sizeDelta.x);
-        m.GetComponent<HomeMessageController>().Initial();
-        m.GetComponent<HomeMessageController>().textWidth = txt.sizeDelta.x;
+        //Debug.Log(e.content + txt.sizeDelta.x);
+        m.GetComponent<HomeMessageController>().Initial(txt.sizeDelta.x);
    }
    CanvasGroup msg;
    void fade0()
@ -317,7 +277,6 @@ public class MainController : BaseScene
    // Start is called before the first frame update
    async void Start()
    {
-        
        UIManager.Instance.Root = root;
        UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
        UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
@ -325,6 +284,7 @@ public class MainController : BaseScene
            $"{Math.Round(SystemInfo.batteryLevel * 100, 0)}%";
        transform.Find("MobileInfo/TimeText").GetComponent<Text>().text =
            DateTime.Now.ToString("HH:mm");
+        ShowQueueMessage();
 #if UNITY_EDITOR
        if (App.CurrentUser == null) //App.CurrentUser == null
        {
--- a/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs
@ -99,7 +99,7 @@ namespace Assets.Scenes.Ride.Scripts
            this.routeId = routeId;
            this.content = content;
        }
-        public LinkedMessageEvent(int routeId, string content,string avatar,string nickname,string routeName)
+        public LinkedMessageEvent(int routeId, string content, string avatar, string nickname, string routeName)
        {
            this.routeId = routeId;
            this.content = content;
@ -107,6 +107,14 @@ namespace Assets.Scenes.Ride.Scripts
            this.nickname = nickname;
            this.routeName = routeName;
        }
+        public LinkedMessageEvent(LinkedMessageEvent data) 
+        {
+            this.routeId = data.routeId;
+            this.content = data.content;
+            this.avatar = data.avatar;
+            this.nickname = data.nickname;
+            this.routeName = data.routeName;
+        }

        private void CreateContent()
        { 
--- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
@ -364,8 +364,7 @@ public class HomeController : PFUIPanel
        var txt = m.transform.Find("TextContainer/Content").GetComponent<RectTransform>();
        txt.GetComponent<Text>().text = e.Message;
        LayoutRebuilder.ForceRebuildLayoutImmediate(txt);
-        m.GetComponent<HomeMessageController>().Initial();
-        m.GetComponent<HomeMessageController>().textWidth = txt.sizeDelta.x;
+        m.GetComponent<HomeMessageController>().Initial(txt.sizeDelta.x);
    }

    public override void Show()
@ -373,6 +372,26 @@ public class HomeController : PFUIPanel
        base.Show();
        transform.MyDOFade();
        GetSummary();
+        GetNotify();
+
        //transform.Find("Panel (1)").GetComponent<test>().startPage();
    }
+
+    private async Task GetNotify()
+    {
+        var r = await ConfigHelper.userApi.GetNotify();
+        if (r.result) 
+        {
+            var lm = transform.Find("LongMessage");
+            if (r.data.Value<int>("Id") != 0)
+            {
+                lm.gameObject.SetActive(true);
+                lm.GetComponent<LongMessageScript>().Initial(r.data["Content"].ToString().Replace("\r\n"," "));
+            }
+            else 
+            {
+                lm.gameObject.SetActive(false);
+            }
+        }
+    }
 }
--- a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
@ -8,6 +8,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using System.Threading.Tasks;

 public class NewRouteDetailController : PFUIPanel
 {
@ -131,7 +132,7 @@ public class NewRouteDetailController : PFUIPanel
        //}
    }
    MapRouteAreaDetail area;
-    int pageIndex = 0, pageSize = 10;
+    int pageIndex = 0, pageSize = 12;
    bool isEnd = false, startMouse = false;
    public async void Initial(int areaId)
    {
@ -152,7 +153,7 @@ public class NewRouteDetailController : PFUIPanel
            .text = string.Empty;
        
        
-        GetData(areaId);
+        await GetData(areaId);
        GetList();
        
    }
@ -205,7 +206,7 @@ public class NewRouteDetailController : PFUIPanel
            GetList();
        }
    }
-    private async void GetData(int areaId) 
+    private async Task GetData(int areaId) 
    {
        var res = await ConfigHelper.mapApi.GetMapRouteAreaDetail(areaId);
        if (res.result)