【任务】TAPD#

功能详情朋友圈配置文件否提交作者 QiCheng.Wang 评审人员

【任务】TAPD#
功能详情朋友圈配置文件否提交作者 QiCheng.Wang 评审人员
王琪诚
Commit 98febd81b39b12627db80320bf50c4a4fa7e66de 98febd81 1 parent 30a613bc
Showing 8 changed files with 436 additions and 45 deletions
Assets/LocalImage/showBigContent.png
Assets/LocalImage/showBigContent.png.meta
Assets/Scenes/ItemTest.unity
Assets/Scripts/FriendCircle/ImageViewerManager.cs
Assets/Scripts/FriendCircle/MomentItem.cs
Assets/Scripts/FriendCircle/MomentManager.cs
Assets/resources/Prefab/FriendMomentImage.prefab
Assets/resources/Prefab/MomentItem.prefab
--- a/Assets/LocalImage/showBigContent.png 0 → 100644
View file @98febd8
+++ b/Assets/LocalImage/showBigContent.png 0 → 100644
View file @98febd8
--- a/Assets/LocalImage/showBigContent.png.meta 0 → 100644
View file @98febd8
+++ b/Assets/LocalImage/showBigContent.png.meta 0 → 100644
View file @98febd8
+fileFormatVersion: 2
+guid: f4723abe6560e4ce6afafd0cb11af737
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/ItemTest.unity
View file @98febd8
+++ b/Assets/Scenes/ItemTest.unity
View file @98febd8
@@ -1013,10 +1013,10 @@ RectTransform:
   - {fileID: 989371012}
   m_Father: {fileID: 1150663700}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -25.687988, y: 572}
-  m_SizeDelta: {x: -308.25, y: -1737.2814}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -25.844, y: 568}
+  m_SizeDelta: {x: 771.44, y: 187.16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &637033553
 MonoBehaviour:
@@ -1038,7 +1038,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: f4723abe6560e4ce6afafd0cb11af737, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1402,7 +1402,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 960620721}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
@@ -1411,12 +1411,14 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_StartCorner: 0
-  m_StartAxis: 0
-  m_CellSize: {x: 1080, y: 1200}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &989371011
 GameObject:
   m_ObjectHideFlags: 0
@@ -1449,10 +1451,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 637033552}
   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.000011444092, y: 0}
-  m_SizeDelta: {x: 771.75, y: 182.7186}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000091552734, y: 22.452682}
+  m_SizeDelta: {x: -37.163, y: -72.7776}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &989371013
 MonoBehaviour:
@@ -1501,13 +1503,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 30
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
   m_textAlignment: 65535
@@ -1683,7 +1685,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1150663700
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3226,7 +3228,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 142.72937, y: -159.87097}
+  m_AnchoredPosition: {x: 152, y: -217}
   m_SizeDelta: {x: 273.848, y: 207.6898}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1714109486
--- a/Assets/Scripts/FriendCircle/ImageViewerManager.cs
View file @98febd8
+++ b/Assets/Scripts/FriendCircle/ImageViewerManager.cs
View file @98febd8
+using System;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Networking;
@@ -36,6 +37,18 @@ public class ImageViewerManager : MonoBehaviour
         StartCoroutine(ImageLoader.LoadImage(logo, logoImage));
         contentTextMeshProUGUI.text = content;
         timeTextMeshProUGUI.text = time;
+        
+        //初始高度180
+        int initHeight = 180;
+        RectTransform contentParentRect = contentTextMeshProUGUI.transform.parent.GetComponent<RectTransform>();
+        contentParentRect.sizeDelta = new Vector2(contentParentRect.sizeDelta.x, initHeight);
+        //动态设置高度，每行23个字
+        int height =  (int)Math.Ceiling((double)content.Length / 23) * 65;
+        if (height>initHeight)
+        {
+            contentParentRect.sizeDelta = new Vector2(contentParentRect.sizeDelta.x, height);
+        }
+        
     }
     public void Hide()
--- a/Assets/Scripts/FriendCircle/MomentItem.cs
View file @98febd8
+++ b/Assets/Scripts/FriendCircle/MomentItem.cs
View file @98febd8
@@ -35,6 +35,8 @@ public class MomentItem : MonoBehaviour
     public GameObject likePrefab; // 点赞emjoi预制体
     public TextMeshProUGUI likesText;
+    public TextMeshProUGUI likedEmoji;
+    
     private string originLikesText;
     public TextMeshProUGUI commentsText;
@@ -109,14 +111,28 @@ public class MomentItem : MonoBehaviour
-    public void Setup(Moment moment,List<Like> likeList,string likeIcon,string logo,int momentCount)
+    public int Setup(Moment moment,List<Like> likeList,string likeIcon,string logo,int momentCount)
     {
+        //计算单条朋友圈所占高度
+        //每行字50
+        int line = 50;
+        //图片、视频400
+        int media = 400;
+        int momentHeight = 0;
         usernameText.text = moment.username;
+        momentHeight+= line;
+        
         contentText.text = moment.text;
+        //计算文本的行数，每行30个字
+        int textLine = (int)Math.Ceiling((double)moment.text.Length / 30);
+        momentHeight+= textLine*line;
+        
         from.text = moment.from;
         time.text = moment.time;
         StartCoroutine(ImageLoader.LoadImage(likeIcon, likeIconImage));
         originLikeIcon = likeIcon;
+        momentHeight+= line;
+
         StartCoroutine(ImageLoader.LoadImage(moment.avatarUrl, avatarImage));
@@ -125,6 +141,18 @@ public class MomentItem : MonoBehaviour
         {
             likeGrid.gameObject.SetActive(true);
         });
+        
+        
+        Button likedEmojiBtn = likedEmoji.GetComponent<Button>();
+        likedEmojiBtn.onClick.AddListener(() =>
+        {
+            //显示点赞Icon
+            likeIconImage.gameObject.SetActive(true);
+            
+            likedEmoji.gameObject.SetActive(false);
+            likedEmoji.text = "";
+            likeGrid.gameObject.SetActive(true);
+        });
         // 清空之前的图片
@@ -139,11 +167,13 @@ public class MomentItem : MonoBehaviour
             Image img = imgObj.GetComponent<Image>();
             StartCoroutine(ImageLoader.LoadImage(url, img));
             Transform child = imgObj.transform.GetChild(0);
-            child.DOScale(0.6f, 1f).SetLoops(-1, LoopType.Yoyo).SetEase(Ease.InOutSine);
+            child.DOScale(0.45f, 2f).SetLoops(-1, LoopType.Yoyo).SetEase(Ease.InOutSine);
             Button btn = imgObj.GetComponent<Button>();
             btn.onClick.AddListener(() => ImageViewerManager.Instance.ShowImage(url,moment.text,logo,moment.time));
         }
+        //一行两张图片，计算有几行
+        momentHeight+=  (int)Math.Ceiling((double)moment.imageUrls.Count / 2) * media;
@@ -179,7 +209,11 @@ public class MomentItem : MonoBehaviour
             Button btn = obj.GetComponent<Button>();
             btn.onClick.AddListener(() => VideoViewerManager.Instance.ShowVideo(moment));
+            
+            momentHeight+=  media;
         }
+        
+
         //点赞图片以及文字初始化
@@ -228,8 +262,10 @@ public class MomentItem : MonoBehaviour
                 //隐藏点赞Icon
                 likeIconImage.gameObject.SetActive(false);
-                //TODO 显示已经点赞的emoji标签
-                
+                //显示已经点赞的emoji标签
+                likedEmoji.text = like.icon;
+                likedEmoji.gameObject.SetActive(true);
+
                 likeGrid.gameObject.SetActive(false);
                 //增加点赞名字
@@ -244,12 +280,17 @@ public class MomentItem : MonoBehaviour
                 likesText.text = string.Join(", ", names);
             });
         }
+        
+        momentHeight+= line;
         likesText.text = string.Join(", ", moment.likeNameList);
         originLikesText = likesText.text;
         commentsText.text = "";
         LoadComments(moment.comments);
+        momentHeight+= moment.comments.Count*line;
+
+        return momentHeight+200;
     }
--- a/Assets/Scripts/FriendCircle/MomentManager.cs
View file @98febd8
+++ b/Assets/Scripts/FriendCircle/MomentManager.cs
View file @98febd8
@@ -33,11 +33,17 @@ public class MomentManager : MonoBehaviour
             int momentCount = 1;
             GameObject item = Instantiate(momentPrefab, contentParent);
+            int momentHeight = item.GetComponent<MomentItem>().Setup(moment,data.likeList,data.likeIcon,data.logo,momentCount++);
+
+            RectTransform momentRt = item.GetComponent<RectTransform>();
+            momentRt.sizeDelta = new Vector2(momentRt.sizeDelta.x, momentHeight);
+            
             //计算列表高度
-            RectTransform rt = item.GetComponent<RectTransform>();
-            momentListHeight+= rt.rect.height;
+            // RectTransform rt = item.GetComponent<RectTransform>();
+            // momentListHeight+= rt.rect.height;
+            
+            momentListHeight+= momentHeight;
-            item.GetComponent<MomentItem>().Setup(moment,data.likeList,data.likeIcon,data.logo,momentCount++);
         }
         //设定顶部封面高度
--- a/Assets/resources/Prefab/FriendMomentImage.prefab
View file @98febd8
+++ b/Assets/resources/Prefab/FriendMomentImage.prefab
View file @98febd8
@@ -27,14 +27,14 @@ RectTransform:
   m_GameObject: {fileID: 1990591235901545225}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.72601, y: 0.72601, z: 0.72601}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2327885096247245973}
   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: -198}
+  m_AnchoredPosition: {x: 0, y: -212}
   m_SizeDelta: {x: 395, y: 149}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &142993819740274611
--- a/Assets/resources/Prefab/MomentItem.prefab
View file @98febd8
+++ b/Assets/resources/Prefab/MomentItem.prefab
View file @98febd8
@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 781.90027, y: 0}
+  m_SizeDelta: {x: 771.6973, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4867507668132122837
 CanvasRenderer:
@@ -66,7 +66,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Bob, CharlieBob,
+  m_text: Bob, CharlieBob
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: e4002ced6a3580448963db96223ad8bf, type: 2}
   m_sharedMaterial: {fileID: -6404392141848387476, guid: e4002ced6a3580448963db96223ad8bf, type: 2}
@@ -93,8 +93,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 28
+  m_fontSizeBase: 28
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -230,6 +230,206 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1436999699436744877
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4592196923246910271}
+  - component: {fileID: 8561840853038617291}
+  - component: {fileID: 5011945072125408528}
+  - component: {fileID: 7044725107275116496}
+  - component: {fileID: 6556403917504077810}
+  m_Layer: 5
+  m_Name: LikedEmoji
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4592196923246910271
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436999699436744877}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 933536019744797015}
+  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: 788, y: -2}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8561840853038617291
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436999699436744877}
+  m_CullTransparentMesh: 1
+--- !u!114 &5011945072125408528
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436999699436744877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: e4002ced6a3580448963db96223ad8bf, type: 2}
+  m_sharedMaterial: {fileID: -6404392141848387476, guid: e4002ced6a3580448963db96223ad8bf, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4290427578
+  m_fontColor: {r: 0.7294118, g: 0.7294118, b: 0.7294118, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 0
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 40
+  m_fontSizeBase: 40
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &7044725107275116496
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436999699436744877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: 500
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &6556403917504077810
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436999699436744877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1534361540249689770
 GameObject:
   m_ObjectHideFlags: 0
@@ -798,6 +998,7 @@ MonoBehaviour:
   likeGrid: {fileID: 791864646146378596}
   likePrefab: {fileID: 9178889867283835311, guid: e24148f97082744f882ce467fd38b84d, type: 3}
   likesText: {fileID: 3974158831220795792}
+  likedEmoji: {fileID: 5011945072125408528}
   commentsText: {fileID: 7245545156690182981}
   danmakuManager: {fileID: 3592364449536958164}
   checkRectTransform: {fileID: 1919980167639563440}
@@ -948,8 +1149,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 28
+  m_fontSizeBase: 28
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -958,7 +1159,7 @@ MonoBehaviour:
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
   m_textAlignment: 65535
-  m_characterSpacing: 7
+  m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -1043,6 +1244,7 @@ RectTransform:
   - {fileID: 4735349657589972976}
   - {fileID: 791864646146378596}
   - {fileID: 1919980167639563440}
+  - {fileID: 4592196923246910271}
   m_Father: {fileID: 5137047804386020533}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1229,8 +1431,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 19, y: -18}
-  m_SizeDelta: {x: 30, y: 30}
+  m_AnchoredPosition: {x: 27, y: -24}
+  m_SizeDelta: {x: 35, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &888018792828137858
 CanvasRenderer:
@@ -1649,8 +1851,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 28
+  m_fontSizeBase: 28
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -2052,7 +2254,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 41.900238, y: 0}
+  m_SizeDelta: {x: 50, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7917989825231092027
 MonoBehaviour:
@@ -2113,10 +2315,10 @@ RectTransform:
   - {fileID: 3108337084099359238}
   m_Father: {fileID: 5112969456787946611}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 47.40027, y: -612.5}
-  m_SizeDelta: {x: 823.8005, y: 1175}
+  m_AnchoredPosition: {x: 53, y: -21}
+  m_SizeDelta: {x: 823.8005, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5312690894359832804
 MonoBehaviour: