Showing
11 changed files
with
628 additions
and
400 deletions
Assets/LocalImage/point.png
0 → 100644

3.77 KB
Assets/LocalImage/showBigImage.png
deleted
100644 → 0

11.4 KB
Assets/LocalImage/showBigVideo.png
deleted
100644 → 0

17.9 KB
1 | -fileFormatVersion: 2 | ||
2 | -guid: 98b4d527ddb6341b0bb2a3589543570f | ||
3 | -TextureImporter: | ||
4 | - internalIDToNameTable: [] | ||
5 | - externalObjects: {} | ||
6 | - serializedVersion: 13 | ||
7 | - mipmaps: | ||
8 | - mipMapMode: 0 | ||
9 | - enableMipMap: 0 | ||
10 | - sRGBTexture: 1 | ||
11 | - linearTexture: 0 | ||
12 | - fadeOut: 0 | ||
13 | - borderMipMap: 0 | ||
14 | - mipMapsPreserveCoverage: 0 | ||
15 | - alphaTestReferenceValue: 0.5 | ||
16 | - mipMapFadeDistanceStart: 1 | ||
17 | - mipMapFadeDistanceEnd: 3 | ||
18 | - bumpmap: | ||
19 | - convertToNormalMap: 0 | ||
20 | - externalNormalMap: 0 | ||
21 | - heightScale: 0.25 | ||
22 | - normalMapFilter: 0 | ||
23 | - flipGreenChannel: 0 | ||
24 | - isReadable: 0 | ||
25 | - streamingMipmaps: 0 | ||
26 | - streamingMipmapsPriority: 0 | ||
27 | - vTOnly: 0 | ||
28 | - ignoreMipmapLimit: 0 | ||
29 | - grayScaleToAlpha: 0 | ||
30 | - generateCubemap: 6 | ||
31 | - cubemapConvolution: 0 | ||
32 | - seamlessCubemap: 0 | ||
33 | - textureFormat: 1 | ||
34 | - maxTextureSize: 2048 | ||
35 | - textureSettings: | ||
36 | - serializedVersion: 2 | ||
37 | - filterMode: 1 | ||
38 | - aniso: 1 | ||
39 | - mipBias: 0 | ||
40 | - wrapU: 1 | ||
41 | - wrapV: 1 | ||
42 | - wrapW: 0 | ||
43 | - nPOTScale: 0 | ||
44 | - lightmap: 0 | ||
45 | - compressionQuality: 50 | ||
46 | - spriteMode: 1 | ||
47 | - spriteExtrude: 1 | ||
48 | - spriteMeshType: 1 | ||
49 | - alignment: 0 | ||
50 | - spritePivot: {x: 0.5, y: 0.5} | ||
51 | - spritePixelsToUnits: 100 | ||
52 | - spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
53 | - spriteGenerateFallbackPhysicsShape: 1 | ||
54 | - alphaUsage: 1 | ||
55 | - alphaIsTransparency: 1 | ||
56 | - spriteTessellationDetail: -1 | ||
57 | - textureType: 8 | ||
58 | - textureShape: 1 | ||
59 | - singleChannelComponent: 0 | ||
60 | - flipbookRows: 1 | ||
61 | - flipbookColumns: 1 | ||
62 | - maxTextureSizeSet: 0 | ||
63 | - compressionQualitySet: 0 | ||
64 | - textureFormatSet: 0 | ||
65 | - ignorePngGamma: 0 | ||
66 | - applyGammaDecoding: 0 | ||
67 | - swizzle: 50462976 | ||
68 | - cookieLightType: 0 | ||
69 | - platformSettings: | ||
70 | - - serializedVersion: 3 | ||
71 | - buildTarget: DefaultTexturePlatform | ||
72 | - maxTextureSize: 2048 | ||
73 | - resizeAlgorithm: 0 | ||
74 | - textureFormat: -1 | ||
75 | - textureCompression: 1 | ||
76 | - compressionQuality: 50 | ||
77 | - crunchedCompression: 0 | ||
78 | - allowsAlphaSplitting: 0 | ||
79 | - overridden: 0 | ||
80 | - ignorePlatformSupport: 0 | ||
81 | - androidETC2FallbackOverride: 0 | ||
82 | - forceMaximumCompressionQuality_BC6H_BC7: 0 | ||
83 | - - serializedVersion: 3 | ||
84 | - buildTarget: Standalone | ||
85 | - maxTextureSize: 2048 | ||
86 | - resizeAlgorithm: 0 | ||
87 | - textureFormat: -1 | ||
88 | - textureCompression: 1 | ||
89 | - compressionQuality: 50 | ||
90 | - crunchedCompression: 0 | ||
91 | - allowsAlphaSplitting: 0 | ||
92 | - overridden: 0 | ||
93 | - ignorePlatformSupport: 0 | ||
94 | - androidETC2FallbackOverride: 0 | ||
95 | - forceMaximumCompressionQuality_BC6H_BC7: 0 | ||
96 | - - serializedVersion: 3 | ||
97 | - buildTarget: Android | ||
98 | - maxTextureSize: 2048 | ||
99 | - resizeAlgorithm: 0 | ||
100 | - textureFormat: -1 | ||
101 | - textureCompression: 1 | ||
102 | - compressionQuality: 50 | ||
103 | - crunchedCompression: 0 | ||
104 | - allowsAlphaSplitting: 0 | ||
105 | - overridden: 0 | ||
106 | - ignorePlatformSupport: 0 | ||
107 | - androidETC2FallbackOverride: 0 | ||
108 | - forceMaximumCompressionQuality_BC6H_BC7: 0 | ||
109 | - spriteSheet: | ||
110 | - serializedVersion: 2 | ||
111 | - sprites: [] | ||
112 | - outline: [] | ||
113 | - physicsShape: [] | ||
114 | - bones: [] | ||
115 | - spriteID: 5e97eb03825dee720800000000000000 | ||
116 | - internalID: 0 | ||
117 | - vertices: [] | ||
118 | - indices: | ||
119 | - edges: [] | ||
120 | - weights: [] | ||
121 | - secondaryTextures: [] | ||
122 | - nameFileIdTable: {} | ||
123 | - mipmapLimitGroupName: | ||
124 | - pSDRemoveMatte: 0 | ||
125 | - userData: | ||
126 | - assetBundleName: | ||
127 | - assetBundleVariant: |
@@ -2848,10 +2848,10 @@ RectTransform: | @@ -2848,10 +2848,10 @@ RectTransform: | ||
2848 | m_Children: [] | 2848 | m_Children: [] |
2849 | m_Father: {fileID: 515045580} | 2849 | m_Father: {fileID: 515045580} |
2850 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 2850 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2851 | - m_AnchorMin: {x: 0.5, y: 0.5} | ||
2852 | - m_AnchorMax: {x: 0.5, y: 0.5} | ||
2853 | - m_AnchoredPosition: {x: 12.195, y: 66.158} | ||
2854 | - m_SizeDelta: {x: 593.8992, y: 132.32} | 2851 | + m_AnchorMin: {x: 0, y: 0} |
2852 | + m_AnchorMax: {x: 1, y: 0} | ||
2853 | + m_AnchoredPosition: {x: 0, y: 166} | ||
2854 | + m_SizeDelta: {x: 0, y: 132.32} | ||
2855 | m_Pivot: {x: 0.5, y: 0.5} | 2855 | m_Pivot: {x: 0.5, y: 0.5} |
2856 | --- !u!114 &1710409226 | 2856 | --- !u!114 &1710409226 |
2857 | MonoBehaviour: | 2857 | MonoBehaviour: |
@@ -2873,7 +2873,7 @@ MonoBehaviour: | @@ -2873,7 +2873,7 @@ MonoBehaviour: | ||
2873 | m_OnCullStateChanged: | 2873 | m_OnCullStateChanged: |
2874 | m_PersistentCalls: | 2874 | m_PersistentCalls: |
2875 | m_Calls: [] | 2875 | m_Calls: [] |
2876 | - m_text: "\t\t\u5DF2\u7ECF\u5230\u5E95\u5566\n\u8BF7\u5411\u4E0A\u6ED1\u52A8\u67E5\u770B\u795D\u878D\u53F7\u7684\u670B\u53CB\u5708\u5427" | 2876 | + m_text: "\u5DF2\u7ECF\u5230\u5E95\u5566\uFF0C\u8BF7\u5411\u4E0A\u6ED1\u52A8\u67E5\u770B\u795D\u878D\u53F7\u7684\u670B\u53CB\u5708\u5427" |
2877 | m_isRightToLeft: 0 | 2877 | m_isRightToLeft: 0 |
2878 | m_fontAsset: {fileID: 11400000, guid: e4002ced6a3580448963db96223ad8bf, type: 2} | 2878 | m_fontAsset: {fileID: 11400000, guid: e4002ced6a3580448963db96223ad8bf, type: 2} |
2879 | m_sharedMaterial: {fileID: -6404392141848387476, guid: e4002ced6a3580448963db96223ad8bf, type: 2} | 2879 | m_sharedMaterial: {fileID: -6404392141848387476, guid: e4002ced6a3580448963db96223ad8bf, type: 2} |
@@ -2907,7 +2907,7 @@ MonoBehaviour: | @@ -2907,7 +2907,7 @@ MonoBehaviour: | ||
2907 | m_fontSizeMin: 18 | 2907 | m_fontSizeMin: 18 |
2908 | m_fontSizeMax: 72 | 2908 | m_fontSizeMax: 72 |
2909 | m_fontStyle: 0 | 2909 | m_fontStyle: 0 |
2910 | - m_HorizontalAlignment: 1 | 2910 | + m_HorizontalAlignment: 2 |
2911 | m_VerticalAlignment: 256 | 2911 | m_VerticalAlignment: 256 |
2912 | m_textAlignment: 65535 | 2912 | m_textAlignment: 65535 |
2913 | m_characterSpacing: 0 | 2913 | m_characterSpacing: 0 |
@@ -133,7 +133,8 @@ public class MomentItem : MonoBehaviour | @@ -133,7 +133,8 @@ public class MomentItem : MonoBehaviour | ||
133 | //每行字50 | 133 | //每行字50 |
134 | int line = 50; | 134 | int line = 50; |
135 | //图片、视频400 | 135 | //图片、视频400 |
136 | - int media = 580; | 136 | + int mediaImage = 580; |
137 | + int mediaVideo = 580; | ||
137 | int momentHeight = 0; | 138 | int momentHeight = 0; |
138 | usernameText.text = moment.username; | 139 | usernameText.text = moment.username; |
139 | momentHeight+= line; | 140 | momentHeight+= line; |
@@ -181,22 +182,29 @@ public class MomentItem : MonoBehaviour | @@ -181,22 +182,29 @@ public class MomentItem : MonoBehaviour | ||
181 | // 清空之前的图片 | 182 | // 清空之前的图片 |
182 | foreach (Transform child in imageGrid) | 183 | foreach (Transform child in imageGrid) |
183 | Destroy(child.gameObject); | 184 | Destroy(child.gameObject); |
185 | + | ||
186 | + UpdateGridLayout(moment.imageUrls.Count); | ||
187 | + | ||
184 | foreach (string url in moment.imageUrls) | 188 | foreach (string url in moment.imageUrls) |
185 | { | 189 | { |
186 | imageGrid.gameObject.SetActive(true); | 190 | imageGrid.gameObject.SetActive(true); |
187 | videoGrid.gameObject.SetActive(false); | 191 | videoGrid.gameObject.SetActive(false); |
192 | + | ||
188 | 193 | ||
189 | GameObject imgObj = Instantiate(imagePrefab, imageGrid); | 194 | GameObject imgObj = Instantiate(imagePrefab, imageGrid); |
190 | Image img = imgObj.GetComponent<Image>(); | 195 | Image img = imgObj.GetComponent<Image>(); |
191 | StartCoroutine(ImageLoader.LoadImage(url, img)); | 196 | StartCoroutine(ImageLoader.LoadImage(url, img)); |
192 | Transform child = imgObj.transform.GetChild(0); | 197 | Transform child = imgObj.transform.GetChild(0); |
193 | - child.DOScale(1.1f, 2f).SetLoops(-1, LoopType.Yoyo).SetEase(Ease.InOutSine); | 198 | + child.DOScale(1.3f, 2f).SetLoops(-1, LoopType.Yoyo).SetEase(Ease.InOutSine); |
194 | 199 | ||
195 | Button btn = imgObj.GetComponent<Button>(); | 200 | Button btn = imgObj.GetComponent<Button>(); |
196 | btn.onClick.AddListener(() => ImageViewerManager.Instance.ShowImage(url,moment.text,logo,moment.time)); | 201 | btn.onClick.AddListener(() => ImageViewerManager.Instance.ShowImage(url,moment.text,logo,moment.time)); |
197 | } | 202 | } |
203 | + | ||
204 | + GridLayoutGroup gridLayout = imageGrid.GetComponent<GridLayoutGroup>(); | ||
205 | + | ||
198 | //一行两张图片,计算有几行 | 206 | //一行两张图片,计算有几行 |
199 | - momentHeight+= (int)Math.Ceiling((double)moment.imageUrls.Count / 2) * media; | 207 | + momentHeight+= (int)Math.Ceiling((double)moment.imageUrls.Count / gridLayout.constraintCount) * (int)gridLayout.cellSize.y; |
200 | 208 | ||
201 | 209 | ||
202 | 210 | ||
@@ -211,6 +219,10 @@ public class MomentItem : MonoBehaviour | @@ -211,6 +219,10 @@ public class MomentItem : MonoBehaviour | ||
211 | // 1. 实例化 | 219 | // 1. 实例化 |
212 | GameObject obj = Instantiate(videoPrefab, videoGrid); | 220 | GameObject obj = Instantiate(videoPrefab, videoGrid); |
213 | 221 | ||
222 | + Transform child = obj.transform.GetChild(2); | ||
223 | + child.DOScale(1.3f, 2f).SetLoops(-1, LoopType.Yoyo).SetEase(Ease.InOutSine); | ||
224 | + | ||
225 | + | ||
214 | // 2. 获取组件 | 226 | // 2. 获取组件 |
215 | RawImage rawImage = obj.GetComponentInChildren<RawImage>(); | 227 | RawImage rawImage = obj.GetComponentInChildren<RawImage>(); |
216 | VideoPlayer videoPlayer = obj.GetComponentInChildren<VideoPlayer>(); | 228 | VideoPlayer videoPlayer = obj.GetComponentInChildren<VideoPlayer>(); |
@@ -226,14 +238,15 @@ public class MomentItem : MonoBehaviour | @@ -226,14 +238,15 @@ public class MomentItem : MonoBehaviour | ||
226 | // 5. 设置视频源 | 238 | // 5. 设置视频源 |
227 | videoPlayer.source = VideoSource.Url; | 239 | videoPlayer.source = VideoSource.Url; |
228 | videoPlayer.url = moment.video; | 240 | videoPlayer.url = moment.video; |
229 | - | ||
230 | - // 6. 播放 | 241 | + |
242 | + // 播放一下 | ||
231 | videoPlayer.Play(); | 243 | videoPlayer.Play(); |
244 | + videoPlayer.Pause(); | ||
232 | 245 | ||
233 | Button btn = obj.GetComponent<Button>(); | 246 | Button btn = obj.GetComponent<Button>(); |
234 | btn.onClick.AddListener(() => VideoViewerManager.Instance.ShowVideo(moment)); | 247 | btn.onClick.AddListener(() => VideoViewerManager.Instance.ShowVideo(moment)); |
235 | 248 | ||
236 | - momentHeight+= media; | 249 | + momentHeight+= mediaVideo; |
237 | } | 250 | } |
238 | 251 | ||
239 | 252 | ||
@@ -341,5 +354,59 @@ public class MomentItem : MonoBehaviour | @@ -341,5 +354,59 @@ public class MomentItem : MonoBehaviour | ||
341 | } | 354 | } |
342 | 355 | ||
343 | 356 | ||
357 | + public void UpdateGridLayout(int imageCount) | ||
358 | + { | ||
359 | + float size2Column = 580f; | ||
360 | + float size3Column = 386f; | ||
361 | + | ||
362 | + GridLayoutGroup gridLayout = imageGrid.GetComponent<GridLayoutGroup>(); | ||
363 | + | ||
364 | + if (gridLayout == null) | ||
365 | + { | ||
366 | + Debug.LogWarning("imageGrid 没有 GridLayoutGroup 组件"); | ||
367 | + return; | ||
368 | + } | ||
369 | + | ||
370 | + float cellSize = 0f; | ||
371 | + int constraintCount = 3; | ||
372 | + | ||
373 | + if (imageCount <= 0) | ||
374 | + { | ||
375 | + gridLayout.constraintCount = 3; | ||
376 | + return; | ||
377 | + } | ||
378 | + | ||
379 | + if (imageCount == 1) | ||
380 | + { | ||
381 | + // 单张图的排版一般单独做,不走 Grid | ||
382 | + // 你可以特殊处理单张图,返回直接退出 | ||
383 | + Debug.Log("单张图,通常单独排版"); | ||
384 | + return; | ||
385 | + } | ||
386 | + else if (imageCount == 2) | ||
387 | + { | ||
388 | + constraintCount = 2; | ||
389 | + cellSize = size2Column; | ||
390 | + } | ||
391 | + else if (imageCount == 4) | ||
392 | + { | ||
393 | + constraintCount = 2; | ||
394 | + cellSize = size2Column; | ||
395 | + } | ||
396 | + else | ||
397 | + { | ||
398 | + constraintCount = 3; | ||
399 | + cellSize = size3Column; | ||
400 | + } | ||
401 | + | ||
402 | + // 应用设置 | ||
403 | + gridLayout.constraint = GridLayoutGroup.Constraint.FixedColumnCount; | ||
404 | + gridLayout.constraintCount = constraintCount; | ||
405 | + gridLayout.cellSize = new Vector2(cellSize, cellSize); | ||
406 | + | ||
407 | + | ||
408 | + Debug.Log($"更新 GridLayout:图片数量={imageCount},列数={constraintCount},cellSize={cellSize}"); | ||
409 | + } | ||
410 | + | ||
344 | 411 | ||
345 | } | 412 | } |
@@ -20,6 +20,8 @@ | @@ -20,6 +20,8 @@ | ||
20 | "time": "2021年5月19日", | 20 | "time": "2021年5月19日", |
21 | "imageUrls": [ | 21 | "imageUrls": [ |
22 | "https://h5.edcc.cn/FriendCircle/image/first-1.jpeg", | 22 | "https://h5.edcc.cn/FriendCircle/image/first-1.jpeg", |
23 | + "https://h5.edcc.cn/FriendCircle/image/first-2.jpeg", | ||
24 | + "https://h5.edcc.cn/FriendCircle/image/first-2.jpeg", | ||
23 | "https://h5.edcc.cn/FriendCircle/image/first-2.jpeg" | 25 | "https://h5.edcc.cn/FriendCircle/image/first-2.jpeg" |
24 | ], | 26 | ], |
25 | "likeNameList": ["天和核心舱", "天问一号环绕器","好奇号","毅力号","阿联酋希望号"], | 27 | "likeNameList": ["天和核心舱", "天问一号环绕器","好奇号","毅力号","阿联酋希望号"], |
1 | %YAML 1.1 | 1 | %YAML 1.1 |
2 | %TAG !u! tag:unity3d.com,2011: | 2 | %TAG !u! tag:unity3d.com,2011: |
3 | ---- !u!1 &1990591235901545225 | 3 | +--- !u!1 &1657506116398930617 |
4 | GameObject: | 4 | GameObject: |
5 | m_ObjectHideFlags: 0 | 5 | m_ObjectHideFlags: 0 |
6 | m_CorrespondingSourceObject: {fileID: 0} | 6 | m_CorrespondingSourceObject: {fileID: 0} |
@@ -8,50 +8,50 @@ GameObject: | @@ -8,50 +8,50 @@ GameObject: | ||
8 | m_PrefabAsset: {fileID: 0} | 8 | m_PrefabAsset: {fileID: 0} |
9 | serializedVersion: 6 | 9 | serializedVersion: 6 |
10 | m_Component: | 10 | m_Component: |
11 | - - component: {fileID: 4225589777431777488} | ||
12 | - - component: {fileID: 142993819740274611} | ||
13 | - - component: {fileID: 2801346079870729791} | 11 | + - component: {fileID: 2838704319631347367} |
12 | + - component: {fileID: 3223530670795770311} | ||
13 | + - component: {fileID: 4259728383888314172} | ||
14 | m_Layer: 0 | 14 | m_Layer: 0 |
15 | - m_Name: showBigImage | 15 | + m_Name: ShowBigImage |
16 | m_TagString: Untagged | 16 | m_TagString: Untagged |
17 | m_Icon: {fileID: 0} | 17 | m_Icon: {fileID: 0} |
18 | m_NavMeshLayer: 0 | 18 | m_NavMeshLayer: 0 |
19 | m_StaticEditorFlags: 0 | 19 | m_StaticEditorFlags: 0 |
20 | m_IsActive: 1 | 20 | m_IsActive: 1 |
21 | ---- !u!224 &4225589777431777488 | 21 | +--- !u!224 &2838704319631347367 |
22 | RectTransform: | 22 | RectTransform: |
23 | m_ObjectHideFlags: 0 | 23 | m_ObjectHideFlags: 0 |
24 | m_CorrespondingSourceObject: {fileID: 0} | 24 | m_CorrespondingSourceObject: {fileID: 0} |
25 | m_PrefabInstance: {fileID: 0} | 25 | m_PrefabInstance: {fileID: 0} |
26 | m_PrefabAsset: {fileID: 0} | 26 | m_PrefabAsset: {fileID: 0} |
27 | - m_GameObject: {fileID: 1990591235901545225} | 27 | + m_GameObject: {fileID: 1657506116398930617} |
28 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 28 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
29 | m_LocalPosition: {x: 0, y: 0, z: 0} | 29 | m_LocalPosition: {x: 0, y: 0, z: 0} |
30 | - m_LocalScale: {x: 1, y: 1, z: 0.4} | 30 | + m_LocalScale: {x: 1.0076908, y: 1.0076908, z: 0.45383543} |
31 | m_ConstrainProportionsScale: 0 | 31 | m_ConstrainProportionsScale: 0 |
32 | m_Children: [] | 32 | m_Children: [] |
33 | - m_Father: {fileID: 2327885096247245973} | 33 | + m_Father: {fileID: 5246899428302526591} |
34 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 34 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
35 | m_AnchorMin: {x: 1, y: 1} | 35 | m_AnchorMin: {x: 1, y: 1} |
36 | m_AnchorMax: {x: 1, y: 1} | 36 | m_AnchorMax: {x: 1, y: 1} |
37 | - m_AnchoredPosition: {x: -106, y: -41} | ||
38 | - m_SizeDelta: {x: 227, y: 96} | 37 | + m_AnchoredPosition: {x: -6.9000244, y: -6.899994} |
38 | + m_SizeDelta: {x: 34, y: 34} | ||
39 | m_Pivot: {x: 0.5, y: 0.5} | 39 | m_Pivot: {x: 0.5, y: 0.5} |
40 | ---- !u!222 &142993819740274611 | 40 | +--- !u!222 &3223530670795770311 |
41 | CanvasRenderer: | 41 | CanvasRenderer: |
42 | m_ObjectHideFlags: 0 | 42 | m_ObjectHideFlags: 0 |
43 | m_CorrespondingSourceObject: {fileID: 0} | 43 | m_CorrespondingSourceObject: {fileID: 0} |
44 | m_PrefabInstance: {fileID: 0} | 44 | m_PrefabInstance: {fileID: 0} |
45 | m_PrefabAsset: {fileID: 0} | 45 | m_PrefabAsset: {fileID: 0} |
46 | - m_GameObject: {fileID: 1990591235901545225} | 46 | + m_GameObject: {fileID: 1657506116398930617} |
47 | m_CullTransparentMesh: 1 | 47 | m_CullTransparentMesh: 1 |
48 | ---- !u!114 &2801346079870729791 | 48 | +--- !u!114 &4259728383888314172 |
49 | MonoBehaviour: | 49 | MonoBehaviour: |
50 | m_ObjectHideFlags: 0 | 50 | m_ObjectHideFlags: 0 |
51 | m_CorrespondingSourceObject: {fileID: 0} | 51 | m_CorrespondingSourceObject: {fileID: 0} |
52 | m_PrefabInstance: {fileID: 0} | 52 | m_PrefabInstance: {fileID: 0} |
53 | m_PrefabAsset: {fileID: 0} | 53 | m_PrefabAsset: {fileID: 0} |
54 | - m_GameObject: {fileID: 1990591235901545225} | 54 | + m_GameObject: {fileID: 1657506116398930617} |
55 | m_Enabled: 1 | 55 | m_Enabled: 1 |
56 | m_EditorHideFlags: 0 | 56 | m_EditorHideFlags: 0 |
57 | m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | 57 | m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
@@ -65,7 +65,7 @@ MonoBehaviour: | @@ -65,7 +65,7 @@ MonoBehaviour: | ||
65 | m_OnCullStateChanged: | 65 | m_OnCullStateChanged: |
66 | m_PersistentCalls: | 66 | m_PersistentCalls: |
67 | m_Calls: [] | 67 | m_Calls: [] |
68 | - m_Sprite: {fileID: 21300000, guid: c0f558e4e10c24ffcbbf83ba315663a1, type: 3} | 68 | + m_Sprite: {fileID: 21300000, guid: 083e2089cef484132a948782da596865, type: 3} |
69 | m_Type: 0 | 69 | m_Type: 0 |
70 | m_PreserveAspect: 0 | 70 | m_PreserveAspect: 0 |
71 | m_FillCenter: 1 | 71 | m_FillCenter: 1 |
@@ -75,7 +75,7 @@ MonoBehaviour: | @@ -75,7 +75,7 @@ MonoBehaviour: | ||
75 | m_FillOrigin: 0 | 75 | m_FillOrigin: 0 |
76 | m_UseSpriteMesh: 0 | 76 | m_UseSpriteMesh: 0 |
77 | m_PixelsPerUnitMultiplier: 1 | 77 | m_PixelsPerUnitMultiplier: 1 |
78 | ---- !u!1 &6577593741759033465 | 78 | +--- !u!1 &6223382467879224884 |
79 | GameObject: | 79 | GameObject: |
80 | m_ObjectHideFlags: 0 | 80 | m_ObjectHideFlags: 0 |
81 | m_CorrespondingSourceObject: {fileID: 0} | 81 | m_CorrespondingSourceObject: {fileID: 0} |
@@ -83,10 +83,10 @@ GameObject: | @@ -83,10 +83,10 @@ GameObject: | ||
83 | m_PrefabAsset: {fileID: 0} | 83 | m_PrefabAsset: {fileID: 0} |
84 | serializedVersion: 6 | 84 | serializedVersion: 6 |
85 | m_Component: | 85 | m_Component: |
86 | - - component: {fileID: 2327885096247245973} | ||
87 | - - component: {fileID: 2481288265206313319} | ||
88 | - - component: {fileID: 5017672493889088229} | ||
89 | - - component: {fileID: 8804389278022467674} | 86 | + - component: {fileID: 5246899428302526591} |
87 | + - component: {fileID: 8258245351667441550} | ||
88 | + - component: {fileID: 4329172009826515703} | ||
89 | + - component: {fileID: 9078872738412243858} | ||
90 | m_Layer: 0 | 90 | m_Layer: 0 |
91 | m_Name: FriendMomentImage | 91 | m_Name: FriendMomentImage |
92 | m_TagString: Untagged | 92 | m_TagString: Untagged |
@@ -94,41 +94,42 @@ GameObject: | @@ -94,41 +94,42 @@ GameObject: | ||
94 | m_NavMeshLayer: 0 | 94 | m_NavMeshLayer: 0 |
95 | m_StaticEditorFlags: 0 | 95 | m_StaticEditorFlags: 0 |
96 | m_IsActive: 1 | 96 | m_IsActive: 1 |
97 | ---- !u!224 &2327885096247245973 | 97 | +--- !u!224 &5246899428302526591 |
98 | RectTransform: | 98 | RectTransform: |
99 | m_ObjectHideFlags: 0 | 99 | m_ObjectHideFlags: 0 |
100 | m_CorrespondingSourceObject: {fileID: 0} | 100 | m_CorrespondingSourceObject: {fileID: 0} |
101 | m_PrefabInstance: {fileID: 0} | 101 | m_PrefabInstance: {fileID: 0} |
102 | m_PrefabAsset: {fileID: 0} | 102 | m_PrefabAsset: {fileID: 0} |
103 | - m_GameObject: {fileID: 6577593741759033465} | ||
104 | - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 103 | + m_GameObject: {fileID: 6223382467879224884} |
104 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
105 | m_LocalPosition: {x: 0, y: 0, z: 0} | 105 | m_LocalPosition: {x: 0, y: 0, z: 0} |
106 | m_LocalScale: {x: 1, y: 1, z: 1} | 106 | m_LocalScale: {x: 1, y: 1, z: 1} |
107 | m_ConstrainProportionsScale: 0 | 107 | m_ConstrainProportionsScale: 0 |
108 | m_Children: | 108 | m_Children: |
109 | - - {fileID: 4225589777431777488} | 109 | + - {fileID: 2838704319631347367} |
110 | + - {fileID: 296920198042450723} | ||
110 | m_Father: {fileID: 0} | 111 | m_Father: {fileID: 0} |
111 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 112 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
112 | - m_AnchorMin: {x: 0, y: 0} | ||
113 | - m_AnchorMax: {x: 0, y: 0} | ||
114 | - m_AnchoredPosition: {x: 0, y: 0} | ||
115 | - m_SizeDelta: {x: 0, y: 0} | 113 | + m_AnchorMin: {x: 0, y: 1} |
114 | + m_AnchorMax: {x: 0, y: 1} | ||
115 | + m_AnchoredPosition: {x: 592, y: -8.21254} | ||
116 | + m_SizeDelta: {x: 1184, y: 0} | ||
116 | m_Pivot: {x: 0.5, y: 0.5} | 117 | m_Pivot: {x: 0.5, y: 0.5} |
117 | ---- !u!222 &2481288265206313319 | 118 | +--- !u!222 &8258245351667441550 |
118 | CanvasRenderer: | 119 | CanvasRenderer: |
119 | m_ObjectHideFlags: 0 | 120 | m_ObjectHideFlags: 0 |
120 | m_CorrespondingSourceObject: {fileID: 0} | 121 | m_CorrespondingSourceObject: {fileID: 0} |
121 | m_PrefabInstance: {fileID: 0} | 122 | m_PrefabInstance: {fileID: 0} |
122 | m_PrefabAsset: {fileID: 0} | 123 | m_PrefabAsset: {fileID: 0} |
123 | - m_GameObject: {fileID: 6577593741759033465} | 124 | + m_GameObject: {fileID: 6223382467879224884} |
124 | m_CullTransparentMesh: 1 | 125 | m_CullTransparentMesh: 1 |
125 | ---- !u!114 &5017672493889088229 | 126 | +--- !u!114 &4329172009826515703 |
126 | MonoBehaviour: | 127 | MonoBehaviour: |
127 | m_ObjectHideFlags: 0 | 128 | m_ObjectHideFlags: 0 |
128 | m_CorrespondingSourceObject: {fileID: 0} | 129 | m_CorrespondingSourceObject: {fileID: 0} |
129 | m_PrefabInstance: {fileID: 0} | 130 | m_PrefabInstance: {fileID: 0} |
130 | m_PrefabAsset: {fileID: 0} | 131 | m_PrefabAsset: {fileID: 0} |
131 | - m_GameObject: {fileID: 6577593741759033465} | 132 | + m_GameObject: {fileID: 6223382467879224884} |
132 | m_Enabled: 1 | 133 | m_Enabled: 1 |
133 | m_EditorHideFlags: 0 | 134 | m_EditorHideFlags: 0 |
134 | m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | 135 | m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
@@ -152,13 +153,13 @@ MonoBehaviour: | @@ -152,13 +153,13 @@ MonoBehaviour: | ||
152 | m_FillOrigin: 0 | 153 | m_FillOrigin: 0 |
153 | m_UseSpriteMesh: 0 | 154 | m_UseSpriteMesh: 0 |
154 | m_PixelsPerUnitMultiplier: 1 | 155 | m_PixelsPerUnitMultiplier: 1 |
155 | ---- !u!114 &8804389278022467674 | 156 | +--- !u!114 &9078872738412243858 |
156 | MonoBehaviour: | 157 | MonoBehaviour: |
157 | m_ObjectHideFlags: 0 | 158 | m_ObjectHideFlags: 0 |
158 | m_CorrespondingSourceObject: {fileID: 0} | 159 | m_CorrespondingSourceObject: {fileID: 0} |
159 | m_PrefabInstance: {fileID: 0} | 160 | m_PrefabInstance: {fileID: 0} |
160 | m_PrefabAsset: {fileID: 0} | 161 | m_PrefabAsset: {fileID: 0} |
161 | - m_GameObject: {fileID: 6577593741759033465} | 162 | + m_GameObject: {fileID: 6223382467879224884} |
162 | m_Enabled: 1 | 163 | m_Enabled: 1 |
163 | m_EditorHideFlags: 0 | 164 | m_EditorHideFlags: 0 |
164 | m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} | 165 | m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} |
@@ -192,7 +193,141 @@ MonoBehaviour: | @@ -192,7 +193,141 @@ MonoBehaviour: | ||
192 | m_SelectedTrigger: Selected | 193 | m_SelectedTrigger: Selected |
193 | m_DisabledTrigger: Disabled | 194 | m_DisabledTrigger: Disabled |
194 | m_Interactable: 1 | 195 | m_Interactable: 1 |
195 | - m_TargetGraphic: {fileID: 5017672493889088229} | 196 | + m_TargetGraphic: {fileID: 4329172009826515703} |
196 | m_OnClick: | 197 | m_OnClick: |
197 | m_PersistentCalls: | 198 | m_PersistentCalls: |
198 | m_Calls: [] | 199 | m_Calls: [] |
200 | +--- !u!1 &8684446270975057682 | ||
201 | +GameObject: | ||
202 | + m_ObjectHideFlags: 0 | ||
203 | + m_CorrespondingSourceObject: {fileID: 0} | ||
204 | + m_PrefabInstance: {fileID: 0} | ||
205 | + m_PrefabAsset: {fileID: 0} | ||
206 | + serializedVersion: 6 | ||
207 | + m_Component: | ||
208 | + - component: {fileID: 296920198042450723} | ||
209 | + - component: {fileID: 6887169389527665301} | ||
210 | + - component: {fileID: 5139666657358920150} | ||
211 | + m_Layer: 0 | ||
212 | + m_Name: ShowBigImageContent | ||
213 | + m_TagString: Untagged | ||
214 | + m_Icon: {fileID: 0} | ||
215 | + m_NavMeshLayer: 0 | ||
216 | + m_StaticEditorFlags: 0 | ||
217 | + m_IsActive: 1 | ||
218 | +--- !u!224 &296920198042450723 | ||
219 | +RectTransform: | ||
220 | + m_ObjectHideFlags: 0 | ||
221 | + m_CorrespondingSourceObject: {fileID: 0} | ||
222 | + m_PrefabInstance: {fileID: 0} | ||
223 | + m_PrefabAsset: {fileID: 0} | ||
224 | + m_GameObject: {fileID: 8684446270975057682} | ||
225 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
226 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
227 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
228 | + m_ConstrainProportionsScale: 0 | ||
229 | + m_Children: [] | ||
230 | + m_Father: {fileID: 5246899428302526591} | ||
231 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
232 | + m_AnchorMin: {x: 0.5, y: 0.5} | ||
233 | + m_AnchorMax: {x: 0.5, y: 0.5} | ||
234 | + m_AnchoredPosition: {x: 163.53955, y: 246.91016} | ||
235 | + m_SizeDelta: {x: 258.921, y: 40.1797} | ||
236 | + m_Pivot: {x: 0.5, y: 0.5} | ||
237 | +--- !u!222 &6887169389527665301 | ||
238 | +CanvasRenderer: | ||
239 | + m_ObjectHideFlags: 0 | ||
240 | + m_CorrespondingSourceObject: {fileID: 0} | ||
241 | + m_PrefabInstance: {fileID: 0} | ||
242 | + m_PrefabAsset: {fileID: 0} | ||
243 | + m_GameObject: {fileID: 8684446270975057682} | ||
244 | + m_CullTransparentMesh: 1 | ||
245 | +--- !u!114 &5139666657358920150 | ||
246 | +MonoBehaviour: | ||
247 | + m_ObjectHideFlags: 0 | ||
248 | + m_CorrespondingSourceObject: {fileID: 0} | ||
249 | + m_PrefabInstance: {fileID: 0} | ||
250 | + m_PrefabAsset: {fileID: 0} | ||
251 | + m_GameObject: {fileID: 8684446270975057682} | ||
252 | + m_Enabled: 1 | ||
253 | + m_EditorHideFlags: 0 | ||
254 | + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} | ||
255 | + m_Name: | ||
256 | + m_EditorClassIdentifier: | ||
257 | + m_Material: {fileID: 0} | ||
258 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
259 | + m_RaycastTarget: 1 | ||
260 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
261 | + m_Maskable: 1 | ||
262 | + m_OnCullStateChanged: | ||
263 | + m_PersistentCalls: | ||
264 | + m_Calls: [] | ||
265 | + m_text: "\u70B9\u51FB\u67E5\u770B\u5927\u56FE" | ||
266 | + m_isRightToLeft: 0 | ||
267 | + m_fontAsset: {fileID: 11400000, guid: e4002ced6a3580448963db96223ad8bf, type: 2} | ||
268 | + m_sharedMaterial: {fileID: -6404392141848387476, guid: e4002ced6a3580448963db96223ad8bf, type: 2} | ||
269 | + m_fontSharedMaterials: [] | ||
270 | + m_fontMaterial: {fileID: 0} | ||
271 | + m_fontMaterials: [] | ||
272 | + m_fontColor32: | ||
273 | + serializedVersion: 2 | ||
274 | + rgba: 4294967295 | ||
275 | + m_fontColor: {r: 1, g: 1, b: 1, a: 1} | ||
276 | + m_enableVertexGradient: 0 | ||
277 | + m_colorMode: 3 | ||
278 | + m_fontColorGradient: | ||
279 | + topLeft: {r: 1, g: 1, b: 1, a: 1} | ||
280 | + topRight: {r: 1, g: 1, b: 1, a: 1} | ||
281 | + bottomLeft: {r: 1, g: 1, b: 1, a: 1} | ||
282 | + bottomRight: {r: 1, g: 1, b: 1, a: 1} | ||
283 | + m_fontColorGradientPreset: {fileID: 0} | ||
284 | + m_spriteAsset: {fileID: 0} | ||
285 | + m_tintAllSprites: 0 | ||
286 | + m_StyleSheet: {fileID: 0} | ||
287 | + m_TextStyleHashCode: -1183493901 | ||
288 | + m_overrideHtmlColors: 0 | ||
289 | + m_faceColor: | ||
290 | + serializedVersion: 2 | ||
291 | + rgba: 4294967295 | ||
292 | + m_fontSize: 36 | ||
293 | + m_fontSizeBase: 36 | ||
294 | + m_fontWeight: 400 | ||
295 | + m_enableAutoSizing: 0 | ||
296 | + m_fontSizeMin: 18 | ||
297 | + m_fontSizeMax: 72 | ||
298 | + m_fontStyle: 0 | ||
299 | + m_HorizontalAlignment: 1 | ||
300 | + m_VerticalAlignment: 256 | ||
301 | + m_textAlignment: 65535 | ||
302 | + m_characterSpacing: 0 | ||
303 | + m_wordSpacing: 0 | ||
304 | + m_lineSpacing: 0 | ||
305 | + m_lineSpacingMax: 0 | ||
306 | + m_paragraphSpacing: 0 | ||
307 | + m_charWidthMaxAdj: 0 | ||
308 | + m_enableWordWrapping: 1 | ||
309 | + m_wordWrappingRatios: 0.4 | ||
310 | + m_overflowMode: 0 | ||
311 | + m_linkedTextComponent: {fileID: 0} | ||
312 | + parentLinkedComponent: {fileID: 0} | ||
313 | + m_enableKerning: 1 | ||
314 | + m_enableExtraPadding: 0 | ||
315 | + checkPaddingRequired: 0 | ||
316 | + m_isRichText: 1 | ||
317 | + m_parseCtrlCharacters: 1 | ||
318 | + m_isOrthographic: 1 | ||
319 | + m_isCullingEnabled: 0 | ||
320 | + m_horizontalMapping: 0 | ||
321 | + m_verticalMapping: 0 | ||
322 | + m_uvLineOffset: 0 | ||
323 | + m_geometrySortingOrder: 0 | ||
324 | + m_IsTextObjectScaleStatic: 0 | ||
325 | + m_VertexBufferAutoSizeReduction: 0 | ||
326 | + m_useMaxVisibleDescender: 1 | ||
327 | + m_pageToDisplay: 1 | ||
328 | + m_margin: {x: 0, y: 0, z: 0, w: 0} | ||
329 | + m_isUsingLegacyAnimationComponent: 0 | ||
330 | + m_isVolumetricText: 0 | ||
331 | + m_hasFontAssetChanged: 0 | ||
332 | + m_baseMaterial: {fileID: 0} | ||
333 | + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} |
@@ -189,7 +189,7 @@ RectTransform: | @@ -189,7 +189,7 @@ RectTransform: | ||
189 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 189 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
190 | m_AnchorMin: {x: 0, y: 1} | 190 | m_AnchorMin: {x: 0, y: 1} |
191 | m_AnchorMax: {x: 0, y: 1} | 191 | m_AnchorMax: {x: 0, y: 1} |
192 | - m_AnchoredPosition: {x: 122, y: -70} | 192 | + m_AnchoredPosition: {x: 177, y: -70} |
193 | m_SizeDelta: {x: 100, y: 100} | 193 | m_SizeDelta: {x: 100, y: 100} |
194 | m_Pivot: {x: 0.5, y: 0.5} | 194 | m_Pivot: {x: 0.5, y: 0.5} |
195 | --- !u!222 &6456092499910135388 | 195 | --- !u!222 &6456092499910135388 |
@@ -264,9 +264,9 @@ RectTransform: | @@ -264,9 +264,9 @@ RectTransform: | ||
264 | m_Children: [] | 264 | m_Children: [] |
265 | m_Father: {fileID: 933536019744797015} | 265 | m_Father: {fileID: 933536019744797015} |
266 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 266 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
267 | - m_AnchorMin: {x: 0.5, y: 0.5} | ||
268 | - m_AnchorMax: {x: 0.5, y: 0.5} | ||
269 | - m_AnchoredPosition: {x: 380, y: 0} | 267 | + m_AnchorMin: {x: 1, y: 0.5} |
268 | + m_AnchorMax: {x: 1, y: 0.5} | ||
269 | + m_AnchoredPosition: {x: -25, y: 0} | ||
270 | m_SizeDelta: {x: 50, y: 50} | 270 | m_SizeDelta: {x: 50, y: 50} |
271 | m_Pivot: {x: 0.5, y: 0.5} | 271 | m_Pivot: {x: 0.5, y: 0.5} |
272 | --- !u!222 &8561840853038617291 | 272 | --- !u!222 &8561840853038617291 |
@@ -620,7 +620,7 @@ RectTransform: | @@ -620,7 +620,7 @@ RectTransform: | ||
620 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 620 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
621 | m_AnchorMin: {x: 0.5, y: 0.5} | 621 | m_AnchorMin: {x: 0.5, y: 0.5} |
622 | m_AnchorMax: {x: 0.5, y: 0.5} | 622 | m_AnchorMax: {x: 0.5, y: 0.5} |
623 | - m_AnchoredPosition: {x: 268, y: 11} | 623 | + m_AnchoredPosition: {x: 238, y: 11} |
624 | m_SizeDelta: {x: 521, y: 104} | 624 | m_SizeDelta: {x: 521, y: 104} |
625 | m_Pivot: {x: 0.5, y: 0.5} | 625 | m_Pivot: {x: 0.5, y: 0.5} |
626 | --- !u!222 &6788487622062447185 | 626 | --- !u!222 &6788487622062447185 |
@@ -984,9 +984,9 @@ MonoBehaviour: | @@ -984,9 +984,9 @@ MonoBehaviour: | ||
984 | usernameText: {fileID: 3439841451787344491} | 984 | usernameText: {fileID: 3439841451787344491} |
985 | contentText: {fileID: 4430445110796385188} | 985 | contentText: {fileID: 4430445110796385188} |
986 | imageGrid: {fileID: 1041260462946003438} | 986 | imageGrid: {fileID: 1041260462946003438} |
987 | - imagePrefab: {fileID: 6577593741759033465, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 987 | + imagePrefab: {fileID: 6223382467879224884, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
988 | videoGrid: {fileID: 8815226098748290278} | 988 | videoGrid: {fileID: 8815226098748290278} |
989 | - videoPrefab: {fileID: 5652455904761533419, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 989 | + videoPrefab: {fileID: 646672757163800049, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
990 | from: {fileID: 3009102025949839682} | 990 | from: {fileID: 3009102025949839682} |
991 | time: {fileID: 3973289614328891825} | 991 | time: {fileID: 3973289614328891825} |
992 | likeIconImage: {fileID: 5934976809244246865} | 992 | likeIconImage: {fileID: 5934976809244246865} |
@@ -1305,7 +1305,7 @@ MonoBehaviour: | @@ -1305,7 +1305,7 @@ MonoBehaviour: | ||
1305 | m_EditorClassIdentifier: | 1305 | m_EditorClassIdentifier: |
1306 | m_IgnoreLayout: 0 | 1306 | m_IgnoreLayout: 0 |
1307 | m_MinWidth: -1 | 1307 | m_MinWidth: -1 |
1308 | - m_MinHeight: 100 | 1308 | + m_MinHeight: 150 |
1309 | m_PreferredWidth: -1 | 1309 | m_PreferredWidth: -1 |
1310 | m_PreferredHeight: -1 | 1310 | m_PreferredHeight: -1 |
1311 | m_FlexibleWidth: -1 | 1311 | m_FlexibleWidth: -1 |
@@ -1541,7 +1541,7 @@ RectTransform: | @@ -1541,7 +1541,7 @@ RectTransform: | ||
1541 | m_LocalScale: {x: 1, y: 1, z: 1} | 1541 | m_LocalScale: {x: 1, y: 1, z: 1} |
1542 | m_ConstrainProportionsScale: 0 | 1542 | m_ConstrainProportionsScale: 0 |
1543 | m_Children: | 1543 | m_Children: |
1544 | - - {fileID: 2569381267666697778} | 1544 | + - {fileID: 3950083673807387684} |
1545 | m_Father: {fileID: 5137047804386020533} | 1545 | m_Father: {fileID: 5137047804386020533} |
1546 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1546 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1547 | m_AnchorMin: {x: 0, y: 0} | 1547 | m_AnchorMin: {x: 0, y: 0} |
@@ -1564,8 +1564,8 @@ MonoBehaviour: | @@ -1564,8 +1564,8 @@ MonoBehaviour: | ||
1564 | m_Padding: | 1564 | m_Padding: |
1565 | m_Left: 0 | 1565 | m_Left: 0 |
1566 | m_Right: 100 | 1566 | m_Right: 100 |
1567 | - m_Top: 20 | ||
1568 | - m_Bottom: 100 | 1567 | + m_Top: 65 |
1568 | + m_Bottom: 50 | ||
1569 | m_ChildAlignment: 0 | 1569 | m_ChildAlignment: 0 |
1570 | m_StartCorner: 0 | 1570 | m_StartCorner: 0 |
1571 | m_StartAxis: 0 | 1571 | m_StartAxis: 0 |
@@ -1960,15 +1960,15 @@ RectTransform: | @@ -1960,15 +1960,15 @@ RectTransform: | ||
1960 | m_GameObject: {fileID: 6875878826008788810} | 1960 | m_GameObject: {fileID: 6875878826008788810} |
1961 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 1961 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
1962 | m_LocalPosition: {x: 0, y: 0, z: 0} | 1962 | m_LocalPosition: {x: 0, y: 0, z: 0} |
1963 | - m_LocalScale: {x: 0.3, y: 0.3, z: 0} | 1963 | + m_LocalScale: {x: 0.7, y: 0.7, z: 0} |
1964 | m_ConstrainProportionsScale: 0 | 1964 | m_ConstrainProportionsScale: 0 |
1965 | m_Children: [] | 1965 | m_Children: [] |
1966 | m_Father: {fileID: 933536019744797015} | 1966 | m_Father: {fileID: 933536019744797015} |
1967 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1967 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1968 | m_AnchorMin: {x: 1, y: 0.5} | 1968 | m_AnchorMin: {x: 1, y: 0.5} |
1969 | m_AnchorMax: {x: 1, y: 0.5} | 1969 | m_AnchorMax: {x: 1, y: 0.5} |
1970 | - m_AnchoredPosition: {x: -30, y: 0} | ||
1971 | - m_SizeDelta: {x: 197, y: 122} | 1970 | + m_AnchoredPosition: {x: -42, y: 0} |
1971 | + m_SizeDelta: {x: 125, y: 78} | ||
1972 | m_Pivot: {x: 0.5, y: 0.5} | 1972 | m_Pivot: {x: 0.5, y: 0.5} |
1973 | --- !u!222 &295771330138975699 | 1973 | --- !u!222 &295771330138975699 |
1974 | CanvasRenderer: | 1974 | CanvasRenderer: |
@@ -2082,7 +2082,7 @@ RectTransform: | @@ -2082,7 +2082,7 @@ RectTransform: | ||
2082 | m_LocalScale: {x: 1, y: 1, z: 1} | 2082 | m_LocalScale: {x: 1, y: 1, z: 1} |
2083 | m_ConstrainProportionsScale: 0 | 2083 | m_ConstrainProportionsScale: 0 |
2084 | m_Children: | 2084 | m_Children: |
2085 | - - {fileID: 4176127654899971058} | 2085 | + - {fileID: 1320298364044683344} |
2086 | m_Father: {fileID: 5137047804386020533} | 2086 | m_Father: {fileID: 5137047804386020533} |
2087 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 2087 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2088 | m_AnchorMin: {x: 0, y: 1} | 2088 | m_AnchorMin: {x: 0, y: 1} |
@@ -2104,7 +2104,7 @@ MonoBehaviour: | @@ -2104,7 +2104,7 @@ MonoBehaviour: | ||
2104 | m_EditorClassIdentifier: | 2104 | m_EditorClassIdentifier: |
2105 | m_IgnoreLayout: 0 | 2105 | m_IgnoreLayout: 0 |
2106 | m_MinWidth: -1 | 2106 | m_MinWidth: -1 |
2107 | - m_MinHeight: 0 | 2107 | + m_MinHeight: 654 |
2108 | m_PreferredWidth: -1 | 2108 | m_PreferredWidth: -1 |
2109 | m_PreferredHeight: -1 | 2109 | m_PreferredHeight: -1 |
2110 | m_FlexibleWidth: -1 | 2110 | m_FlexibleWidth: -1 |
@@ -2125,12 +2125,12 @@ MonoBehaviour: | @@ -2125,12 +2125,12 @@ MonoBehaviour: | ||
2125 | m_Padding: | 2125 | m_Padding: |
2126 | m_Left: 0 | 2126 | m_Left: 0 |
2127 | m_Right: 0 | 2127 | m_Right: 0 |
2128 | - m_Top: 30 | 2128 | + m_Top: 65 |
2129 | m_Bottom: 50 | 2129 | m_Bottom: 50 |
2130 | m_ChildAlignment: 0 | 2130 | m_ChildAlignment: 0 |
2131 | m_StartCorner: 0 | 2131 | m_StartCorner: 0 |
2132 | m_StartAxis: 0 | 2132 | m_StartAxis: 0 |
2133 | - m_CellSize: {x: 400, y: 400} | 2133 | + m_CellSize: {x: 654, y: 654} |
2134 | m_Spacing: {x: 30, y: 30} | 2134 | m_Spacing: {x: 30, y: 30} |
2135 | m_Constraint: 2 | 2135 | m_Constraint: 2 |
2136 | m_ConstraintCount: 1 | 2136 | m_ConstraintCount: 1 |
@@ -2385,207 +2385,223 @@ MonoBehaviour: | @@ -2385,207 +2385,223 @@ MonoBehaviour: | ||
2385 | m_ChildScaleWidth: 0 | 2385 | m_ChildScaleWidth: 0 |
2386 | m_ChildScaleHeight: 0 | 2386 | m_ChildScaleHeight: 0 |
2387 | m_ReverseArrangement: 0 | 2387 | m_ReverseArrangement: 0 |
2388 | ---- !u!1001 &280922536952119975 | 2388 | +--- !u!1001 &1334240898068231011 |
2389 | PrefabInstance: | 2389 | PrefabInstance: |
2390 | m_ObjectHideFlags: 0 | 2390 | m_ObjectHideFlags: 0 |
2391 | serializedVersion: 2 | 2391 | serializedVersion: 2 |
2392 | m_Modification: | 2392 | m_Modification: |
2393 | serializedVersion: 3 | 2393 | serializedVersion: 3 |
2394 | - m_TransformParent: {fileID: 1041260462946003438} | 2394 | + m_TransformParent: {fileID: 8815226098748290278} |
2395 | m_Modifications: | 2395 | m_Modifications: |
2396 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2396 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2397 | propertyPath: m_Pivot.x | 2397 | propertyPath: m_Pivot.x |
2398 | value: 0.5 | 2398 | value: 0.5 |
2399 | objectReference: {fileID: 0} | 2399 | objectReference: {fileID: 0} |
2400 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2400 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2401 | propertyPath: m_Pivot.y | 2401 | propertyPath: m_Pivot.y |
2402 | value: 0.5 | 2402 | value: 0.5 |
2403 | objectReference: {fileID: 0} | 2403 | objectReference: {fileID: 0} |
2404 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2404 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2405 | propertyPath: m_AnchorMax.x | 2405 | propertyPath: m_AnchorMax.x |
2406 | value: 0 | 2406 | value: 0 |
2407 | objectReference: {fileID: 0} | 2407 | objectReference: {fileID: 0} |
2408 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2408 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2409 | propertyPath: m_AnchorMax.y | 2409 | propertyPath: m_AnchorMax.y |
2410 | - value: 0 | 2410 | + value: 1 |
2411 | objectReference: {fileID: 0} | 2411 | objectReference: {fileID: 0} |
2412 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2412 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2413 | propertyPath: m_AnchorMin.x | 2413 | propertyPath: m_AnchorMin.x |
2414 | value: 0 | 2414 | value: 0 |
2415 | objectReference: {fileID: 0} | 2415 | objectReference: {fileID: 0} |
2416 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2416 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2417 | propertyPath: m_AnchorMin.y | 2417 | propertyPath: m_AnchorMin.y |
2418 | - value: 0 | 2418 | + value: 1 |
2419 | objectReference: {fileID: 0} | 2419 | objectReference: {fileID: 0} |
2420 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2420 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2421 | propertyPath: m_SizeDelta.x | 2421 | propertyPath: m_SizeDelta.x |
2422 | - value: 0 | 2422 | + value: 1184 |
2423 | objectReference: {fileID: 0} | 2423 | objectReference: {fileID: 0} |
2424 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2424 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2425 | propertyPath: m_SizeDelta.y | 2425 | propertyPath: m_SizeDelta.y |
2426 | value: 0 | 2426 | value: 0 |
2427 | objectReference: {fileID: 0} | 2427 | objectReference: {fileID: 0} |
2428 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2428 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2429 | propertyPath: m_LocalPosition.x | 2429 | propertyPath: m_LocalPosition.x |
2430 | value: 0 | 2430 | value: 0 |
2431 | objectReference: {fileID: 0} | 2431 | objectReference: {fileID: 0} |
2432 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2432 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2433 | propertyPath: m_LocalPosition.y | 2433 | propertyPath: m_LocalPosition.y |
2434 | value: 0 | 2434 | value: 0 |
2435 | objectReference: {fileID: 0} | 2435 | objectReference: {fileID: 0} |
2436 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2436 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2437 | propertyPath: m_LocalPosition.z | 2437 | propertyPath: m_LocalPosition.z |
2438 | value: 0 | 2438 | value: 0 |
2439 | objectReference: {fileID: 0} | 2439 | objectReference: {fileID: 0} |
2440 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2440 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2441 | propertyPath: m_LocalRotation.w | 2441 | propertyPath: m_LocalRotation.w |
2442 | value: 1 | 2442 | value: 1 |
2443 | objectReference: {fileID: 0} | 2443 | objectReference: {fileID: 0} |
2444 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2444 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2445 | propertyPath: m_LocalRotation.x | 2445 | propertyPath: m_LocalRotation.x |
2446 | - value: 0 | 2446 | + value: -0 |
2447 | objectReference: {fileID: 0} | 2447 | objectReference: {fileID: 0} |
2448 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2448 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2449 | propertyPath: m_LocalRotation.y | 2449 | propertyPath: m_LocalRotation.y |
2450 | - value: 0 | 2450 | + value: -0 |
2451 | objectReference: {fileID: 0} | 2451 | objectReference: {fileID: 0} |
2452 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2452 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2453 | propertyPath: m_LocalRotation.z | 2453 | propertyPath: m_LocalRotation.z |
2454 | - value: 0 | 2454 | + value: -0 |
2455 | objectReference: {fileID: 0} | 2455 | objectReference: {fileID: 0} |
2456 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2456 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2457 | propertyPath: m_AnchoredPosition.x | 2457 | propertyPath: m_AnchoredPosition.x |
2458 | - value: 0 | 2458 | + value: 592 |
2459 | objectReference: {fileID: 0} | 2459 | objectReference: {fileID: 0} |
2460 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2460 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2461 | propertyPath: m_AnchoredPosition.y | 2461 | propertyPath: m_AnchoredPosition.y |
2462 | - value: 0 | 2462 | + value: 530.71106 |
2463 | objectReference: {fileID: 0} | 2463 | objectReference: {fileID: 0} |
2464 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2464 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2465 | propertyPath: m_LocalEulerAnglesHint.x | 2465 | propertyPath: m_LocalEulerAnglesHint.x |
2466 | value: 0 | 2466 | value: 0 |
2467 | objectReference: {fileID: 0} | 2467 | objectReference: {fileID: 0} |
2468 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2468 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2469 | propertyPath: m_LocalEulerAnglesHint.y | 2469 | propertyPath: m_LocalEulerAnglesHint.y |
2470 | value: 0 | 2470 | value: 0 |
2471 | objectReference: {fileID: 0} | 2471 | objectReference: {fileID: 0} |
2472 | - - target: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2472 | + - target: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2473 | propertyPath: m_LocalEulerAnglesHint.z | 2473 | propertyPath: m_LocalEulerAnglesHint.z |
2474 | value: 0 | 2474 | value: 0 |
2475 | objectReference: {fileID: 0} | 2475 | objectReference: {fileID: 0} |
2476 | - - target: {fileID: 6577593741759033465, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | 2476 | + - target: {fileID: 646672757163800049, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2477 | propertyPath: m_Name | 2477 | propertyPath: m_Name |
2478 | - value: FriendMomentImage | 2478 | + value: VideoItem |
2479 | + objectReference: {fileID: 0} | ||
2480 | + - target: {fileID: 5948255594052087130, guid: bd2d13416179847beac4e59cd608113c, type: 3} | ||
2481 | + propertyPath: m_Texture | ||
2482 | + value: | ||
2483 | + objectReference: {fileID: 8400000, guid: 2a9e64e1928eb4f809ee07c863619b46, type: 2} | ||
2484 | + - target: {fileID: 8416665857584025733, guid: bd2d13416179847beac4e59cd608113c, type: 3} | ||
2485 | + propertyPath: m_PlayOnAwake | ||
2486 | + value: 0 | ||
2487 | + objectReference: {fileID: 0} | ||
2488 | + - target: {fileID: 8416665857584025733, guid: bd2d13416179847beac4e59cd608113c, type: 3} | ||
2489 | + propertyPath: m_TargetTexture | ||
2490 | + value: | ||
2491 | + objectReference: {fileID: 8400000, guid: 2a9e64e1928eb4f809ee07c863619b46, type: 2} | ||
2492 | + - target: {fileID: 8416665857584025733, guid: bd2d13416179847beac4e59cd608113c, type: 3} | ||
2493 | + propertyPath: m_WaitForFirstFrame | ||
2494 | + value: 1 | ||
2479 | objectReference: {fileID: 0} | 2495 | objectReference: {fileID: 0} |
2480 | m_RemovedComponents: [] | 2496 | m_RemovedComponents: [] |
2481 | m_RemovedGameObjects: [] | 2497 | m_RemovedGameObjects: [] |
2482 | m_AddedGameObjects: [] | 2498 | m_AddedGameObjects: [] |
2483 | m_AddedComponents: [] | 2499 | m_AddedComponents: [] |
2484 | - m_SourcePrefab: {fileID: 100100000, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | ||
2485 | ---- !u!224 &2569381267666697778 stripped | 2500 | + m_SourcePrefab: {fileID: 100100000, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2501 | +--- !u!224 &1320298364044683344 stripped | ||
2486 | RectTransform: | 2502 | RectTransform: |
2487 | - m_CorrespondingSourceObject: {fileID: 2327885096247245973, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} | ||
2488 | - m_PrefabInstance: {fileID: 280922536952119975} | 2503 | + m_CorrespondingSourceObject: {fileID: 60386668889119539, guid: bd2d13416179847beac4e59cd608113c, type: 3} |
2504 | + m_PrefabInstance: {fileID: 1334240898068231011} | ||
2489 | m_PrefabAsset: {fileID: 0} | 2505 | m_PrefabAsset: {fileID: 0} |
2490 | ---- !u!1001 &2983940729618784333 | 2506 | +--- !u!1001 &9079607693223126107 |
2491 | PrefabInstance: | 2507 | PrefabInstance: |
2492 | m_ObjectHideFlags: 0 | 2508 | m_ObjectHideFlags: 0 |
2493 | serializedVersion: 2 | 2509 | serializedVersion: 2 |
2494 | m_Modification: | 2510 | m_Modification: |
2495 | serializedVersion: 3 | 2511 | serializedVersion: 3 |
2496 | - m_TransformParent: {fileID: 8815226098748290278} | 2512 | + m_TransformParent: {fileID: 1041260462946003438} |
2497 | m_Modifications: | 2513 | m_Modifications: |
2498 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2514 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2499 | propertyPath: m_Pivot.x | 2515 | propertyPath: m_Pivot.x |
2500 | value: 0.5 | 2516 | value: 0.5 |
2501 | objectReference: {fileID: 0} | 2517 | objectReference: {fileID: 0} |
2502 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2518 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2503 | propertyPath: m_Pivot.y | 2519 | propertyPath: m_Pivot.y |
2504 | value: 0.5 | 2520 | value: 0.5 |
2505 | objectReference: {fileID: 0} | 2521 | objectReference: {fileID: 0} |
2506 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2522 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2507 | propertyPath: m_AnchorMax.x | 2523 | propertyPath: m_AnchorMax.x |
2508 | value: 0 | 2524 | value: 0 |
2509 | objectReference: {fileID: 0} | 2525 | objectReference: {fileID: 0} |
2510 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2526 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2511 | propertyPath: m_AnchorMax.y | 2527 | propertyPath: m_AnchorMax.y |
2512 | - value: 1 | 2528 | + value: 0 |
2513 | objectReference: {fileID: 0} | 2529 | objectReference: {fileID: 0} |
2514 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2530 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2515 | propertyPath: m_AnchorMin.x | 2531 | propertyPath: m_AnchorMin.x |
2516 | value: 0 | 2532 | value: 0 |
2517 | objectReference: {fileID: 0} | 2533 | objectReference: {fileID: 0} |
2518 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2534 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2519 | propertyPath: m_AnchorMin.y | 2535 | propertyPath: m_AnchorMin.y |
2520 | - value: 1 | 2536 | + value: 0 |
2521 | objectReference: {fileID: 0} | 2537 | objectReference: {fileID: 0} |
2522 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2538 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2523 | propertyPath: m_SizeDelta.x | 2539 | propertyPath: m_SizeDelta.x |
2524 | - value: 400 | 2540 | + value: 0 |
2525 | objectReference: {fileID: 0} | 2541 | objectReference: {fileID: 0} |
2526 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2542 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2527 | propertyPath: m_SizeDelta.y | 2543 | propertyPath: m_SizeDelta.y |
2528 | - value: 400 | 2544 | + value: 0 |
2529 | objectReference: {fileID: 0} | 2545 | objectReference: {fileID: 0} |
2530 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2546 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2531 | propertyPath: m_LocalPosition.x | 2547 | propertyPath: m_LocalPosition.x |
2532 | value: 0 | 2548 | value: 0 |
2533 | objectReference: {fileID: 0} | 2549 | objectReference: {fileID: 0} |
2534 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2550 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2535 | propertyPath: m_LocalPosition.y | 2551 | propertyPath: m_LocalPosition.y |
2536 | value: 0 | 2552 | value: 0 |
2537 | objectReference: {fileID: 0} | 2553 | objectReference: {fileID: 0} |
2538 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2554 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2539 | propertyPath: m_LocalPosition.z | 2555 | propertyPath: m_LocalPosition.z |
2540 | value: 0 | 2556 | value: 0 |
2541 | objectReference: {fileID: 0} | 2557 | objectReference: {fileID: 0} |
2542 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2558 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2543 | propertyPath: m_LocalRotation.w | 2559 | propertyPath: m_LocalRotation.w |
2544 | value: 1 | 2560 | value: 1 |
2545 | objectReference: {fileID: 0} | 2561 | objectReference: {fileID: 0} |
2546 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2562 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2547 | propertyPath: m_LocalRotation.x | 2563 | propertyPath: m_LocalRotation.x |
2548 | value: -0 | 2564 | value: -0 |
2549 | objectReference: {fileID: 0} | 2565 | objectReference: {fileID: 0} |
2550 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2566 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2551 | propertyPath: m_LocalRotation.y | 2567 | propertyPath: m_LocalRotation.y |
2552 | value: -0 | 2568 | value: -0 |
2553 | objectReference: {fileID: 0} | 2569 | objectReference: {fileID: 0} |
2554 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2570 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2555 | propertyPath: m_LocalRotation.z | 2571 | propertyPath: m_LocalRotation.z |
2556 | value: -0 | 2572 | value: -0 |
2557 | objectReference: {fileID: 0} | 2573 | objectReference: {fileID: 0} |
2558 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2574 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2559 | propertyPath: m_AnchoredPosition.x | 2575 | propertyPath: m_AnchoredPosition.x |
2560 | - value: 200 | 2576 | + value: 0 |
2561 | objectReference: {fileID: 0} | 2577 | objectReference: {fileID: 0} |
2562 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2578 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2563 | propertyPath: m_AnchoredPosition.y | 2579 | propertyPath: m_AnchoredPosition.y |
2564 | - value: -230 | 2580 | + value: 0 |
2565 | objectReference: {fileID: 0} | 2581 | objectReference: {fileID: 0} |
2566 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2582 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2567 | propertyPath: m_LocalEulerAnglesHint.x | 2583 | propertyPath: m_LocalEulerAnglesHint.x |
2568 | value: 0 | 2584 | value: 0 |
2569 | objectReference: {fileID: 0} | 2585 | objectReference: {fileID: 0} |
2570 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2586 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2571 | propertyPath: m_LocalEulerAnglesHint.y | 2587 | propertyPath: m_LocalEulerAnglesHint.y |
2572 | value: 0 | 2588 | value: 0 |
2573 | objectReference: {fileID: 0} | 2589 | objectReference: {fileID: 0} |
2574 | - - target: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2590 | + - target: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2575 | propertyPath: m_LocalEulerAnglesHint.z | 2591 | propertyPath: m_LocalEulerAnglesHint.z |
2576 | value: 0 | 2592 | value: 0 |
2577 | objectReference: {fileID: 0} | 2593 | objectReference: {fileID: 0} |
2578 | - - target: {fileID: 5652455904761533419, guid: bd2d13416179847beac4e59cd608113c, type: 3} | 2594 | + - target: {fileID: 6223382467879224884, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2579 | propertyPath: m_Name | 2595 | propertyPath: m_Name |
2580 | - value: VideoItem | 2596 | + value: FriendMomentImage |
2581 | objectReference: {fileID: 0} | 2597 | objectReference: {fileID: 0} |
2582 | m_RemovedComponents: [] | 2598 | m_RemovedComponents: [] |
2583 | m_RemovedGameObjects: [] | 2599 | m_RemovedGameObjects: [] |
2584 | m_AddedGameObjects: [] | 2600 | m_AddedGameObjects: [] |
2585 | m_AddedComponents: [] | 2601 | m_AddedComponents: [] |
2586 | - m_SourcePrefab: {fileID: 100100000, guid: bd2d13416179847beac4e59cd608113c, type: 3} | ||
2587 | ---- !u!224 &4176127654899971058 stripped | 2602 | + m_SourcePrefab: {fileID: 100100000, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2603 | +--- !u!224 &3950083673807387684 stripped | ||
2588 | RectTransform: | 2604 | RectTransform: |
2589 | - m_CorrespondingSourceObject: {fileID: 1197257874015785919, guid: bd2d13416179847beac4e59cd608113c, type: 3} | ||
2590 | - m_PrefabInstance: {fileID: 2983940729618784333} | 2605 | + m_CorrespondingSourceObject: {fileID: 5246899428302526591, guid: ca325bf8ed54c41479e9c7d18e457e1e, type: 3} |
2606 | + m_PrefabInstance: {fileID: 9079607693223126107} | ||
2591 | m_PrefabAsset: {fileID: 0} | 2607 | m_PrefabAsset: {fileID: 0} |
1 | %YAML 1.1 | 1 | %YAML 1.1 |
2 | %TAG !u! tag:unity3d.com,2011: | 2 | %TAG !u! tag:unity3d.com,2011: |
3 | ---- !u!1 &2963498519330769369 | 3 | +--- !u!1 &646672757163800049 |
4 | GameObject: | 4 | GameObject: |
5 | m_ObjectHideFlags: 0 | 5 | m_ObjectHideFlags: 0 |
6 | m_CorrespondingSourceObject: {fileID: 0} | 6 | m_CorrespondingSourceObject: {fileID: 0} |
@@ -8,53 +8,138 @@ GameObject: | @@ -8,53 +8,138 @@ GameObject: | ||
8 | m_PrefabAsset: {fileID: 0} | 8 | m_PrefabAsset: {fileID: 0} |
9 | serializedVersion: 6 | 9 | serializedVersion: 6 |
10 | m_Component: | 10 | m_Component: |
11 | - - component: {fileID: 3441075450442605174} | ||
12 | - - component: {fileID: 6253672722631449780} | ||
13 | - - component: {fileID: 1416271959715297927} | 11 | + - component: {fileID: 60386668889119539} |
12 | + - component: {fileID: 577571927756263851} | ||
14 | m_Layer: 5 | 13 | m_Layer: 5 |
15 | - m_Name: playBtn | 14 | + m_Name: VideoItem |
15 | + m_TagString: Untagged | ||
16 | + m_Icon: {fileID: 0} | ||
17 | + m_NavMeshLayer: 0 | ||
18 | + m_StaticEditorFlags: 0 | ||
19 | + m_IsActive: 1 | ||
20 | +--- !u!224 &60386668889119539 | ||
21 | +RectTransform: | ||
22 | + m_ObjectHideFlags: 0 | ||
23 | + m_CorrespondingSourceObject: {fileID: 0} | ||
24 | + m_PrefabInstance: {fileID: 0} | ||
25 | + m_PrefabAsset: {fileID: 0} | ||
26 | + m_GameObject: {fileID: 646672757163800049} | ||
27 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
28 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
29 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
30 | + m_ConstrainProportionsScale: 0 | ||
31 | + m_Children: | ||
32 | + - {fileID: 3648395583955045246} | ||
33 | + - {fileID: 6149327914204344217} | ||
34 | + - {fileID: 6250346051884132680} | ||
35 | + - {fileID: 6110804008250085240} | ||
36 | + - {fileID: 2942035601776583487} | ||
37 | + m_Father: {fileID: 0} | ||
38 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
39 | + m_AnchorMin: {x: 0, y: 1} | ||
40 | + m_AnchorMax: {x: 0, y: 1} | ||
41 | + m_AnchoredPosition: {x: 592, y: 530.71106} | ||
42 | + m_SizeDelta: {x: 1184, y: 0} | ||
43 | + m_Pivot: {x: 0.5, y: 0.5} | ||
44 | +--- !u!114 &577571927756263851 | ||
45 | +MonoBehaviour: | ||
46 | + m_ObjectHideFlags: 0 | ||
47 | + m_CorrespondingSourceObject: {fileID: 0} | ||
48 | + m_PrefabInstance: {fileID: 0} | ||
49 | + m_PrefabAsset: {fileID: 0} | ||
50 | + m_GameObject: {fileID: 646672757163800049} | ||
51 | + m_Enabled: 1 | ||
52 | + m_EditorHideFlags: 0 | ||
53 | + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} | ||
54 | + m_Name: | ||
55 | + m_EditorClassIdentifier: | ||
56 | + m_Navigation: | ||
57 | + m_Mode: 3 | ||
58 | + m_WrapAround: 0 | ||
59 | + m_SelectOnUp: {fileID: 0} | ||
60 | + m_SelectOnDown: {fileID: 0} | ||
61 | + m_SelectOnLeft: {fileID: 0} | ||
62 | + m_SelectOnRight: {fileID: 0} | ||
63 | + m_Transition: 1 | ||
64 | + m_Colors: | ||
65 | + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||
66 | + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
67 | + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} | ||
68 | + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
69 | + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} | ||
70 | + m_ColorMultiplier: 1 | ||
71 | + m_FadeDuration: 0.1 | ||
72 | + m_SpriteState: | ||
73 | + m_HighlightedSprite: {fileID: 0} | ||
74 | + m_PressedSprite: {fileID: 0} | ||
75 | + m_SelectedSprite: {fileID: 0} | ||
76 | + m_DisabledSprite: {fileID: 0} | ||
77 | + m_AnimationTriggers: | ||
78 | + m_NormalTrigger: Normal | ||
79 | + m_HighlightedTrigger: Highlighted | ||
80 | + m_PressedTrigger: Pressed | ||
81 | + m_SelectedTrigger: Selected | ||
82 | + m_DisabledTrigger: Disabled | ||
83 | + m_Interactable: 1 | ||
84 | + m_TargetGraphic: {fileID: 0} | ||
85 | + m_OnClick: | ||
86 | + m_PersistentCalls: | ||
87 | + m_Calls: [] | ||
88 | +--- !u!1 &1929645422983397464 | ||
89 | +GameObject: | ||
90 | + m_ObjectHideFlags: 0 | ||
91 | + m_CorrespondingSourceObject: {fileID: 0} | ||
92 | + m_PrefabInstance: {fileID: 0} | ||
93 | + m_PrefabAsset: {fileID: 0} | ||
94 | + serializedVersion: 6 | ||
95 | + m_Component: | ||
96 | + - component: {fileID: 2942035601776583487} | ||
97 | + - component: {fileID: 5060493436934096923} | ||
98 | + - component: {fileID: 2209145438797713119} | ||
99 | + m_Layer: 5 | ||
100 | + m_Name: showBigVideoContent | ||
16 | m_TagString: Untagged | 101 | m_TagString: Untagged |
17 | m_Icon: {fileID: 0} | 102 | m_Icon: {fileID: 0} |
18 | m_NavMeshLayer: 0 | 103 | m_NavMeshLayer: 0 |
19 | m_StaticEditorFlags: 0 | 104 | m_StaticEditorFlags: 0 |
20 | m_IsActive: 1 | 105 | m_IsActive: 1 |
21 | ---- !u!224 &3441075450442605174 | 106 | +--- !u!224 &2942035601776583487 |
22 | RectTransform: | 107 | RectTransform: |
23 | m_ObjectHideFlags: 0 | 108 | m_ObjectHideFlags: 0 |
24 | m_CorrespondingSourceObject: {fileID: 0} | 109 | m_CorrespondingSourceObject: {fileID: 0} |
25 | m_PrefabInstance: {fileID: 0} | 110 | m_PrefabInstance: {fileID: 0} |
26 | m_PrefabAsset: {fileID: 0} | 111 | m_PrefabAsset: {fileID: 0} |
27 | - m_GameObject: {fileID: 2963498519330769369} | 112 | + m_GameObject: {fileID: 1929645422983397464} |
28 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 113 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
29 | m_LocalPosition: {x: 0, y: 0, z: 0} | 114 | m_LocalPosition: {x: 0, y: 0, z: 0} |
30 | m_LocalScale: {x: 1, y: 1, z: 1} | 115 | m_LocalScale: {x: 1, y: 1, z: 1} |
31 | m_ConstrainProportionsScale: 0 | 116 | m_ConstrainProportionsScale: 0 |
32 | m_Children: [] | 117 | m_Children: [] |
33 | - m_Father: {fileID: 1197257874015785919} | 118 | + m_Father: {fileID: 60386668889119539} |
34 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 119 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
35 | m_AnchorMin: {x: 0.5, y: 0.5} | 120 | m_AnchorMin: {x: 0.5, y: 0.5} |
36 | m_AnchorMax: {x: 0.5, y: 0.5} | 121 | m_AnchorMax: {x: 0.5, y: 0.5} |
37 | - m_AnchoredPosition: {x: 0, y: 0} | ||
38 | - m_SizeDelta: {x: 100, y: 100} | 122 | + m_AnchoredPosition: {x: 464, y: -99} |
123 | + m_SizeDelta: {x: 239.0876, y: 53.4746} | ||
39 | m_Pivot: {x: 0.5, y: 0.5} | 124 | m_Pivot: {x: 0.5, y: 0.5} |
40 | ---- !u!222 &6253672722631449780 | 125 | +--- !u!222 &5060493436934096923 |
41 | CanvasRenderer: | 126 | CanvasRenderer: |
42 | m_ObjectHideFlags: 0 | 127 | m_ObjectHideFlags: 0 |
43 | m_CorrespondingSourceObject: {fileID: 0} | 128 | m_CorrespondingSourceObject: {fileID: 0} |
44 | m_PrefabInstance: {fileID: 0} | 129 | m_PrefabInstance: {fileID: 0} |
45 | m_PrefabAsset: {fileID: 0} | 130 | m_PrefabAsset: {fileID: 0} |
46 | - m_GameObject: {fileID: 2963498519330769369} | 131 | + m_GameObject: {fileID: 1929645422983397464} |
47 | m_CullTransparentMesh: 1 | 132 | m_CullTransparentMesh: 1 |
48 | ---- !u!114 &1416271959715297927 | 133 | +--- !u!114 &2209145438797713119 |
49 | MonoBehaviour: | 134 | MonoBehaviour: |
50 | m_ObjectHideFlags: 0 | 135 | m_ObjectHideFlags: 0 |
51 | m_CorrespondingSourceObject: {fileID: 0} | 136 | m_CorrespondingSourceObject: {fileID: 0} |
52 | m_PrefabInstance: {fileID: 0} | 137 | m_PrefabInstance: {fileID: 0} |
53 | m_PrefabAsset: {fileID: 0} | 138 | m_PrefabAsset: {fileID: 0} |
54 | - m_GameObject: {fileID: 2963498519330769369} | 139 | + m_GameObject: {fileID: 1929645422983397464} |
55 | m_Enabled: 1 | 140 | m_Enabled: 1 |
56 | m_EditorHideFlags: 0 | 141 | m_EditorHideFlags: 0 |
57 | - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | 142 | + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} |
58 | m_Name: | 143 | m_Name: |
59 | m_EditorClassIdentifier: | 144 | m_EditorClassIdentifier: |
60 | m_Material: {fileID: 0} | 145 | m_Material: {fileID: 0} |
@@ -65,17 +150,76 @@ MonoBehaviour: | @@ -65,17 +150,76 @@ MonoBehaviour: | ||
65 | m_OnCullStateChanged: | 150 | m_OnCullStateChanged: |
66 | m_PersistentCalls: | 151 | m_PersistentCalls: |
67 | m_Calls: [] | 152 | m_Calls: [] |
68 | - m_Sprite: {fileID: 21300000, guid: 57a2c8795a1e6411586cec0e66965744, type: 3} | ||
69 | - m_Type: 0 | ||
70 | - m_PreserveAspect: 0 | ||
71 | - m_FillCenter: 1 | ||
72 | - m_FillMethod: 4 | ||
73 | - m_FillAmount: 1 | ||
74 | - m_FillClockwise: 1 | ||
75 | - m_FillOrigin: 0 | ||
76 | - m_UseSpriteMesh: 0 | ||
77 | - m_PixelsPerUnitMultiplier: 1 | ||
78 | ---- !u!1 &5652455904761533419 | 153 | + m_text: "\u70B9\u51FB\u67E5\u770B\u89C6\u9891" |
154 | + m_isRightToLeft: 0 | ||
155 | + m_fontAsset: {fileID: 11400000, guid: e4002ced6a3580448963db96223ad8bf, type: 2} | ||
156 | + m_sharedMaterial: {fileID: -6404392141848387476, guid: e4002ced6a3580448963db96223ad8bf, type: 2} | ||
157 | + m_fontSharedMaterials: [] | ||
158 | + m_fontMaterial: {fileID: 0} | ||
159 | + m_fontMaterials: [] | ||
160 | + m_fontColor32: | ||
161 | + serializedVersion: 2 | ||
162 | + rgba: 4287982423 | ||
163 | + m_fontColor: {r: 0.34117648, g: 0.41960785, b: 0.58431375, a: 1} | ||
164 | + m_enableVertexGradient: 0 | ||
165 | + m_colorMode: 3 | ||
166 | + m_fontColorGradient: | ||
167 | + topLeft: {r: 1, g: 1, b: 1, a: 1} | ||
168 | + topRight: {r: 1, g: 1, b: 1, a: 1} | ||
169 | + bottomLeft: {r: 1, g: 1, b: 1, a: 1} | ||
170 | + bottomRight: {r: 1, g: 1, b: 1, a: 1} | ||
171 | + m_fontColorGradientPreset: {fileID: 0} | ||
172 | + m_spriteAsset: {fileID: 0} | ||
173 | + m_tintAllSprites: 0 | ||
174 | + m_StyleSheet: {fileID: 0} | ||
175 | + m_TextStyleHashCode: -1183493901 | ||
176 | + m_overrideHtmlColors: 0 | ||
177 | + m_faceColor: | ||
178 | + serializedVersion: 2 | ||
179 | + rgba: 4294967295 | ||
180 | + m_fontSize: 36 | ||
181 | + m_fontSizeBase: 36 | ||
182 | + m_fontWeight: 400 | ||
183 | + m_enableAutoSizing: 0 | ||
184 | + m_fontSizeMin: 18 | ||
185 | + m_fontSizeMax: 72 | ||
186 | + m_fontStyle: 1 | ||
187 | + m_HorizontalAlignment: 1 | ||
188 | + m_VerticalAlignment: 256 | ||
189 | + m_textAlignment: 65535 | ||
190 | + m_characterSpacing: 0 | ||
191 | + m_wordSpacing: 0 | ||
192 | + m_lineSpacing: 0 | ||
193 | + m_lineSpacingMax: 0 | ||
194 | + m_paragraphSpacing: 0 | ||
195 | + m_charWidthMaxAdj: 0 | ||
196 | + m_enableWordWrapping: 1 | ||
197 | + m_wordWrappingRatios: 0.4 | ||
198 | + m_overflowMode: 0 | ||
199 | + m_linkedTextComponent: {fileID: 0} | ||
200 | + parentLinkedComponent: {fileID: 0} | ||
201 | + m_enableKerning: 1 | ||
202 | + m_enableExtraPadding: 0 | ||
203 | + checkPaddingRequired: 0 | ||
204 | + m_isRichText: 1 | ||
205 | + m_parseCtrlCharacters: 1 | ||
206 | + m_isOrthographic: 1 | ||
207 | + m_isCullingEnabled: 0 | ||
208 | + m_horizontalMapping: 0 | ||
209 | + m_verticalMapping: 0 | ||
210 | + m_uvLineOffset: 0 | ||
211 | + m_geometrySortingOrder: 0 | ||
212 | + m_IsTextObjectScaleStatic: 0 | ||
213 | + m_VertexBufferAutoSizeReduction: 0 | ||
214 | + m_useMaxVisibleDescender: 1 | ||
215 | + m_pageToDisplay: 1 | ||
216 | + m_margin: {x: 0, y: 0, z: 0, w: 0} | ||
217 | + m_isUsingLegacyAnimationComponent: 0 | ||
218 | + m_isVolumetricText: 0 | ||
219 | + m_hasFontAssetChanged: 0 | ||
220 | + m_baseMaterial: {fileID: 0} | ||
221 | + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} | ||
222 | +--- !u!1 &3470842090967574766 | ||
79 | GameObject: | 223 | GameObject: |
80 | m_ObjectHideFlags: 0 | 224 | m_ObjectHideFlags: 0 |
81 | m_CorrespondingSourceObject: {fileID: 0} | 225 | m_CorrespondingSourceObject: {fileID: 0} |
@@ -83,83 +227,74 @@ GameObject: | @@ -83,83 +227,74 @@ GameObject: | ||
83 | m_PrefabAsset: {fileID: 0} | 227 | m_PrefabAsset: {fileID: 0} |
84 | serializedVersion: 6 | 228 | serializedVersion: 6 |
85 | m_Component: | 229 | m_Component: |
86 | - - component: {fileID: 1197257874015785919} | ||
87 | - - component: {fileID: 6082931358349000535} | 230 | + - component: {fileID: 6110804008250085240} |
231 | + - component: {fileID: 3113558356960480632} | ||
232 | + - component: {fileID: 4819077865166323038} | ||
88 | m_Layer: 5 | 233 | m_Layer: 5 |
89 | - m_Name: VideoItem | 234 | + m_Name: playBtn |
90 | m_TagString: Untagged | 235 | m_TagString: Untagged |
91 | m_Icon: {fileID: 0} | 236 | m_Icon: {fileID: 0} |
92 | m_NavMeshLayer: 0 | 237 | m_NavMeshLayer: 0 |
93 | m_StaticEditorFlags: 0 | 238 | m_StaticEditorFlags: 0 |
94 | m_IsActive: 1 | 239 | m_IsActive: 1 |
95 | ---- !u!224 &1197257874015785919 | 240 | +--- !u!224 &6110804008250085240 |
96 | RectTransform: | 241 | RectTransform: |
97 | m_ObjectHideFlags: 0 | 242 | m_ObjectHideFlags: 0 |
98 | m_CorrespondingSourceObject: {fileID: 0} | 243 | m_CorrespondingSourceObject: {fileID: 0} |
99 | m_PrefabInstance: {fileID: 0} | 244 | m_PrefabInstance: {fileID: 0} |
100 | m_PrefabAsset: {fileID: 0} | 245 | m_PrefabAsset: {fileID: 0} |
101 | - m_GameObject: {fileID: 5652455904761533419} | ||
102 | - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | 246 | + m_GameObject: {fileID: 3470842090967574766} |
247 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
103 | m_LocalPosition: {x: 0, y: 0, z: 0} | 248 | m_LocalPosition: {x: 0, y: 0, z: 0} |
104 | m_LocalScale: {x: 1, y: 1, z: 1} | 249 | m_LocalScale: {x: 1, y: 1, z: 1} |
105 | m_ConstrainProportionsScale: 0 | 250 | m_ConstrainProportionsScale: 0 |
106 | - m_Children: | ||
107 | - - {fileID: 3977215375655435476} | ||
108 | - - {fileID: 4411163969722580396} | ||
109 | - - {fileID: 7531928019484227518} | ||
110 | - - {fileID: 3441075450442605174} | ||
111 | - m_Father: {fileID: 0} | 251 | + m_Children: [] |
252 | + m_Father: {fileID: 60386668889119539} | ||
112 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 253 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
113 | - m_AnchorMin: {x: 0, y: 0} | ||
114 | - m_AnchorMax: {x: 0, y: 0} | 254 | + m_AnchorMin: {x: 0.5, y: 0.5} |
255 | + m_AnchorMax: {x: 0.5, y: 0.5} | ||
115 | m_AnchoredPosition: {x: 0, y: 0} | 256 | m_AnchoredPosition: {x: 0, y: 0} |
116 | - m_SizeDelta: {x: 0, y: 0} | 257 | + m_SizeDelta: {x: 100, y: 100} |
117 | m_Pivot: {x: 0.5, y: 0.5} | 258 | m_Pivot: {x: 0.5, y: 0.5} |
118 | ---- !u!114 &6082931358349000535 | 259 | +--- !u!222 &3113558356960480632 |
260 | +CanvasRenderer: | ||
261 | + m_ObjectHideFlags: 0 | ||
262 | + m_CorrespondingSourceObject: {fileID: 0} | ||
263 | + m_PrefabInstance: {fileID: 0} | ||
264 | + m_PrefabAsset: {fileID: 0} | ||
265 | + m_GameObject: {fileID: 3470842090967574766} | ||
266 | + m_CullTransparentMesh: 1 | ||
267 | +--- !u!114 &4819077865166323038 | ||
119 | MonoBehaviour: | 268 | MonoBehaviour: |
120 | m_ObjectHideFlags: 0 | 269 | m_ObjectHideFlags: 0 |
121 | m_CorrespondingSourceObject: {fileID: 0} | 270 | m_CorrespondingSourceObject: {fileID: 0} |
122 | m_PrefabInstance: {fileID: 0} | 271 | m_PrefabInstance: {fileID: 0} |
123 | m_PrefabAsset: {fileID: 0} | 272 | m_PrefabAsset: {fileID: 0} |
124 | - m_GameObject: {fileID: 5652455904761533419} | 273 | + m_GameObject: {fileID: 3470842090967574766} |
125 | m_Enabled: 1 | 274 | m_Enabled: 1 |
126 | m_EditorHideFlags: 0 | 275 | m_EditorHideFlags: 0 |
127 | - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} | 276 | + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
128 | m_Name: | 277 | m_Name: |
129 | m_EditorClassIdentifier: | 278 | m_EditorClassIdentifier: |
130 | - m_Navigation: | ||
131 | - m_Mode: 3 | ||
132 | - m_WrapAround: 0 | ||
133 | - m_SelectOnUp: {fileID: 0} | ||
134 | - m_SelectOnDown: {fileID: 0} | ||
135 | - m_SelectOnLeft: {fileID: 0} | ||
136 | - m_SelectOnRight: {fileID: 0} | ||
137 | - m_Transition: 1 | ||
138 | - m_Colors: | ||
139 | - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||
140 | - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
141 | - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} | ||
142 | - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
143 | - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} | ||
144 | - m_ColorMultiplier: 1 | ||
145 | - m_FadeDuration: 0.1 | ||
146 | - m_SpriteState: | ||
147 | - m_HighlightedSprite: {fileID: 0} | ||
148 | - m_PressedSprite: {fileID: 0} | ||
149 | - m_SelectedSprite: {fileID: 0} | ||
150 | - m_DisabledSprite: {fileID: 0} | ||
151 | - m_AnimationTriggers: | ||
152 | - m_NormalTrigger: Normal | ||
153 | - m_HighlightedTrigger: Highlighted | ||
154 | - m_PressedTrigger: Pressed | ||
155 | - m_SelectedTrigger: Selected | ||
156 | - m_DisabledTrigger: Disabled | ||
157 | - m_Interactable: 1 | ||
158 | - m_TargetGraphic: {fileID: 0} | ||
159 | - m_OnClick: | 279 | + m_Material: {fileID: 0} |
280 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
281 | + m_RaycastTarget: 1 | ||
282 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
283 | + m_Maskable: 1 | ||
284 | + m_OnCullStateChanged: | ||
160 | m_PersistentCalls: | 285 | m_PersistentCalls: |
161 | m_Calls: [] | 286 | m_Calls: [] |
162 | ---- !u!1 &5791044894920343793 | 287 | + m_Sprite: {fileID: 21300000, guid: 57a2c8795a1e6411586cec0e66965744, type: 3} |
288 | + m_Type: 0 | ||
289 | + m_PreserveAspect: 0 | ||
290 | + m_FillCenter: 1 | ||
291 | + m_FillMethod: 4 | ||
292 | + m_FillAmount: 1 | ||
293 | + m_FillClockwise: 1 | ||
294 | + m_FillOrigin: 0 | ||
295 | + m_UseSpriteMesh: 0 | ||
296 | + m_PixelsPerUnitMultiplier: 1 | ||
297 | +--- !u!1 &3599193443451891244 | ||
163 | GameObject: | 298 | GameObject: |
164 | m_ObjectHideFlags: 0 | 299 | m_ObjectHideFlags: 0 |
165 | m_CorrespondingSourceObject: {fileID: 0} | 300 | m_CorrespondingSourceObject: {fileID: 0} |
@@ -167,53 +302,53 @@ GameObject: | @@ -167,53 +302,53 @@ GameObject: | ||
167 | m_PrefabAsset: {fileID: 0} | 302 | m_PrefabAsset: {fileID: 0} |
168 | serializedVersion: 6 | 303 | serializedVersion: 6 |
169 | m_Component: | 304 | m_Component: |
170 | - - component: {fileID: 7531928019484227518} | ||
171 | - - component: {fileID: 9205403602903723553} | ||
172 | - - component: {fileID: 5790668701150419871} | 305 | + - component: {fileID: 3648395583955045246} |
306 | + - component: {fileID: 877131221422643817} | ||
307 | + - component: {fileID: 5948255594052087130} | ||
173 | m_Layer: 5 | 308 | m_Layer: 5 |
174 | - m_Name: showBigVideo | 309 | + m_Name: VideoScreen |
175 | m_TagString: Untagged | 310 | m_TagString: Untagged |
176 | m_Icon: {fileID: 0} | 311 | m_Icon: {fileID: 0} |
177 | m_NavMeshLayer: 0 | 312 | m_NavMeshLayer: 0 |
178 | m_StaticEditorFlags: 0 | 313 | m_StaticEditorFlags: 0 |
179 | m_IsActive: 1 | 314 | m_IsActive: 1 |
180 | ---- !u!224 &7531928019484227518 | 315 | +--- !u!224 &3648395583955045246 |
181 | RectTransform: | 316 | RectTransform: |
182 | m_ObjectHideFlags: 0 | 317 | m_ObjectHideFlags: 0 |
183 | m_CorrespondingSourceObject: {fileID: 0} | 318 | m_CorrespondingSourceObject: {fileID: 0} |
184 | m_PrefabInstance: {fileID: 0} | 319 | m_PrefabInstance: {fileID: 0} |
185 | m_PrefabAsset: {fileID: 0} | 320 | m_PrefabAsset: {fileID: 0} |
186 | - m_GameObject: {fileID: 5791044894920343793} | ||
187 | - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 321 | + m_GameObject: {fileID: 3599193443451891244} |
322 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
188 | m_LocalPosition: {x: 0, y: 0, z: 0} | 323 | m_LocalPosition: {x: 0, y: 0, z: 0} |
189 | - m_LocalScale: {x: 0.6, y: 0.6, z: 1} | 324 | + m_LocalScale: {x: 1, y: 1, z: 1} |
190 | m_ConstrainProportionsScale: 0 | 325 | m_ConstrainProportionsScale: 0 |
191 | m_Children: [] | 326 | m_Children: [] |
192 | - m_Father: {fileID: 1197257874015785919} | 327 | + m_Father: {fileID: 60386668889119539} |
193 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 328 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
194 | - m_AnchorMin: {x: 0.5, y: 0.5} | ||
195 | - m_AnchorMax: {x: 0.5, y: 0.5} | ||
196 | - m_AnchoredPosition: {x: 254, y: -102} | ||
197 | - m_SizeDelta: {x: 295, y: 52} | 329 | + m_AnchorMin: {x: 0, y: 0} |
330 | + m_AnchorMax: {x: 1, y: 1} | ||
331 | + m_AnchoredPosition: {x: 0, y: 0} | ||
332 | + m_SizeDelta: {x: 0, y: 0} | ||
198 | m_Pivot: {x: 0.5, y: 0.5} | 333 | m_Pivot: {x: 0.5, y: 0.5} |
199 | ---- !u!222 &9205403602903723553 | 334 | +--- !u!222 &877131221422643817 |
200 | CanvasRenderer: | 335 | CanvasRenderer: |
201 | m_ObjectHideFlags: 0 | 336 | m_ObjectHideFlags: 0 |
202 | m_CorrespondingSourceObject: {fileID: 0} | 337 | m_CorrespondingSourceObject: {fileID: 0} |
203 | m_PrefabInstance: {fileID: 0} | 338 | m_PrefabInstance: {fileID: 0} |
204 | m_PrefabAsset: {fileID: 0} | 339 | m_PrefabAsset: {fileID: 0} |
205 | - m_GameObject: {fileID: 5791044894920343793} | 340 | + m_GameObject: {fileID: 3599193443451891244} |
206 | m_CullTransparentMesh: 1 | 341 | m_CullTransparentMesh: 1 |
207 | ---- !u!114 &5790668701150419871 | 342 | +--- !u!114 &5948255594052087130 |
208 | MonoBehaviour: | 343 | MonoBehaviour: |
209 | m_ObjectHideFlags: 0 | 344 | m_ObjectHideFlags: 0 |
210 | m_CorrespondingSourceObject: {fileID: 0} | 345 | m_CorrespondingSourceObject: {fileID: 0} |
211 | m_PrefabInstance: {fileID: 0} | 346 | m_PrefabInstance: {fileID: 0} |
212 | m_PrefabAsset: {fileID: 0} | 347 | m_PrefabAsset: {fileID: 0} |
213 | - m_GameObject: {fileID: 5791044894920343793} | 348 | + m_GameObject: {fileID: 3599193443451891244} |
214 | m_Enabled: 1 | 349 | m_Enabled: 1 |
215 | m_EditorHideFlags: 0 | 350 | m_EditorHideFlags: 0 |
216 | - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | 351 | + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} |
217 | m_Name: | 352 | m_Name: |
218 | m_EditorClassIdentifier: | 353 | m_EditorClassIdentifier: |
219 | m_Material: {fileID: 0} | 354 | m_Material: {fileID: 0} |
@@ -224,17 +359,14 @@ MonoBehaviour: | @@ -224,17 +359,14 @@ MonoBehaviour: | ||
224 | m_OnCullStateChanged: | 359 | m_OnCullStateChanged: |
225 | m_PersistentCalls: | 360 | m_PersistentCalls: |
226 | m_Calls: [] | 361 | m_Calls: [] |
227 | - m_Sprite: {fileID: 21300000, guid: 98b4d527ddb6341b0bb2a3589543570f, type: 3} | ||
228 | - m_Type: 0 | ||
229 | - m_PreserveAspect: 0 | ||
230 | - m_FillCenter: 1 | ||
231 | - m_FillMethod: 4 | ||
232 | - m_FillAmount: 1 | ||
233 | - m_FillClockwise: 1 | ||
234 | - m_FillOrigin: 0 | ||
235 | - m_UseSpriteMesh: 0 | ||
236 | - m_PixelsPerUnitMultiplier: 1 | ||
237 | ---- !u!1 &7999976191172506044 | 362 | + m_Texture: {fileID: 0} |
363 | + m_UVRect: | ||
364 | + serializedVersion: 2 | ||
365 | + x: 0 | ||
366 | + y: 0 | ||
367 | + width: 1 | ||
368 | + height: 1 | ||
369 | +--- !u!1 &5627254255552322538 | ||
238 | GameObject: | 370 | GameObject: |
239 | m_ObjectHideFlags: 0 | 371 | m_ObjectHideFlags: 0 |
240 | m_CorrespondingSourceObject: {fileID: 0} | 372 | m_CorrespondingSourceObject: {fileID: 0} |
@@ -242,8 +374,8 @@ GameObject: | @@ -242,8 +374,8 @@ GameObject: | ||
242 | m_PrefabAsset: {fileID: 0} | 374 | m_PrefabAsset: {fileID: 0} |
243 | serializedVersion: 6 | 375 | serializedVersion: 6 |
244 | m_Component: | 376 | m_Component: |
245 | - - component: {fileID: 4411163969722580396} | ||
246 | - - component: {fileID: 7855922242282416968} | 377 | + - component: {fileID: 6149327914204344217} |
378 | + - component: {fileID: 8416665857584025733} | ||
247 | m_Layer: 5 | 379 | m_Layer: 5 |
248 | m_Name: Video Player | 380 | m_Name: Video Player |
249 | m_TagString: Untagged | 381 | m_TagString: Untagged |
@@ -251,32 +383,32 @@ GameObject: | @@ -251,32 +383,32 @@ GameObject: | ||
251 | m_NavMeshLayer: 0 | 383 | m_NavMeshLayer: 0 |
252 | m_StaticEditorFlags: 0 | 384 | m_StaticEditorFlags: 0 |
253 | m_IsActive: 1 | 385 | m_IsActive: 1 |
254 | ---- !u!224 &4411163969722580396 | 386 | +--- !u!224 &6149327914204344217 |
255 | RectTransform: | 387 | RectTransform: |
256 | m_ObjectHideFlags: 0 | 388 | m_ObjectHideFlags: 0 |
257 | m_CorrespondingSourceObject: {fileID: 0} | 389 | m_CorrespondingSourceObject: {fileID: 0} |
258 | m_PrefabInstance: {fileID: 0} | 390 | m_PrefabInstance: {fileID: 0} |
259 | m_PrefabAsset: {fileID: 0} | 391 | m_PrefabAsset: {fileID: 0} |
260 | - m_GameObject: {fileID: 7999976191172506044} | 392 | + m_GameObject: {fileID: 5627254255552322538} |
261 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 393 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
262 | m_LocalPosition: {x: 0, y: 0, z: 0} | 394 | m_LocalPosition: {x: 0, y: 0, z: 0} |
263 | m_LocalScale: {x: 1, y: 1, z: 1} | 395 | m_LocalScale: {x: 1, y: 1, z: 1} |
264 | m_ConstrainProportionsScale: 0 | 396 | m_ConstrainProportionsScale: 0 |
265 | m_Children: [] | 397 | m_Children: [] |
266 | - m_Father: {fileID: 1197257874015785919} | 398 | + m_Father: {fileID: 60386668889119539} |
267 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 399 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
268 | m_AnchorMin: {x: 0, y: 0} | 400 | m_AnchorMin: {x: 0, y: 0} |
269 | m_AnchorMax: {x: 1, y: 1} | 401 | m_AnchorMax: {x: 1, y: 1} |
270 | m_AnchoredPosition: {x: 0, y: 0} | 402 | m_AnchoredPosition: {x: 0, y: 0} |
271 | m_SizeDelta: {x: 0, y: 0} | 403 | m_SizeDelta: {x: 0, y: 0} |
272 | m_Pivot: {x: 0.5, y: 0.5} | 404 | m_Pivot: {x: 0.5, y: 0.5} |
273 | ---- !u!328 &7855922242282416968 | 405 | +--- !u!328 &8416665857584025733 |
274 | VideoPlayer: | 406 | VideoPlayer: |
275 | m_ObjectHideFlags: 0 | 407 | m_ObjectHideFlags: 0 |
276 | m_CorrespondingSourceObject: {fileID: 0} | 408 | m_CorrespondingSourceObject: {fileID: 0} |
277 | m_PrefabInstance: {fileID: 0} | 409 | m_PrefabInstance: {fileID: 0} |
278 | m_PrefabAsset: {fileID: 0} | 410 | m_PrefabAsset: {fileID: 0} |
279 | - m_GameObject: {fileID: 7999976191172506044} | 411 | + m_GameObject: {fileID: 5627254255552322538} |
280 | m_Enabled: 1 | 412 | m_Enabled: 1 |
281 | m_VideoClip: {fileID: 0} | 413 | m_VideoClip: {fileID: 0} |
282 | m_TargetCameraAlpha: 1 | 414 | m_TargetCameraAlpha: 1 |
@@ -306,7 +438,7 @@ VideoPlayer: | @@ -306,7 +438,7 @@ VideoPlayer: | ||
306 | m_WaitForFirstFrame: 1 | 438 | m_WaitForFirstFrame: 1 |
307 | m_FrameReadyEventEnabled: 0 | 439 | m_FrameReadyEventEnabled: 0 |
308 | m_VideoShaders: [] | 440 | m_VideoShaders: [] |
309 | ---- !u!1 &8100171906994039130 | 441 | +--- !u!1 &6833234817920992900 |
310 | GameObject: | 442 | GameObject: |
311 | m_ObjectHideFlags: 0 | 443 | m_ObjectHideFlags: 0 |
312 | m_CorrespondingSourceObject: {fileID: 0} | 444 | m_CorrespondingSourceObject: {fileID: 0} |
@@ -314,53 +446,53 @@ GameObject: | @@ -314,53 +446,53 @@ GameObject: | ||
314 | m_PrefabAsset: {fileID: 0} | 446 | m_PrefabAsset: {fileID: 0} |
315 | serializedVersion: 6 | 447 | serializedVersion: 6 |
316 | m_Component: | 448 | m_Component: |
317 | - - component: {fileID: 3977215375655435476} | ||
318 | - - component: {fileID: 1921699574450549583} | ||
319 | - - component: {fileID: 1658423591852421245} | 449 | + - component: {fileID: 6250346051884132680} |
450 | + - component: {fileID: 2032603902050556834} | ||
451 | + - component: {fileID: 4806992368488562460} | ||
320 | m_Layer: 5 | 452 | m_Layer: 5 |
321 | - m_Name: VideoScreen | 453 | + m_Name: showBigVideo |
322 | m_TagString: Untagged | 454 | m_TagString: Untagged |
323 | m_Icon: {fileID: 0} | 455 | m_Icon: {fileID: 0} |
324 | m_NavMeshLayer: 0 | 456 | m_NavMeshLayer: 0 |
325 | m_StaticEditorFlags: 0 | 457 | m_StaticEditorFlags: 0 |
326 | m_IsActive: 1 | 458 | m_IsActive: 1 |
327 | ---- !u!224 &3977215375655435476 | 459 | +--- !u!224 &6250346051884132680 |
328 | RectTransform: | 460 | RectTransform: |
329 | m_ObjectHideFlags: 0 | 461 | m_ObjectHideFlags: 0 |
330 | m_CorrespondingSourceObject: {fileID: 0} | 462 | m_CorrespondingSourceObject: {fileID: 0} |
331 | m_PrefabInstance: {fileID: 0} | 463 | m_PrefabInstance: {fileID: 0} |
332 | m_PrefabAsset: {fileID: 0} | 464 | m_PrefabAsset: {fileID: 0} |
333 | - m_GameObject: {fileID: 8100171906994039130} | ||
334 | - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | 465 | + m_GameObject: {fileID: 6833234817920992900} |
466 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
335 | m_LocalPosition: {x: 0, y: 0, z: 0} | 467 | m_LocalPosition: {x: 0, y: 0, z: 0} |
336 | m_LocalScale: {x: 1, y: 1, z: 1} | 468 | m_LocalScale: {x: 1, y: 1, z: 1} |
337 | m_ConstrainProportionsScale: 0 | 469 | m_ConstrainProportionsScale: 0 |
338 | m_Children: [] | 470 | m_Children: [] |
339 | - m_Father: {fileID: 1197257874015785919} | 471 | + m_Father: {fileID: 60386668889119539} |
340 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 472 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
341 | - m_AnchorMin: {x: 0, y: 0} | ||
342 | - m_AnchorMax: {x: 1, y: 1} | ||
343 | - m_AnchoredPosition: {x: 0, y: 0} | ||
344 | - m_SizeDelta: {x: 0, y: 0} | 473 | + m_AnchorMin: {x: 0.5, y: 0.5} |
474 | + m_AnchorMax: {x: 0.5, y: 0.5} | ||
475 | + m_AnchoredPosition: {x: 299, y: -102} | ||
476 | + m_SizeDelta: {x: 34, y: 34} | ||
345 | m_Pivot: {x: 0.5, y: 0.5} | 477 | m_Pivot: {x: 0.5, y: 0.5} |
346 | ---- !u!222 &1921699574450549583 | 478 | +--- !u!222 &2032603902050556834 |
347 | CanvasRenderer: | 479 | CanvasRenderer: |
348 | m_ObjectHideFlags: 0 | 480 | m_ObjectHideFlags: 0 |
349 | m_CorrespondingSourceObject: {fileID: 0} | 481 | m_CorrespondingSourceObject: {fileID: 0} |
350 | m_PrefabInstance: {fileID: 0} | 482 | m_PrefabInstance: {fileID: 0} |
351 | m_PrefabAsset: {fileID: 0} | 483 | m_PrefabAsset: {fileID: 0} |
352 | - m_GameObject: {fileID: 8100171906994039130} | 484 | + m_GameObject: {fileID: 6833234817920992900} |
353 | m_CullTransparentMesh: 1 | 485 | m_CullTransparentMesh: 1 |
354 | ---- !u!114 &1658423591852421245 | 486 | +--- !u!114 &4806992368488562460 |
355 | MonoBehaviour: | 487 | MonoBehaviour: |
356 | m_ObjectHideFlags: 0 | 488 | m_ObjectHideFlags: 0 |
357 | m_CorrespondingSourceObject: {fileID: 0} | 489 | m_CorrespondingSourceObject: {fileID: 0} |
358 | m_PrefabInstance: {fileID: 0} | 490 | m_PrefabInstance: {fileID: 0} |
359 | m_PrefabAsset: {fileID: 0} | 491 | m_PrefabAsset: {fileID: 0} |
360 | - m_GameObject: {fileID: 8100171906994039130} | 492 | + m_GameObject: {fileID: 6833234817920992900} |
361 | m_Enabled: 1 | 493 | m_Enabled: 1 |
362 | m_EditorHideFlags: 0 | 494 | m_EditorHideFlags: 0 |
363 | - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} | 495 | + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
364 | m_Name: | 496 | m_Name: |
365 | m_EditorClassIdentifier: | 497 | m_EditorClassIdentifier: |
366 | m_Material: {fileID: 0} | 498 | m_Material: {fileID: 0} |
@@ -371,10 +503,13 @@ MonoBehaviour: | @@ -371,10 +503,13 @@ MonoBehaviour: | ||
371 | m_OnCullStateChanged: | 503 | m_OnCullStateChanged: |
372 | m_PersistentCalls: | 504 | m_PersistentCalls: |
373 | m_Calls: [] | 505 | m_Calls: [] |
374 | - m_Texture: {fileID: 0} | ||
375 | - m_UVRect: | ||
376 | - serializedVersion: 2 | ||
377 | - x: 0 | ||
378 | - y: 0 | ||
379 | - width: 1 | ||
380 | - height: 1 | 506 | + m_Sprite: {fileID: 21300000, guid: 083e2089cef484132a948782da596865, type: 3} |
507 | + m_Type: 0 | ||
508 | + m_PreserveAspect: 0 | ||
509 | + m_FillCenter: 1 | ||
510 | + m_FillMethod: 4 | ||
511 | + m_FillAmount: 1 | ||
512 | + m_FillClockwise: 1 | ||
513 | + m_FillOrigin: 0 | ||
514 | + m_UseSpriteMesh: 0 | ||
515 | + m_PixelsPerUnitMultiplier: 1 |
-
Please register or login to post a comment