【任务】TAPD#

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

【任务】TAPD#
功能详情朋友圈配置文件否提交作者 QiCheng.Wang 评审人员
王琪诚
Commit 2980be660a41218493be687917bf57a567cf67ce 2980be66 1 parent e52669b8
Showing 14 changed files with 149 additions and 229 deletions
Assets/1.png
Assets/1.png.meta
Assets/LocalImage/ShowBigContentBg.png
Assets/LocalImage/ShowBigContentBg.png.meta
Assets/Scenes/ItemTest.unity
Assets/Scripts/FriendCircle/DanmakuManager.cs
Assets/Scripts/FriendCircle/ImageViewerManager.cs
Assets/Scripts/FriendCircle/MomentItem.cs
Assets/Scripts/FriendCircle/MomentManager.cs
Assets/Scripts/FriendCircle/VideoViewerManager.cs
Assets/StreamingAssets/appInfo.json
Assets/resources/Jsons/friend_data.json
Assets/resources/Prefab/FriendMomentImage.prefab
Assets/resources/Prefab/MomentItem.prefab
--- a/Assets/1.png deleted 100644 → 0
View file @e52669b
+++ b/Assets/1.png deleted 100644 → 0
View file @e52669b
--- a/Assets/1.png.meta deleted 100644 → 0
View file @e52669b
+++ b/Assets/1.png.meta deleted 100644 → 0
View file @e52669b
-fileFormatVersion: 2
-guid: ce5f72d4c8ab3410daab0b3b9b105c7a
-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/LocalImage/ShowBigContentBg.png
View file @2980be6
+++ b/Assets/LocalImage/ShowBigContentBg.png
View file @2980be6
--- a/Assets/LocalImage/ShowBigContentBg.png.meta
View file @2980be6
+++ b/Assets/LocalImage/ShowBigContentBg.png.meta
View file @2980be6
 fileFormatVersion: 2
-guid: 1801f1702060e4b92b6829f0e202205c
+guid: 9803114844fec4dd681443abb0aeecd3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
--- a/Assets/Scenes/ItemTest.unity
View file @2980be6
+++ b/Assets/Scenes/ItemTest.unity
View file @2980be6
@@ -946,8 +946,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: 800, y: -493.58002}
-  m_SizeDelta: {x: 1160, y: 187.16}
+  m_AnchoredPosition: {x: 800, y: -490}
+  m_SizeDelta: {x: 1160, y: 180}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &637033553
 MonoBehaviour:
@@ -969,7 +969,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1801f1702060e4b92b6829f0e202205c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9803114844fec4dd681443abb0aeecd3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1250,7 +1250,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 800, y: -1267.16}
+  m_AnchoredPosition: {x: 800, y: -1260}
   m_SizeDelta: {x: 1160, y: 1160}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &936019490
@@ -1387,8 +1387,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -4.5444946, y: 19.693}
-  m_SizeDelta: {x: -57.5638, y: -75.7418}
+  m_AnchoredPosition: {x: 0, y: 20}
+  m_SizeDelta: {x: -39.999992, y: -80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &990358363
 MonoBehaviour:
@@ -1519,9 +1519,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 936019489}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -144, y: -139}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -154, y: 193}
   m_SizeDelta: {x: 230, y: 195}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1015053101
@@ -2218,7 +2218,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 82, y: -135}
+  m_AnchoredPosition: {x: 60, y: -135}
   m_SizeDelta: {x: 31, y: 58}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1345160285
@@ -2529,8 +2529,8 @@ 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: -0.000061035, y: 0}
-  m_SizeDelta: {x: 1080, y: 600}
+  m_AnchoredPosition: {x: -4.7269, y: -245}
+  m_SizeDelta: {x: 1500, y: 300}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1475588210
 MonoBehaviour:
@@ -2681,9 +2681,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 936019489}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -165, y: -273}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -166, y: 58}
   m_SizeDelta: {x: 241, y: 81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1480902997
--- a/Assets/Scripts/FriendCircle/DanmakuManager.cs
View file @2980be6
+++ b/Assets/Scripts/FriendCircle/DanmakuManager.cs
View file @2980be6
@@ -3,6 +3,7 @@ using UnityEngine.UI;
 using TMPro;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 public class DanmakuManager : MonoBehaviour
 {
@@ -95,25 +96,53 @@ public class DanmakuManager : MonoBehaviour
         GameObject obj = Instantiate(danmakuPrefab, danmakuPanel);
         var tmp = obj.GetComponent<TextMeshProUGUI>();
         tmp.text = text;
-
+    
         RectTransform rt = obj.GetComponent<RectTransform>();
         float panelHeight = danmakuPanel.rect.height;
-
+    
         // 随机 Y 坐标（在整个 panel 高度范围内）
-        float randomY = Random.Range(-panelHeight / 2f, panelHeight / 2f);
+        // 获取随机 Y 坐标，确保与上次相差至少 30
+        float randomY = GetRandomY(panelHeight, 30f);        
         rt.anchoredPosition = new Vector2(danmakuPanel.rect.width, randomY);
-
+    
         float width = tmp.preferredWidth;
-
+    
         // 向左移动直到超出屏幕
         while (rt.anchoredPosition.x > -width)
         {
             rt.anchoredPosition += Vector2.left * speed * Time.deltaTime;
             yield return null;
         }
-
+    
         Destroy(obj);
     }
+    
+    // 记录最近的 4 个 Y 坐标
+    Queue<float> lastYList = new Queue<float>();
+    int maxTrackCount = 4; // 记录最近的 4 个 Y 坐标
+
+    float GetRandomY(float panelHeight, float minDifference)
+    {
+        float randomY = Random.Range(-panelHeight / 2f, panelHeight / 2f);
+
+        // 检查与历史记录中的 Y 坐标差是否小于 minDifference
+        while (lastYList.Any(y => Mathf.Abs(randomY - y) < minDifference))
+        {
+            randomY = Random.Range(-panelHeight / 2f, panelHeight / 2f);
+        }
+
+        // 更新 Y 坐标历史记录
+        if (lastYList.Count >= maxTrackCount)
+        {
+            lastYList.Dequeue(); // 移除最旧的 Y 坐标
+        }
+        lastYList.Enqueue(randomY); // 添加当前生成的 Y 坐标到队列
+
+        return randomY;
+    }
+
+    
+        
 }
--- a/Assets/Scripts/FriendCircle/ImageViewerManager.cs
View file @2980be6
+++ b/Assets/Scripts/FriendCircle/ImageViewerManager.cs
View file @2980be6
@@ -39,11 +39,9 @@ public class ImageViewerManager : MonoBehaviour
     {
         int initHeight = 180;
-        float wordWidth = 40f; // 每字宽度
-        float wordsPerLine = 1160 / wordWidth;
         int lineHeight = 75; // 每行高
-        int totalLines = Mathf.CeilToInt(content.Length / wordsPerLine);
+        int totalLines = Mathf.CeilToInt(content.Length / 30f);//每行30个字数
         int contentBgHeight = totalLines * lineHeight;
--- a/Assets/Scripts/FriendCircle/MomentItem.cs
View file @2980be6
+++ b/Assets/Scripts/FriendCircle/MomentItem.cs
View file @2980be6
@@ -163,6 +163,9 @@ public class MomentItem : MonoBehaviour
         StartCoroutine(ImageLoader.LoadImage(moment.avatarUrl, avatarImage));
+        //引导点赞动画
+        likeIconImage.transform.DOScale(0.8f, 2f).SetLoops(-1, LoopType.Yoyo).SetEase(Ease.InOutSine);
+
         Button likeIconBtn = likeIconImage.GetComponent<Button>();
         likeIconBtn.onClick.AddListener(() =>
         {
@@ -210,14 +213,16 @@ public class MomentItem : MonoBehaviour
                 showBig.GetComponent<TextMeshProUGUI>().fontStyle = FontStyles.Bold;
                 //2.修改文字位置
-                showBig.GetComponent<RectTransform>().anchoredPosition = new Vector2(463, -125);
+                showBig.GetComponent<RectTransform>().anchoredPosition = new Vector2(168, -416);
             }
             Image img = imgObj.GetComponent<Image>();
+            //缩略图和大图不一样，第一次LoadImage只为了预下载大图片
             StartCoroutine(ImageLoader.LoadImage(url, img));
+            StartCoroutine(ImageLoader.LoadImage(AddSuffixBeforeExtension(url,"-s"), img));
             Transform child = imgObj.transform.GetChild(0);
-            child.DOScale(1.3f, 2f).SetLoops(-1, LoopType.Yoyo).SetEase(Ease.InOutSine);
+            child.DOScale(1.5f, 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));
@@ -225,8 +230,9 @@ public class MomentItem : MonoBehaviour
         GridLayoutGroup gridLayout = imageGrid.GetComponent<GridLayoutGroup>();
+        var row = (int)Math.Ceiling((double)moment.imageUrls.Count / gridLayout.constraintCount);
         //一行两张图片，计算有几行
-        momentHeight+=  (int)Math.Ceiling((double)moment.imageUrls.Count / gridLayout.constraintCount) * (int)gridLayout.cellSize.y;
+        momentHeight+=  row * (int)gridLayout.cellSize.y;
@@ -279,6 +285,9 @@ public class MomentItem : MonoBehaviour
             color.a = 1f;
             mascot.color = color;
             StartCoroutine(ImageLoader.LoadImage(moment.mascot, mascot));
+            //吉祥物y轴坐标
+            mascot.GetComponent<RectTransform>().localPosition = new Vector2(200, 240-120*row);
+
         }
@@ -440,5 +449,17 @@ public class MomentItem : MonoBehaviour
         Debug.Log($"更新 GridLayout：图片数量={imageCount}，列数={constraintCount}，cellSize={cellSize}");
     }
+    
+    public string AddSuffixBeforeExtension(string url, string suffix)
+    {
+        int lastDotIndex = url.LastIndexOf('.');
+        if (lastDotIndex == -1) return url; // 没有扩展名
+
+        string prefix = url.Substring(0, lastDotIndex);
+        string extension = url.Substring(lastDotIndex); // 包含点
+
+        return $"{prefix}{suffix}{extension}";
+    }
+
 }
--- a/Assets/Scripts/FriendCircle/MomentManager.cs
View file @2980be6
+++ b/Assets/Scripts/FriendCircle/MomentManager.cs
View file @2980be6
@@ -27,14 +27,13 @@ public class MomentManager : MonoBehaviour
         //设定底部图片高度
         float bottomHeight = 400f;
-        
+        //记录第几条朋友圈，埋点用
+        int momentCount = 0;
         foreach (var moment in data.moments)
         {
-            //记录第几条朋友圈，埋点用
-            int momentCount = 1;
             GameObject item = Instantiate(momentPrefab, contentParent);
-            int momentHeight = item.GetComponent<MomentItem>().Setup(moment,data.likeList,data.likeIcon,data.logo,momentCount++);
+            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);
--- a/Assets/Scripts/FriendCircle/VideoViewerManager.cs
View file @2980be6
+++ b/Assets/Scripts/FriendCircle/VideoViewerManager.cs
View file @2980be6
@@ -80,7 +80,7 @@ public class VideoViewerManager : MonoBehaviour
         //播放
         videoPlayer.Play();
         //发送弹幕(横屏)
-        danmakuManager.AddDanmakuBatch(moment.videoDanmakuList,0.4f,1);
+        danmakuManager.AddDanmakuBatch(moment.videoDanmakuList,2f,1);
         //视频点赞人头像
         StartCoroutine(ImageLoader.LoadImage(moment.videoLikeHeadImg, likeHeadImage));
         //视频点赞人列表
--- a/Assets/StreamingAssets/appInfo.json
View file @2980be6
+++ b/Assets/StreamingAssets/appInfo.json
View file @2980be6
@@ -4,8 +4,8 @@
   "License": "0172fEGc1h+U6G6tejxODIMtLMsW8B6KmeoSqdZPjxv6eEqsWhnCuNwv39983YD5r9b1a1YhrTq+qf9RhTM5mlEhVZSqh0FH4d3U9JVHs2BrsZ/2ANPx6RcpnJ41h8PasJQeFm3EXtSY6VciQ79U3QmrX7FkmPNwhXmzc20VkMg=",
-  "AppId": "cy672066fd24504yib",
-  "AppSecret": "cfd2ea641f2335a4c1e3878901b9c87b",
+  "AppId": "cy6a987ed8387d7zrh",
+  "AppSecret": "zrh343c4e5a6a66346v8v903v5h6dda2",
   "BuryServer": "https://findart-pre.edcc.cn/gateway/main-api/api/buryPoint/createReturnCount",
--- a/Assets/resources/Jsons/friend_data.json
View file @2980be6
+++ b/Assets/resources/Jsons/friend_data.json
View file @2980be6
@@ -20,8 +20,8 @@
       "from": "来自:火星",
       "time": "2021年5月19日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/1-1.jpg",
-        "https://h5.edcc.cn/FriendCircle/image/1-2.jpg"
+        "https://h5.edcc.cn/FriendCircle/image/1-1.png",
+        "https://h5.edcc.cn/FriendCircle/image/1-2.png"
       ],
       "likeNameList": ["天和核心舱", "天问一号环绕器","好奇号","毅力号","阿联酋希望号"],
       "comments": [
@@ -54,8 +54,8 @@
       "from": "来自:火星",
       "time": "2021年6月11日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/3-1.jpg",
-        "https://h5.edcc.cn/FriendCircle/image/3-2.jpg"
+        "https://h5.edcc.cn/FriendCircle/image/3-1.png",
+        "https://h5.edcc.cn/FriendCircle/image/3-2.png"
       ],
       "likeNameList": ["天和核心舱", "嫦娥五号","北斗三号","玉兔二号"],
       "comments": [
@@ -73,7 +73,7 @@
       "from": "来自:火星",
       "time": "2021年6月11日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/4-1.jpg"
+        "https://h5.edcc.cn/FriendCircle/image/4-1.png"
       ],
       "likeNameList": ["天和核心舱", "玉兔二号","阿联酋希望号","天问一号环绕器"],
       "comments": [
@@ -84,6 +84,43 @@
       ]
     },
+
+    {
+      "username": "祝融号",
+      "avatarUrl": "https://h5.edcc.cn/FriendCircle/image/head.png",
+      "text": "给大家看下我后退至着陆平台合影点时拍摄的视频吧，这是我的WIFI分离相机拍的，怎么样，还不赖吧！",
+      "from": "来自:火星",
+      "time": "2021年6月11日",
+      "video":"https://edcc-1313175077.cos.ap-nanjing.myqcloud.com/FriendCircle/video/zrh-play-2.mp4",
+      "likeNameList": ["天和核心舱", "天问一号环绕器","玉兔二号","神舟十二号"],
+      "videoLikeHeadImg":"https://h5.edcc.cn/FriendCircle/image/head-thhxc.png",
+      "videoDanmakuList":["我们的目标是星辰大海   加油中国航天","我想加微信！!","津津有味的看完朋友圈，给个好友位呗小祝融","可可爱爱的","23333333333333333","期待我们的航天朋友圈越来越大","远征星辰大海,归来仍是少年","代入感太强了，差点以为自己去火星了"],
+      "videoFollowCount":889,
+      "comments": [
+        { "commenter": "天和核心舱", "content": "棒棒的！仰望星空，脚踏实地！" },
+        { "commenter": "神舟十二号", "content":"祝融你辛苦了！" },
+        { "commenter": "兔子", "content": "你退半步的动作…真可爱！" }
+      ]
+    },
+    {
+      "username": "祝融号",
+      "avatarUrl": "https://h5.edcc.cn/FriendCircle/image/head-video.png",
+      "text": "忍不住发了好几条朋友圈，你们有看到吗？我还能原地转弯呢。",
+      "from": "来自:火星",
+      "time": "2021年6月11日",
+      "video":"https://edcc-1313175077.cos.ap-nanjing.myqcloud.com/FriendCircle/video/zrh-play-1.mp4",
+      "likeNameList": ["天问一号环绕器", "阿联酋希望号","北斗三号","玉兔二号"],
+      "videoLikeHeadImg":"https://h5.edcc.cn/FriendCircle/image/head-twyh.png",
+      "videoDanmakuList":["太可爱了吧！祝融外形萌萌哒！","好像两个小表情包~","天哪，我刷到了什么，太厉害了小祝融","一个人在外你要好好工作，小心照顾自己鸭","看到国旗真的很骄傲","它甚至画了个圈哈哈哈哈哈哈哈"],
+      "videoFollowCount":889,
+      "comments": [
+        { "commenter": "阿联酋希望号", "content": "真羡慕你。" },
+        { "commenter": "天问一号环绕器", "content":"注意安全，有需要我的随时联系！" },
+        { "commenter": "祝融号","replier": "天问一号环绕器", "content": "没问题！" },
+        { "commenter": "来自资阳方特的游客249", "content": "祝融真可爱，我能和你手拉手转圈圈吗？" }
+      ]
+    },
+
     {
       "username": "祝融号",
       "avatarUrl": "https://h5.edcc.cn/FriendCircle/image/head.png",
@@ -92,8 +129,12 @@
       "from": "来自:火星",
       "time": "2021年7月9日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/5-1.jpg",
-        "https://h5.edcc.cn/FriendCircle/image/5-2.png"
+        "https://h5.edcc.cn/FriendCircle/image/5-1.png",
+        "https://h5.edcc.cn/FriendCircle/image/3-1.png",
+        "https://h5.edcc.cn/FriendCircle/image/6-1.png",
+        "https://h5.edcc.cn/FriendCircle/image/5-2.png",
+        "https://h5.edcc.cn/FriendCircle/image/7-1.png",
+        "https://h5.edcc.cn/FriendCircle/image/8-1.png"
       ],
       "likeNameList": ["玉兔二号", "天问一号环绕器","天和核心舱","嫦娥五号"],
       "comments": [
@@ -110,7 +151,7 @@
       "from": "来自:火星",
       "time": "2021年7月15日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/6-1.jpg"
+        "https://h5.edcc.cn/FriendCircle/image/6-1.png"
       ],
       "likeNameList": ["天和核心舱", "玉兔二号","北斗三号","神舟十二号"],
       "comments": [
@@ -147,7 +188,7 @@
       "from": "来自:火星",
       "time": "2021年7月30日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/8-1.jpg"
+        "https://h5.edcc.cn/FriendCircle/image/8-1.png"
       ],
       "likeNameList": ["玉兔二号", "天问一号环绕器"],
       "comments": [
@@ -165,7 +206,7 @@
       "from": "来自:火星",
       "time": "2021年8月6日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/9-1.jpg"
+        "https://h5.edcc.cn/FriendCircle/image/9-1.png"
       ],
       "likeNameList": ["天和核心舱", "玉兔二号","北斗三号","神舟十二号"],
       "comments": [
@@ -184,7 +225,7 @@
       "from": "来自:火星",
       "time": "2021年8月15日",
       "imageUrls": [
-        "https://h5.edcc.cn/FriendCircle/image/10-1.jpg"
+        "https://h5.edcc.cn/FriendCircle/image/10-1.png"
       ],
       "likeNameList": ["天和核心舱", "天问一号环绕器","玉兔二号","嫦娥五号","北斗三号"],
       "comments": [
@@ -196,43 +237,6 @@
         { "commenter": "来自资阳方特的游客743", "content":"热烈庆祝祝融完成任务，棒棒哒！" },
         { "commenter": "来自资阳方特的游客111", "content":"别忘了更新朋友圈哦，我们等你~" }
       ]
-    },
-
-
-    {
-      "username": "祝融号",
-      "avatarUrl": "https://h5.edcc.cn/FriendCircle/image/head.png",
-      "text": "给大家看下我后退至着陆平台合影点时拍摄的视频吧，这是我的WIFI分离相机拍的，怎么样，还不赖吧！",
-      "from": "来自:火星",
-      "time": "2021年6月11日",
-      "video":"https://edcc-1313175077.cos.ap-nanjing.myqcloud.com/FriendCircle/video/zrh-play-2.mp4",
-      "likeNameList": ["天和核心舱", "天问一号环绕器","玉兔二号","神舟十二号"],
-      "videoLikeHeadImg":"https://h5.edcc.cn/FriendCircle/image/head-thhxc.png",
-      "videoDanmakuList":["棒棒的！仰望星空，脚踏实地！","祝融你辛苦了!","你退半步的动作…真可爱！"],
-      "videoFollowCount":889,
-      "comments": [
-        { "commenter": "天和核心舱", "content": "棒棒的！仰望星空，脚踏实地！" },
-        { "commenter": "神舟十二号", "content":"祝融你辛苦了！" },
-        { "commenter": "兔子", "content": "你退半步的动作…真可爱！" }
-      ]
-    },
-    {
-      "username": "祝融号",
-      "avatarUrl": "https://h5.edcc.cn/FriendCircle/image/head-video.png",
-      "text": "忍不住发了好几条朋友圈，你们有看到吗？我还能原地转弯呢。",
-      "from": "来自:火星",
-      "time": "2021年6月11日",
-      "video":"https://edcc-1313175077.cos.ap-nanjing.myqcloud.com/FriendCircle/video/zrh-play-1.mp4",
-      "likeNameList": ["天问一号环绕器", "阿联酋希望号","北斗三号","玉兔二号"],
-      "videoLikeHeadImg":"https://h5.edcc.cn/FriendCircle/image/head-twyh.png",
-      "videoDanmakuList":["真羡慕你。","注意安全，有需要我的随时联系！","祝融真可爱，我能和你手拉手转圈圈吗？"],
-      "videoFollowCount":889,
-      "comments": [
-        { "commenter": "阿联酋希望号", "content": "真羡慕你。" },
-        { "commenter": "天问一号环绕器", "content":"注意安全，有需要我的随时联系！" },
-        { "commenter": "祝融号","replier": "天问一号环绕器", "content": "没问题！" },
-        { "commenter": "来自资阳方特的游客249", "content": "祝融真可爱，我能和你手拉手转圈圈吗？" }
-      ]
     }
   ]
 }
--- a/Assets/resources/Prefab/FriendMomentImage.prefab
View file @2980be6
+++ b/Assets/resources/Prefab/FriendMomentImage.prefab
View file @2980be6
@@ -34,7 +34,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -6.9000244, y: -6.899994}
+  m_AnchoredPosition: {x: -7, y: -7}
   m_SizeDelta: {x: 34, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3223530670795770311
@@ -110,10 +110,10 @@ RectTransform:
   - {fileID: 296920198042450723}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 592, y: -8.21254}
-  m_SizeDelta: {x: 1184, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8258245351667441550
 CanvasRenderer:
@@ -229,10 +229,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5246899428302526591}
   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: 163.53955, y: 246.91016}
-  m_SizeDelta: {x: 258.921, y: 40.1797}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -136, y: -44}
+  m_SizeDelta: {x: 258.92102, y: 40.179688}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6887169389527665301
 CanvasRenderer:
@@ -295,7 +295,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
   m_textAlignment: 65535
--- a/Assets/resources/Prefab/MomentItem.prefab
View file @2980be6
+++ b/Assets/resources/Prefab/MomentItem.prefab
View file @2980be6
@@ -2284,9 +2284,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5112969456787946611}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1000, y: -632}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 200, y: 120}
   m_SizeDelta: {x: 625, y: 550}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3865688454199028610
@@ -2451,8 +2451,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 5
-    m_Right: 5
+    m_Left: 6
+    m_Right: 6
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
@@ -2701,10 +2701,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1041260462946003438}
     m_Modifications:
-    - target: {fileID: 5139666657358920150, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3}
-      propertyPath: m_fontStyle
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5