Showing
14 changed files
with
599 additions
and
234 deletions
Assets/LocalImage/DividingLine.png
0 → 100644

157 Bytes
Assets/LocalImage/DividingLine.png.meta
0 → 100644
1 | +fileFormatVersion: 2 | ||
2 | +guid: 7a419cbf6ed6240c7b3884642cb6d8d3 | ||
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: |
@@ -189,7 +189,7 @@ MonoBehaviour: | @@ -189,7 +189,7 @@ MonoBehaviour: | ||
189 | m_Calls: [] | 189 | m_Calls: [] |
190 | m_FontData: | 190 | m_FontData: |
191 | m_Font: {fileID: 12800000, guid: c6a71e3121d16464388401e56edb98c6, type: 3} | 191 | m_Font: {fileID: 12800000, guid: c6a71e3121d16464388401e56edb98c6, type: 3} |
192 | - m_FontSize: 39 | 192 | + m_FontSize: 35 |
193 | m_FontStyle: 0 | 193 | m_FontStyle: 0 |
194 | m_BestFit: 0 | 194 | m_BestFit: 0 |
195 | m_MinSize: 3 | 195 | m_MinSize: 3 |
@@ -318,7 +318,7 @@ RectTransform: | @@ -318,7 +318,7 @@ RectTransform: | ||
318 | m_GameObject: {fileID: 124841737} | 318 | m_GameObject: {fileID: 124841737} |
319 | m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | 319 | m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
320 | m_LocalPosition: {x: 0, y: 0, z: 0} | 320 | m_LocalPosition: {x: 0, y: 0, z: 0} |
321 | - m_LocalScale: {x: 0.95, y: 0.95, z: 1} | 321 | + m_LocalScale: {x: 1, y: 1, z: 1} |
322 | m_ConstrainProportionsScale: 0 | 322 | m_ConstrainProportionsScale: 0 |
323 | m_Children: [] | 323 | m_Children: [] |
324 | m_Father: {fileID: 936019489} | 324 | m_Father: {fileID: 936019489} |
@@ -326,7 +326,7 @@ RectTransform: | @@ -326,7 +326,7 @@ RectTransform: | ||
326 | m_AnchorMin: {x: 0, y: 0} | 326 | m_AnchorMin: {x: 0, y: 0} |
327 | m_AnchorMax: {x: 1, y: 1} | 327 | m_AnchorMax: {x: 1, y: 1} |
328 | m_AnchoredPosition: {x: 0, y: 0} | 328 | m_AnchoredPosition: {x: 0, y: 0} |
329 | - m_SizeDelta: {x: 0, y: 0} | 329 | + m_SizeDelta: {x: -40, y: -40} |
330 | m_Pivot: {x: 0.5, y: 0.5} | 330 | m_Pivot: {x: 0.5, y: 0.5} |
331 | --- !u!114 &124841739 | 331 | --- !u!114 &124841739 |
332 | MonoBehaviour: | 332 | MonoBehaviour: |
@@ -400,7 +400,7 @@ RectTransform: | @@ -400,7 +400,7 @@ RectTransform: | ||
400 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 400 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
401 | m_AnchorMin: {x: 0.5, y: 0.5} | 401 | m_AnchorMin: {x: 0.5, y: 0.5} |
402 | m_AnchorMax: {x: 0.5, y: 0.5} | 402 | m_AnchorMax: {x: 0.5, y: 0.5} |
403 | - m_AnchoredPosition: {x: -480, y: 60} | 403 | + m_AnchoredPosition: {x: -444, y: 60} |
404 | m_SizeDelta: {x: 210.91, y: 59.647} | 404 | m_SizeDelta: {x: 210.91, y: 59.647} |
405 | m_Pivot: {x: 0.5, y: 0.5} | 405 | m_Pivot: {x: 0.5, y: 0.5} |
406 | --- !u!114 &131210203 | 406 | --- !u!114 &131210203 |
@@ -450,8 +450,8 @@ MonoBehaviour: | @@ -450,8 +450,8 @@ MonoBehaviour: | ||
450 | m_faceColor: | 450 | m_faceColor: |
451 | serializedVersion: 2 | 451 | serializedVersion: 2 |
452 | rgba: 4294967295 | 452 | rgba: 4294967295 |
453 | - m_fontSize: 49 | ||
454 | - m_fontSizeBase: 49 | 453 | + m_fontSize: 45 |
454 | + m_fontSizeBase: 45 | ||
455 | m_fontWeight: 400 | 455 | m_fontWeight: 400 |
456 | m_enableAutoSizing: 0 | 456 | m_enableAutoSizing: 0 |
457 | m_fontSizeMin: 18 | 457 | m_fontSizeMin: 18 |
@@ -1079,81 +1079,6 @@ Transform: | @@ -1079,81 +1079,6 @@ Transform: | ||
1079 | m_Children: [] | 1079 | m_Children: [] |
1080 | m_Father: {fileID: 0} | 1080 | m_Father: {fileID: 0} |
1081 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1081 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1082 | ---- !u!1 &781940172 | ||
1083 | -GameObject: | ||
1084 | - m_ObjectHideFlags: 0 | ||
1085 | - m_CorrespondingSourceObject: {fileID: 0} | ||
1086 | - m_PrefabInstance: {fileID: 0} | ||
1087 | - m_PrefabAsset: {fileID: 0} | ||
1088 | - serializedVersion: 6 | ||
1089 | - m_Component: | ||
1090 | - - component: {fileID: 781940173} | ||
1091 | - - component: {fileID: 781940175} | ||
1092 | - - component: {fileID: 781940174} | ||
1093 | - m_Layer: 5 | ||
1094 | - m_Name: Logo | ||
1095 | - m_TagString: Untagged | ||
1096 | - m_Icon: {fileID: 0} | ||
1097 | - m_NavMeshLayer: 0 | ||
1098 | - m_StaticEditorFlags: 0 | ||
1099 | - m_IsActive: 1 | ||
1100 | ---- !u!224 &781940173 | ||
1101 | -RectTransform: | ||
1102 | - m_ObjectHideFlags: 0 | ||
1103 | - m_CorrespondingSourceObject: {fileID: 0} | ||
1104 | - m_PrefabInstance: {fileID: 0} | ||
1105 | - m_PrefabAsset: {fileID: 0} | ||
1106 | - m_GameObject: {fileID: 781940172} | ||
1107 | - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
1108 | - m_LocalPosition: {x: 0, y: 0, z: 0} | ||
1109 | - m_LocalScale: {x: 0.9, y: 0.9, z: 1} | ||
1110 | - m_ConstrainProportionsScale: 0 | ||
1111 | - m_Children: [] | ||
1112 | - m_Father: {fileID: 936019489} | ||
1113 | - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
1114 | - m_AnchorMin: {x: 0.5, y: 1} | ||
1115 | - m_AnchorMax: {x: 0.5, y: 1} | ||
1116 | - m_AnchoredPosition: {x: 305, y: -143} | ||
1117 | - m_SizeDelta: {x: 273.848, y: 207.68982} | ||
1118 | - m_Pivot: {x: 0.5, y: 0.5} | ||
1119 | ---- !u!114 &781940174 | ||
1120 | -MonoBehaviour: | ||
1121 | - m_ObjectHideFlags: 0 | ||
1122 | - m_CorrespondingSourceObject: {fileID: 0} | ||
1123 | - m_PrefabInstance: {fileID: 0} | ||
1124 | - m_PrefabAsset: {fileID: 0} | ||
1125 | - m_GameObject: {fileID: 781940172} | ||
1126 | - m_Enabled: 1 | ||
1127 | - m_EditorHideFlags: 0 | ||
1128 | - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||
1129 | - m_Name: | ||
1130 | - m_EditorClassIdentifier: | ||
1131 | - m_Material: {fileID: 0} | ||
1132 | - m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
1133 | - m_RaycastTarget: 1 | ||
1134 | - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
1135 | - m_Maskable: 1 | ||
1136 | - m_OnCullStateChanged: | ||
1137 | - m_PersistentCalls: | ||
1138 | - m_Calls: [] | ||
1139 | - m_Sprite: {fileID: 0} | ||
1140 | - m_Type: 0 | ||
1141 | - m_PreserveAspect: 0 | ||
1142 | - m_FillCenter: 1 | ||
1143 | - m_FillMethod: 4 | ||
1144 | - m_FillAmount: 1 | ||
1145 | - m_FillClockwise: 1 | ||
1146 | - m_FillOrigin: 0 | ||
1147 | - m_UseSpriteMesh: 0 | ||
1148 | - m_PixelsPerUnitMultiplier: 1 | ||
1149 | ---- !u!222 &781940175 | ||
1150 | -CanvasRenderer: | ||
1151 | - m_ObjectHideFlags: 0 | ||
1152 | - m_CorrespondingSourceObject: {fileID: 0} | ||
1153 | - m_PrefabInstance: {fileID: 0} | ||
1154 | - m_PrefabAsset: {fileID: 0} | ||
1155 | - m_GameObject: {fileID: 781940172} | ||
1156 | - m_CullTransparentMesh: 1 | ||
1157 | --- !u!1 &836977636 | 1082 | --- !u!1 &836977636 |
1158 | GameObject: | 1083 | GameObject: |
1159 | m_ObjectHideFlags: 0 | 1084 | m_ObjectHideFlags: 0 |
@@ -1188,8 +1113,8 @@ RectTransform: | @@ -1188,8 +1113,8 @@ RectTransform: | ||
1188 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1113 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1189 | m_AnchorMin: {x: 0.5, y: 0.5} | 1114 | m_AnchorMin: {x: 0.5, y: 0.5} |
1190 | m_AnchorMax: {x: 0.5, y: 0.5} | 1115 | m_AnchorMax: {x: 0.5, y: 0.5} |
1191 | - m_AnchoredPosition: {x: 249.82, y: 4} | ||
1192 | - m_SizeDelta: {x: 1100.4, y: 151.5492} | 1116 | + m_AnchoredPosition: {x: 267.81, y: 4} |
1117 | + m_SizeDelta: {x: 1064.4, y: 151.5492} | ||
1193 | m_Pivot: {x: 0.5, y: 0.5} | 1118 | m_Pivot: {x: 0.5, y: 0.5} |
1194 | --- !u!114 &836977638 | 1119 | --- !u!114 &836977638 |
1195 | MonoBehaviour: | 1120 | MonoBehaviour: |
@@ -1319,8 +1244,8 @@ RectTransform: | @@ -1319,8 +1244,8 @@ RectTransform: | ||
1319 | m_ConstrainProportionsScale: 0 | 1244 | m_ConstrainProportionsScale: 0 |
1320 | m_Children: | 1245 | m_Children: |
1321 | - {fileID: 124841738} | 1246 | - {fileID: 124841738} |
1322 | - - {fileID: 781940173} | ||
1323 | - - {fileID: 1936008334} | 1247 | + - {fileID: 1015053100} |
1248 | + - {fileID: 1480902996} | ||
1324 | m_Father: {fileID: 1150663700} | 1249 | m_Father: {fileID: 1150663700} |
1325 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1250 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1326 | m_AnchorMin: {x: 0, y: 1} | 1251 | m_AnchorMin: {x: 0, y: 1} |
@@ -1562,6 +1487,81 @@ CanvasRenderer: | @@ -1562,6 +1487,81 @@ CanvasRenderer: | ||
1562 | m_PrefabAsset: {fileID: 0} | 1487 | m_PrefabAsset: {fileID: 0} |
1563 | m_GameObject: {fileID: 990358361} | 1488 | m_GameObject: {fileID: 990358361} |
1564 | m_CullTransparentMesh: 1 | 1489 | m_CullTransparentMesh: 1 |
1490 | +--- !u!1 &1015053099 | ||
1491 | +GameObject: | ||
1492 | + m_ObjectHideFlags: 0 | ||
1493 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1494 | + m_PrefabInstance: {fileID: 0} | ||
1495 | + m_PrefabAsset: {fileID: 0} | ||
1496 | + serializedVersion: 6 | ||
1497 | + m_Component: | ||
1498 | + - component: {fileID: 1015053100} | ||
1499 | + - component: {fileID: 1015053102} | ||
1500 | + - component: {fileID: 1015053101} | ||
1501 | + m_Layer: 5 | ||
1502 | + m_Name: Logo | ||
1503 | + m_TagString: Untagged | ||
1504 | + m_Icon: {fileID: 0} | ||
1505 | + m_NavMeshLayer: 0 | ||
1506 | + m_StaticEditorFlags: 0 | ||
1507 | + m_IsActive: 1 | ||
1508 | +--- !u!224 &1015053100 | ||
1509 | +RectTransform: | ||
1510 | + m_ObjectHideFlags: 0 | ||
1511 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1512 | + m_PrefabInstance: {fileID: 0} | ||
1513 | + m_PrefabAsset: {fileID: 0} | ||
1514 | + m_GameObject: {fileID: 1015053099} | ||
1515 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
1516 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
1517 | + m_LocalScale: {x: 0.9, y: 0.9, z: 1} | ||
1518 | + m_ConstrainProportionsScale: 0 | ||
1519 | + m_Children: [] | ||
1520 | + m_Father: {fileID: 936019489} | ||
1521 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
1522 | + m_AnchorMin: {x: 1, y: 1} | ||
1523 | + m_AnchorMax: {x: 1, y: 1} | ||
1524 | + m_AnchoredPosition: {x: -144, y: -139} | ||
1525 | + m_SizeDelta: {x: 230, y: 195} | ||
1526 | + m_Pivot: {x: 0.5, y: 0.5} | ||
1527 | +--- !u!114 &1015053101 | ||
1528 | +MonoBehaviour: | ||
1529 | + m_ObjectHideFlags: 0 | ||
1530 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1531 | + m_PrefabInstance: {fileID: 0} | ||
1532 | + m_PrefabAsset: {fileID: 0} | ||
1533 | + m_GameObject: {fileID: 1015053099} | ||
1534 | + m_Enabled: 1 | ||
1535 | + m_EditorHideFlags: 0 | ||
1536 | + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||
1537 | + m_Name: | ||
1538 | + m_EditorClassIdentifier: | ||
1539 | + m_Material: {fileID: 0} | ||
1540 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
1541 | + m_RaycastTarget: 1 | ||
1542 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
1543 | + m_Maskable: 1 | ||
1544 | + m_OnCullStateChanged: | ||
1545 | + m_PersistentCalls: | ||
1546 | + m_Calls: [] | ||
1547 | + m_Sprite: {fileID: 0} | ||
1548 | + m_Type: 0 | ||
1549 | + m_PreserveAspect: 0 | ||
1550 | + m_FillCenter: 1 | ||
1551 | + m_FillMethod: 4 | ||
1552 | + m_FillAmount: 1 | ||
1553 | + m_FillClockwise: 1 | ||
1554 | + m_FillOrigin: 0 | ||
1555 | + m_UseSpriteMesh: 0 | ||
1556 | + m_PixelsPerUnitMultiplier: 1 | ||
1557 | +--- !u!222 &1015053102 | ||
1558 | +CanvasRenderer: | ||
1559 | + m_ObjectHideFlags: 0 | ||
1560 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1561 | + m_PrefabInstance: {fileID: 0} | ||
1562 | + m_PrefabAsset: {fileID: 0} | ||
1563 | + m_GameObject: {fileID: 1015053099} | ||
1564 | + m_CullTransparentMesh: 1 | ||
1565 | --- !u!1 &1118089996 | 1565 | --- !u!1 &1118089996 |
1566 | GameObject: | 1566 | GameObject: |
1567 | m_ObjectHideFlags: 0 | 1567 | m_ObjectHideFlags: 0 |
@@ -1934,7 +1934,7 @@ RectTransform: | @@ -1934,7 +1934,7 @@ RectTransform: | ||
1934 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1934 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1935 | m_AnchorMin: {x: 0.5, y: 0.5} | 1935 | m_AnchorMin: {x: 0.5, y: 0.5} |
1936 | m_AnchorMax: {x: 0.5, y: 0.5} | 1936 | m_AnchorMax: {x: 0.5, y: 0.5} |
1937 | - m_AnchoredPosition: {x: -233, y: -981} | 1937 | + m_AnchoredPosition: {x: -202, y: -981} |
1938 | m_SizeDelta: {x: 1080, y: 111} | 1938 | m_SizeDelta: {x: 1080, y: 111} |
1939 | m_Pivot: {x: 0.5, y: 0.5} | 1939 | m_Pivot: {x: 0.5, y: 0.5} |
1940 | --- !u!1 &1272724534 | 1940 | --- !u!1 &1272724534 |
@@ -2218,7 +2218,7 @@ RectTransform: | @@ -2218,7 +2218,7 @@ RectTransform: | ||
2218 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 2218 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2219 | m_AnchorMin: {x: 0, y: 1} | 2219 | m_AnchorMin: {x: 0, y: 1} |
2220 | m_AnchorMax: {x: 0, y: 1} | 2220 | m_AnchorMax: {x: 0, y: 1} |
2221 | - m_AnchoredPosition: {x: 121, y: -135} | 2221 | + m_AnchoredPosition: {x: 82, y: -135} |
2222 | m_SizeDelta: {x: 31, y: 58} | 2222 | m_SizeDelta: {x: 31, y: 58} |
2223 | m_Pivot: {x: 0.5, y: 0.5} | 2223 | m_Pivot: {x: 0.5, y: 0.5} |
2224 | --- !u!114 &1345160285 | 2224 | --- !u!114 &1345160285 |
@@ -2319,7 +2319,7 @@ GameObject: | @@ -2319,7 +2319,7 @@ GameObject: | ||
2319 | m_Icon: {fileID: 0} | 2319 | m_Icon: {fileID: 0} |
2320 | m_NavMeshLayer: 0 | 2320 | m_NavMeshLayer: 0 |
2321 | m_StaticEditorFlags: 0 | 2321 | m_StaticEditorFlags: 0 |
2322 | - m_IsActive: 0 | 2322 | + m_IsActive: 1 |
2323 | --- !u!224 &1347929217 | 2323 | --- !u!224 &1347929217 |
2324 | RectTransform: | 2324 | RectTransform: |
2325 | m_ObjectHideFlags: 0 | 2325 | m_ObjectHideFlags: 0 |
@@ -2396,8 +2396,8 @@ RectTransform: | @@ -2396,8 +2396,8 @@ RectTransform: | ||
2396 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 2396 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2397 | m_AnchorMin: {x: 0.5, y: 0.5} | 2397 | m_AnchorMin: {x: 0.5, y: 0.5} |
2398 | m_AnchorMax: {x: 0.5, y: 0.5} | 2398 | m_AnchorMax: {x: 0.5, y: 0.5} |
2399 | - m_AnchoredPosition: {x: -428.1069, y: -4} | ||
2400 | - m_SizeDelta: {x: 314.7062, y: 73.59} | 2399 | + m_AnchoredPosition: {x: -406.92, y: -5.8525} |
2400 | + m_SizeDelta: {x: 285.07, y: 77.295} | ||
2401 | m_Pivot: {x: 0.5, y: 0.5} | 2401 | m_Pivot: {x: 0.5, y: 0.5} |
2402 | --- !u!114 &1447955075 | 2402 | --- !u!114 &1447955075 |
2403 | MonoBehaviour: | 2403 | MonoBehaviour: |
@@ -2428,8 +2428,8 @@ MonoBehaviour: | @@ -2428,8 +2428,8 @@ MonoBehaviour: | ||
2428 | m_fontMaterials: [] | 2428 | m_fontMaterials: [] |
2429 | m_fontColor32: | 2429 | m_fontColor32: |
2430 | serializedVersion: 2 | 2430 | serializedVersion: 2 |
2431 | - rgba: 4294967295 | ||
2432 | - m_fontColor: {r: 1, g: 1, b: 1, a: 1} | 2431 | + rgba: 4290427578 |
2432 | + m_fontColor: {r: 0.7294118, g: 0.7294118, b: 0.7294118, a: 1} | ||
2433 | m_enableVertexGradient: 0 | 2433 | m_enableVertexGradient: 0 |
2434 | m_colorMode: 3 | 2434 | m_colorMode: 3 |
2435 | m_fontColorGradient: | 2435 | m_fontColorGradient: |
@@ -2446,8 +2446,8 @@ MonoBehaviour: | @@ -2446,8 +2446,8 @@ MonoBehaviour: | ||
2446 | m_faceColor: | 2446 | m_faceColor: |
2447 | serializedVersion: 2 | 2447 | serializedVersion: 2 |
2448 | rgba: 4294967295 | 2448 | rgba: 4294967295 |
2449 | - m_fontSize: 35 | ||
2450 | - m_fontSizeBase: 35 | 2449 | + m_fontSize: 30 |
2450 | + m_fontSizeBase: 30 | ||
2451 | m_fontWeight: 400 | 2451 | m_fontWeight: 400 |
2452 | m_enableAutoSizing: 0 | 2452 | m_enableAutoSizing: 0 |
2453 | m_fontSizeMin: 18 | 2453 | m_fontSizeMin: 18 |
@@ -2649,6 +2649,77 @@ RectTransform: | @@ -2649,6 +2649,77 @@ RectTransform: | ||
2649 | m_AnchoredPosition: {x: 0, y: 0} | 2649 | m_AnchoredPosition: {x: 0, y: 0} |
2650 | m_SizeDelta: {x: 0, y: 0} | 2650 | m_SizeDelta: {x: 0, y: 0} |
2651 | m_Pivot: {x: 0, y: 0} | 2651 | m_Pivot: {x: 0, y: 0} |
2652 | +--- !u!1 &1480902995 | ||
2653 | +GameObject: | ||
2654 | + m_ObjectHideFlags: 0 | ||
2655 | + m_CorrespondingSourceObject: {fileID: 0} | ||
2656 | + m_PrefabInstance: {fileID: 0} | ||
2657 | + m_PrefabAsset: {fileID: 0} | ||
2658 | + serializedVersion: 6 | ||
2659 | + m_Component: | ||
2660 | + - component: {fileID: 1480902996} | ||
2661 | + - component: {fileID: 1480902998} | ||
2662 | + - component: {fileID: 1480902997} | ||
2663 | + m_Layer: 5 | ||
2664 | + m_Name: TimeContainer | ||
2665 | + m_TagString: Untagged | ||
2666 | + m_Icon: {fileID: 0} | ||
2667 | + m_NavMeshLayer: 0 | ||
2668 | + m_StaticEditorFlags: 0 | ||
2669 | + m_IsActive: 1 | ||
2670 | +--- !u!224 &1480902996 | ||
2671 | +RectTransform: | ||
2672 | + m_ObjectHideFlags: 0 | ||
2673 | + m_CorrespondingSourceObject: {fileID: 0} | ||
2674 | + m_PrefabInstance: {fileID: 0} | ||
2675 | + m_PrefabAsset: {fileID: 0} | ||
2676 | + m_GameObject: {fileID: 1480902995} | ||
2677 | + m_LocalRotation: {x: -0, y: -0, z: -0.043619405, w: 0.9990483} | ||
2678 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
2679 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
2680 | + m_ConstrainProportionsScale: 0 | ||
2681 | + m_Children: [] | ||
2682 | + m_Father: {fileID: 936019489} | ||
2683 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5} | ||
2684 | + m_AnchorMin: {x: 1, y: 1} | ||
2685 | + m_AnchorMax: {x: 1, y: 1} | ||
2686 | + m_AnchoredPosition: {x: -165, y: -273} | ||
2687 | + m_SizeDelta: {x: 241, y: 81} | ||
2688 | + m_Pivot: {x: 0.5, y: 0.5} | ||
2689 | +--- !u!114 &1480902997 | ||
2690 | +MonoBehaviour: | ||
2691 | + m_ObjectHideFlags: 0 | ||
2692 | + m_CorrespondingSourceObject: {fileID: 0} | ||
2693 | + m_PrefabInstance: {fileID: 0} | ||
2694 | + m_PrefabAsset: {fileID: 0} | ||
2695 | + m_GameObject: {fileID: 1480902995} | ||
2696 | + m_Enabled: 1 | ||
2697 | + m_EditorHideFlags: 0 | ||
2698 | + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} | ||
2699 | + m_Name: | ||
2700 | + m_EditorClassIdentifier: | ||
2701 | + m_Padding: | ||
2702 | + m_Left: 0 | ||
2703 | + m_Right: 0 | ||
2704 | + m_Top: 0 | ||
2705 | + m_Bottom: 0 | ||
2706 | + m_ChildAlignment: 0 | ||
2707 | + m_Spacing: 0 | ||
2708 | + m_ChildForceExpandWidth: 1 | ||
2709 | + m_ChildForceExpandHeight: 1 | ||
2710 | + m_ChildControlWidth: 1 | ||
2711 | + m_ChildControlHeight: 1 | ||
2712 | + m_ChildScaleWidth: 0 | ||
2713 | + m_ChildScaleHeight: 0 | ||
2714 | + m_ReverseArrangement: 0 | ||
2715 | +--- !u!222 &1480902998 | ||
2716 | +CanvasRenderer: | ||
2717 | + m_ObjectHideFlags: 0 | ||
2718 | + m_CorrespondingSourceObject: {fileID: 0} | ||
2719 | + m_PrefabInstance: {fileID: 0} | ||
2720 | + m_PrefabAsset: {fileID: 0} | ||
2721 | + m_GameObject: {fileID: 1480902995} | ||
2722 | + m_CullTransparentMesh: 1 | ||
2652 | --- !u!1 &1539898517 | 2723 | --- !u!1 &1539898517 |
2653 | GameObject: | 2724 | GameObject: |
2654 | m_ObjectHideFlags: 0 | 2725 | m_ObjectHideFlags: 0 |
@@ -2793,8 +2864,8 @@ MonoBehaviour: | @@ -2793,8 +2864,8 @@ MonoBehaviour: | ||
2793 | imageContainer: {fileID: 936019490} | 2864 | imageContainer: {fileID: 936019490} |
2794 | fullImage: {fileID: 124841739} | 2865 | fullImage: {fileID: 124841739} |
2795 | contentTextMeshProUGUI: {fileID: 990358363} | 2866 | contentTextMeshProUGUI: {fileID: 990358363} |
2796 | - logoImage: {fileID: 781940174} | ||
2797 | - timeGrid: {fileID: 1936008334} | 2867 | + logoImage: {fileID: 1015053101} |
2868 | + timeGrid: {fileID: 1480902996} | ||
2798 | timePrefab: {fileID: 1843196218304166739, guid: 710868c67f85d4fa0842d7f459d3172c, type: 3} | 2869 | timePrefab: {fileID: 1843196218304166739, guid: 710868c67f85d4fa0842d7f459d3172c, type: 3} |
2799 | --- !u!114 &1539898524 | 2870 | --- !u!114 &1539898524 |
2800 | MonoBehaviour: | 2871 | MonoBehaviour: |
@@ -3041,7 +3112,7 @@ Light: | @@ -3041,7 +3112,7 @@ Light: | ||
3041 | m_BounceIntensity: 1 | 3112 | m_BounceIntensity: 1 |
3042 | m_ColorTemperature: 6570 | 3113 | m_ColorTemperature: 6570 |
3043 | m_UseColorTemperature: 0 | 3114 | m_UseColorTemperature: 0 |
3044 | - m_BoundingSphereOverride: {x: 0, y: NaN, z: 1.02e-43, w: 1.4e-43} | 3115 | + m_BoundingSphereOverride: {x: 0, y: 6e-44, z: 6.7e-44, w: 4.428e-42} |
3045 | m_UseBoundingSphereOverride: 0 | 3116 | m_UseBoundingSphereOverride: 0 |
3046 | m_UseViewFrustumForShadowCasterCull: 1 | 3117 | m_UseViewFrustumForShadowCasterCull: 1 |
3047 | m_ShadowRadius: 0 | 3118 | m_ShadowRadius: 0 |
@@ -3143,77 +3214,6 @@ MonoBehaviour: | @@ -3143,77 +3214,6 @@ MonoBehaviour: | ||
3143 | m_OnClick: | 3214 | m_OnClick: |
3144 | m_PersistentCalls: | 3215 | m_PersistentCalls: |
3145 | m_Calls: [] | 3216 | m_Calls: [] |
3146 | ---- !u!1 &1936008333 | ||
3147 | -GameObject: | ||
3148 | - m_ObjectHideFlags: 0 | ||
3149 | - m_CorrespondingSourceObject: {fileID: 0} | ||
3150 | - m_PrefabInstance: {fileID: 0} | ||
3151 | - m_PrefabAsset: {fileID: 0} | ||
3152 | - serializedVersion: 6 | ||
3153 | - m_Component: | ||
3154 | - - component: {fileID: 1936008334} | ||
3155 | - - component: {fileID: 1936008336} | ||
3156 | - - component: {fileID: 1936008335} | ||
3157 | - m_Layer: 5 | ||
3158 | - m_Name: TimeContainer | ||
3159 | - m_TagString: Untagged | ||
3160 | - m_Icon: {fileID: 0} | ||
3161 | - m_NavMeshLayer: 0 | ||
3162 | - m_StaticEditorFlags: 0 | ||
3163 | - m_IsActive: 1 | ||
3164 | ---- !u!224 &1936008334 | ||
3165 | -RectTransform: | ||
3166 | - m_ObjectHideFlags: 0 | ||
3167 | - m_CorrespondingSourceObject: {fileID: 0} | ||
3168 | - m_PrefabInstance: {fileID: 0} | ||
3169 | - m_PrefabAsset: {fileID: 0} | ||
3170 | - m_GameObject: {fileID: 1936008333} | ||
3171 | - m_LocalRotation: {x: -0, y: -0, z: -0.043619405, w: 0.9990483} | ||
3172 | - m_LocalPosition: {x: 0, y: 0, z: 0} | ||
3173 | - m_LocalScale: {x: 1, y: 1, z: 1} | ||
3174 | - m_ConstrainProportionsScale: 0 | ||
3175 | - m_Children: [] | ||
3176 | - m_Father: {fileID: 936019489} | ||
3177 | - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5} | ||
3178 | - m_AnchorMin: {x: 0.5, y: 1} | ||
3179 | - m_AnchorMax: {x: 0.5, y: 1} | ||
3180 | - m_AnchoredPosition: {x: 300, y: -284} | ||
3181 | - m_SizeDelta: {x: 280.1069, y: 71.40619} | ||
3182 | - m_Pivot: {x: 0.5, y: 0.5} | ||
3183 | ---- !u!114 &1936008335 | ||
3184 | -MonoBehaviour: | ||
3185 | - m_ObjectHideFlags: 0 | ||
3186 | - m_CorrespondingSourceObject: {fileID: 0} | ||
3187 | - m_PrefabInstance: {fileID: 0} | ||
3188 | - m_PrefabAsset: {fileID: 0} | ||
3189 | - m_GameObject: {fileID: 1936008333} | ||
3190 | - m_Enabled: 1 | ||
3191 | - m_EditorHideFlags: 0 | ||
3192 | - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} | ||
3193 | - m_Name: | ||
3194 | - m_EditorClassIdentifier: | ||
3195 | - m_Padding: | ||
3196 | - m_Left: 0 | ||
3197 | - m_Right: 0 | ||
3198 | - m_Top: 0 | ||
3199 | - m_Bottom: 0 | ||
3200 | - m_ChildAlignment: 0 | ||
3201 | - m_Spacing: 0 | ||
3202 | - m_ChildForceExpandWidth: 1 | ||
3203 | - m_ChildForceExpandHeight: 1 | ||
3204 | - m_ChildControlWidth: 1 | ||
3205 | - m_ChildControlHeight: 1 | ||
3206 | - m_ChildScaleWidth: 0 | ||
3207 | - m_ChildScaleHeight: 0 | ||
3208 | - m_ReverseArrangement: 0 | ||
3209 | ---- !u!222 &1936008336 | ||
3210 | -CanvasRenderer: | ||
3211 | - m_ObjectHideFlags: 0 | ||
3212 | - m_CorrespondingSourceObject: {fileID: 0} | ||
3213 | - m_PrefabInstance: {fileID: 0} | ||
3214 | - m_PrefabAsset: {fileID: 0} | ||
3215 | - m_GameObject: {fileID: 1936008333} | ||
3216 | - m_CullTransparentMesh: 1 | ||
3217 | --- !u!1 &2081063374 | 3217 | --- !u!1 &2081063374 |
3218 | GameObject: | 3218 | GameObject: |
3219 | m_ObjectHideFlags: 0 | 3219 | m_ObjectHideFlags: 0 |
@@ -3248,7 +3248,7 @@ RectTransform: | @@ -3248,7 +3248,7 @@ RectTransform: | ||
3248 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 3248 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
3249 | m_AnchorMin: {x: 0.5, y: 0.5} | 3249 | m_AnchorMin: {x: 0.5, y: 0.5} |
3250 | m_AnchorMax: {x: 0.5, y: 0.5} | 3250 | m_AnchorMax: {x: 0.5, y: 0.5} |
3251 | - m_AnchoredPosition: {x: -692, y: 27} | 3251 | + m_AnchoredPosition: {x: -656, y: 27} |
3252 | m_SizeDelta: {x: 143, y: 143} | 3252 | m_SizeDelta: {x: 143, y: 143} |
3253 | m_Pivot: {x: 0.5, y: 0.5} | 3253 | m_Pivot: {x: 0.5, y: 0.5} |
3254 | --- !u!114 &2081063376 | 3254 | --- !u!114 &2081063376 |
1 | +using System; | ||
2 | +using System.Collections; | ||
3 | +using System.IO; | ||
1 | using UnityEngine; | 4 | using UnityEngine; |
2 | using UnityEngine.Networking; | 5 | using UnityEngine.Networking; |
3 | using UnityEngine.UI; | 6 | using UnityEngine.UI; |
4 | -using System.Collections; | ||
5 | 7 | ||
6 | -/** | ||
7 | - * 功能描述: 网络图片加载器 | ||
8 | - * @author wangQc | ||
9 | - * @date 2025/6/4 09:16 | ||
10 | - */ | ||
11 | public static class ImageLoader | 8 | public static class ImageLoader |
12 | { | 9 | { |
13 | - public static IEnumerator LoadImage(string url, Image targetImage, System.Action<int, int> onSizeReady = null) | 10 | + /// <summary> |
11 | + /// 加载图片,支持本地缓存 | ||
12 | + /// </summary> | ||
13 | + /// <param name="url">图片地址</param> | ||
14 | + /// <param name="targetImage">目标 Image</param> | ||
15 | + /// <param name="onSizeReady">图片宽高回调</param> | ||
16 | + /// <returns></returns> | ||
17 | + public static IEnumerator LoadImage(string url, Image targetImage, Action<int, int> onSizeReady = null) | ||
14 | { | 18 | { |
15 | - using (UnityWebRequest uwr = UnityWebRequestTexture.GetTexture(url)) | 19 | + // 生成缓存文件名 |
20 | + string fileName = GetFileNameFromUrl(url); | ||
21 | + string cachePath = Path.Combine(Application.temporaryCachePath, fileName); | ||
22 | + | ||
23 | + Texture2D tex = null; | ||
24 | + | ||
25 | + // 1️⃣ 本地有缓存? | ||
26 | + if (File.Exists(cachePath)) | ||
27 | + { | ||
28 | + Debug.Log($"[ImageLoader] 加载本地缓存图片: {cachePath}"); | ||
29 | + | ||
30 | + byte[] fileData = File.ReadAllBytes(cachePath); | ||
31 | + tex = new Texture2D(2, 2); // 临时大小,LoadImage 会自动调整 | ||
32 | + tex.LoadImage(fileData); | ||
33 | + } | ||
34 | + else | ||
16 | { | 35 | { |
17 | - yield return uwr.SendWebRequest(); | 36 | + Debug.Log($"[ImageLoader] 下载图片: {url}"); |
18 | 37 | ||
19 | - if (uwr.result == UnityWebRequest.Result.Success) | 38 | + using (UnityWebRequest uwr = UnityWebRequestTexture.GetTexture(url)) |
20 | { | 39 | { |
21 | - Texture2D tex = DownloadHandlerTexture.GetContent(uwr); | 40 | + yield return uwr.SendWebRequest(); |
41 | + | ||
42 | + if (uwr.result == UnityWebRequest.Result.Success) | ||
43 | + { | ||
44 | + tex = DownloadHandlerTexture.GetContent(uwr); | ||
22 | 45 | ||
23 | - targetImage.sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f)); | 46 | + // 保存到本地缓存 |
47 | + byte[] pngData = tex.EncodeToPNG(); | ||
48 | + File.WriteAllBytes(cachePath, pngData); | ||
24 | 49 | ||
25 | - // 回调宽高 | ||
26 | - onSizeReady?.Invoke(tex.width, tex.height); | 50 | + Debug.Log($"[ImageLoader] 下载完成,已缓存到: {cachePath}"); |
51 | + } | ||
52 | + else | ||
53 | + { | ||
54 | + Debug.LogError($"[ImageLoader] 下载失败: {uwr.error}"); | ||
55 | + yield break; | ||
56 | + } | ||
27 | } | 57 | } |
28 | } | 58 | } |
59 | + | ||
60 | + // 2️⃣ 应用到 UI | ||
61 | + if (tex != null && targetImage != null) | ||
62 | + { | ||
63 | + targetImage.sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(1f, 1f)); | ||
64 | + | ||
65 | + // 回调宽高 | ||
66 | + onSizeReady?.Invoke(tex.width, tex.height); | ||
67 | + } | ||
68 | + } | ||
69 | + | ||
70 | + /// <summary> | ||
71 | + /// 从 URL 生成缓存文件名 | ||
72 | + /// </summary> | ||
73 | + private static string GetFileNameFromUrl(string url) | ||
74 | + { | ||
75 | + if (string.IsNullOrEmpty(url)) | ||
76 | + return Guid.NewGuid().ToString("N"); // 万一 URL 空,防止报错 | ||
77 | + | ||
78 | + // 取最后一个 "/" 后面的部分 | ||
79 | + string fileName = Path.GetFileName(url); | ||
80 | + | ||
81 | + // 可能带参数?比如 xxx.jpg?abc=123,去掉参数 | ||
82 | + int index = fileName.IndexOf("?", StringComparison.Ordinal); | ||
83 | + if (index >= 0) | ||
84 | + { | ||
85 | + fileName = fileName.Substring(0, index); | ||
86 | + } | ||
87 | + | ||
88 | + // 防止奇怪 URL 没扩展名,补个默认 | ||
89 | + if (string.IsNullOrEmpty(Path.GetExtension(fileName))) | ||
90 | + { | ||
91 | + fileName += ".png"; // 默认 .png | ||
92 | + } | ||
93 | + | ||
94 | + return fileName; | ||
29 | } | 95 | } |
30 | 96 | ||
31 | -} | ||
97 | +} |
@@ -58,20 +58,50 @@ public class ImageViewerManager : MonoBehaviour | @@ -58,20 +58,50 @@ public class ImageViewerManager : MonoBehaviour | ||
58 | //清空 | 58 | //清空 |
59 | fullImage.sprite = null; | 59 | fullImage.sprite = null; |
60 | 60 | ||
61 | - | ||
62 | - | ||
63 | panel.SetActive(true); | 61 | panel.SetActive(true); |
64 | 62 | ||
65 | StartCoroutine(ImageLoader.LoadImage(url, fullImage, (width, height) => { | 63 | StartCoroutine(ImageLoader.LoadImage(url, fullImage, (width, height) => { |
66 | - Debug.Log($"图片宽高 = {width} x {height}"); | ||
67 | - | ||
68 | - //三倍图 | ||
69 | - width /= 2; | ||
70 | - height /= 2; | ||
71 | - imageContainer.rectTransform.sizeDelta = new Vector2(width, height); | 64 | + Debug.Log($"图片原始宽高 = {width} x {height}"); |
72 | 65 | ||
66 | + float targetWidth = 1160f; // 目标参考宽度 | ||
67 | + float maxHeight = 2000f; // 高度最大不超过 2000 | ||
68 | + | ||
69 | + // 原图比例 | ||
70 | + float aspectRatio = (float)height / width; | ||
71 | + | ||
72 | + // 计算按目标宽度缩放后的高度 | ||
73 | + float scaledHeight = targetWidth * aspectRatio; | ||
74 | + | ||
75 | + // 当前缩放系数(默认按 targetWidth 缩放) | ||
76 | + float scale = targetWidth / width; | ||
77 | + | ||
78 | + // 如果缩放后的高度 > 2000,高度优先限制 | ||
79 | + if (scaledHeight > maxHeight) | ||
80 | + { | ||
81 | + // 按高度 2000 缩放 | ||
82 | + scale = maxHeight / height; | ||
83 | + } | ||
84 | + // 如果图片原图宽度 < 1160,放大 | ||
85 | + else if (width < targetWidth) | ||
86 | + { | ||
87 | + scale = targetWidth / width; | ||
88 | + } | ||
89 | + | ||
90 | + // 最终缩放后的宽高 | ||
91 | + float finalWidth = width * scale; | ||
92 | + float finalHeight = height * scale; | ||
93 | + | ||
94 | + // 应用 sizeDelta | ||
95 | + imageContainer.rectTransform.sizeDelta = new Vector2(finalWidth, finalHeight); | ||
96 | + | ||
97 | + Debug.Log($"最终显示宽高 = {finalWidth} x {finalHeight}"); | ||
98 | + | ||
99 | + // 加载 logo | ||
73 | StartCoroutine(ImageLoader.LoadImage(logo, logoImage)); | 100 | StartCoroutine(ImageLoader.LoadImage(logo, logoImage)); |
101 | + //logo根据图片大小缩放比例 | ||
102 | + // logoImage.rectTransform.sizeDelta = new Vector2(finalHeight * 0.2f, finalHeight * 0.1f); | ||
74 | })); | 103 | })); |
104 | + | ||
75 | 105 | ||
76 | //时间 | 106 | //时间 |
77 | foreach (Transform child in timeGrid) | 107 | foreach (Transform child in timeGrid) |
@@ -356,7 +356,7 @@ public class MomentItem : MonoBehaviour | @@ -356,7 +356,7 @@ public class MomentItem : MonoBehaviour | ||
356 | LoadComments(moment.comments); | 356 | LoadComments(moment.comments); |
357 | momentHeight+= moment.comments.Count*line; | 357 | momentHeight+= moment.comments.Count*line; |
358 | 358 | ||
359 | - return momentHeight+400; | 359 | + return momentHeight+500; |
360 | } | 360 | } |
361 | 361 | ||
362 | 362 |
1 | using UnityEngine; | 1 | using UnityEngine; |
2 | using UnityEngine.UI; | 2 | using UnityEngine.UI; |
3 | using System.Collections.Generic; | 3 | using System.Collections.Generic; |
4 | +using System.IO; | ||
4 | 5 | ||
5 | //朋友圈动态管理器 | 6 | //朋友圈动态管理器 |
6 | public class MomentManager : MonoBehaviour | 7 | public class MomentManager : MonoBehaviour |
@@ -62,7 +63,32 @@ public class MomentManager : MonoBehaviour | @@ -62,7 +63,32 @@ public class MomentManager : MonoBehaviour | ||
62 | RectTransform scrollContentRt = contentParent.parent.GetComponent<RectTransform>(); | 63 | RectTransform scrollContentRt = contentParent.parent.GetComponent<RectTransform>(); |
63 | scrollContentRt.sizeDelta = | 64 | scrollContentRt.sizeDelta = |
64 | new Vector2(scrollContentRt.sizeDelta.x, coverHeight + momentListHeight + bottomHeight); | 65 | new Vector2(scrollContentRt.sizeDelta.x, coverHeight + momentListHeight + bottomHeight); |
66 | + } | ||
67 | + | ||
68 | + private void OnApplicationQuit() | ||
69 | + { | ||
70 | + ClearTemporaryCache(); | ||
71 | + } | ||
65 | 72 | ||
73 | + private void ClearTemporaryCache() | ||
74 | + { | ||
75 | + string cachePath = Application.temporaryCachePath; | ||
66 | 76 | ||
77 | + if (Directory.Exists(cachePath)) | ||
78 | + { | ||
79 | + try | ||
80 | + { | ||
81 | + Directory.Delete(cachePath, true); | ||
82 | + Debug.Log($"[CacheCleaner] 清空缓存目录成功: {cachePath}"); | ||
83 | + } | ||
84 | + catch (System.Exception e) | ||
85 | + { | ||
86 | + Debug.LogError($"[CacheCleaner] 清空缓存目录失败: {e.Message}"); | ||
87 | + } | ||
88 | + } | ||
89 | + else | ||
90 | + { | ||
91 | + Debug.Log($"[CacheCleaner] 缓存目录不存在: {cachePath}"); | ||
92 | + } | ||
67 | } | 93 | } |
68 | } | 94 | } |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | "cover": "https://h5.edcc.cn/FriendCircle/image/cover.png", | 2 | "cover": "https://h5.edcc.cn/FriendCircle/image/cover.png", |
3 | "bottom": "https://h5.edcc.cn/FriendCircle/image/bottom.png", | 3 | "bottom": "https://h5.edcc.cn/FriendCircle/image/bottom.png", |
4 | "logo": "https://h5.edcc.cn/FriendCircle/image/logo.png", | 4 | "logo": "https://h5.edcc.cn/FriendCircle/image/logo.png", |
5 | - "likeIcon": "https://h5.edcc.cn/FriendCircle/image/likeIcon.png?a=1", | 5 | + "likeIcon": "https://h5.edcc.cn/FriendCircle/image/likeIcon.png?a=2", |
6 | "likeList":[ | 6 | "likeList":[ |
7 | { "icon": "<sprite name=\"Smile\">", "bullet": "加油加油!", "name": "Smile"}, | 7 | { "icon": "<sprite name=\"Smile\">", "bullet": "加油加油!", "name": "Smile"}, |
8 | { "icon": "<sprite name=\"LaughCry\">", "bullet": "哈哈哈哈哈", "name": "LaughCry"}, | 8 | { "icon": "<sprite name=\"LaughCry\">", "bullet": "哈哈哈哈哈", "name": "LaughCry"}, |
@@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
20 | "from": "来自:火星", | 20 | "from": "来自:火星", |
21 | "time": "2021年5月19日", | 21 | "time": "2021年5月19日", |
22 | "imageUrls": [ | 22 | "imageUrls": [ |
23 | - "https://h5.edcc.cn/FriendCircle/image/1-1.png", | ||
24 | - "https://h5.edcc.cn/FriendCircle/image/1-2.png" | 23 | + "https://h5.edcc.cn/FriendCircle/image/1-1.jpg", |
24 | + "https://h5.edcc.cn/FriendCircle/image/1-2.jpg" | ||
25 | ], | 25 | ], |
26 | "likeNameList": ["天和核心舱", "天问一号环绕器","好奇号","毅力号","阿联酋希望号"], | 26 | "likeNameList": ["天和核心舱", "天问一号环绕器","好奇号","毅力号","阿联酋希望号"], |
27 | "comments": [ | 27 | "comments": [ |
@@ -54,8 +54,8 @@ | @@ -54,8 +54,8 @@ | ||
54 | "from": "来自:火星", | 54 | "from": "来自:火星", |
55 | "time": "2021年6月11日", | 55 | "time": "2021年6月11日", |
56 | "imageUrls": [ | 56 | "imageUrls": [ |
57 | - "https://h5.edcc.cn/FriendCircle/image/3-1.png", | ||
58 | - "https://h5.edcc.cn/FriendCircle/image/3-2.png" | 57 | + "https://h5.edcc.cn/FriendCircle/image/3-1.jpg", |
58 | + "https://h5.edcc.cn/FriendCircle/image/3-2.jpg" | ||
59 | ], | 59 | ], |
60 | "likeNameList": ["天和核心舱", "嫦娥五号","北斗三号","玉兔二号"], | 60 | "likeNameList": ["天和核心舱", "嫦娥五号","北斗三号","玉兔二号"], |
61 | "comments": [ | 61 | "comments": [ |
@@ -73,7 +73,7 @@ | @@ -73,7 +73,7 @@ | ||
73 | "from": "来自:火星", | 73 | "from": "来自:火星", |
74 | "time": "2021年6月11日", | 74 | "time": "2021年6月11日", |
75 | "imageUrls": [ | 75 | "imageUrls": [ |
76 | - "https://h5.edcc.cn/FriendCircle/image/4-1.png" | 76 | + "https://h5.edcc.cn/FriendCircle/image/4-1.jpg" |
77 | ], | 77 | ], |
78 | "likeNameList": ["天和核心舱", "玉兔二号","阿联酋希望号","天问一号环绕器"], | 78 | "likeNameList": ["天和核心舱", "玉兔二号","阿联酋希望号","天问一号环绕器"], |
79 | "comments": [ | 79 | "comments": [ |
@@ -92,7 +92,7 @@ | @@ -92,7 +92,7 @@ | ||
92 | "from": "来自:火星", | 92 | "from": "来自:火星", |
93 | "time": "2021年7月9日", | 93 | "time": "2021年7月9日", |
94 | "imageUrls": [ | 94 | "imageUrls": [ |
95 | - "https://h5.edcc.cn/FriendCircle/image/5-1.png", | 95 | + "https://h5.edcc.cn/FriendCircle/image/5-1.jpg", |
96 | "https://h5.edcc.cn/FriendCircle/image/5-2.png" | 96 | "https://h5.edcc.cn/FriendCircle/image/5-2.png" |
97 | ], | 97 | ], |
98 | "likeNameList": ["玉兔二号", "天问一号环绕器","天和核心舱","嫦娥五号"], | 98 | "likeNameList": ["玉兔二号", "天问一号环绕器","天和核心舱","嫦娥五号"], |
@@ -110,7 +110,7 @@ | @@ -110,7 +110,7 @@ | ||
110 | "from": "来自:火星", | 110 | "from": "来自:火星", |
111 | "time": "2021年7月15日", | 111 | "time": "2021年7月15日", |
112 | "imageUrls": [ | 112 | "imageUrls": [ |
113 | - "https://h5.edcc.cn/FriendCircle/image/6-1.png" | 113 | + "https://h5.edcc.cn/FriendCircle/image/6-1.jpg" |
114 | ], | 114 | ], |
115 | "likeNameList": ["天和核心舱", "玉兔二号","北斗三号","神舟十二号"], | 115 | "likeNameList": ["天和核心舱", "玉兔二号","北斗三号","神舟十二号"], |
116 | "comments": [ | 116 | "comments": [ |
@@ -147,7 +147,7 @@ | @@ -147,7 +147,7 @@ | ||
147 | "from": "来自:火星", | 147 | "from": "来自:火星", |
148 | "time": "2021年7月30日", | 148 | "time": "2021年7月30日", |
149 | "imageUrls": [ | 149 | "imageUrls": [ |
150 | - "https://h5.edcc.cn/FriendCircle/image/8-1.png" | 150 | + "https://h5.edcc.cn/FriendCircle/image/8-1.jpg" |
151 | ], | 151 | ], |
152 | "likeNameList": ["玉兔二号", "天问一号环绕器"], | 152 | "likeNameList": ["玉兔二号", "天问一号环绕器"], |
153 | "comments": [ | 153 | "comments": [ |
@@ -165,7 +165,7 @@ | @@ -165,7 +165,7 @@ | ||
165 | "from": "来自:火星", | 165 | "from": "来自:火星", |
166 | "time": "2021年8月6日", | 166 | "time": "2021年8月6日", |
167 | "imageUrls": [ | 167 | "imageUrls": [ |
168 | - "https://h5.edcc.cn/FriendCircle/image/9-1.png" | 168 | + "https://h5.edcc.cn/FriendCircle/image/9-1.jpg" |
169 | ], | 169 | ], |
170 | "likeNameList": ["天和核心舱", "玉兔二号","北斗三号","神舟十二号"], | 170 | "likeNameList": ["天和核心舱", "玉兔二号","北斗三号","神舟十二号"], |
171 | "comments": [ | 171 | "comments": [ |
@@ -184,7 +184,7 @@ | @@ -184,7 +184,7 @@ | ||
184 | "from": "来自:火星", | 184 | "from": "来自:火星", |
185 | "time": "2021年8月15日", | 185 | "time": "2021年8月15日", |
186 | "imageUrls": [ | 186 | "imageUrls": [ |
187 | - "https://h5.edcc.cn/FriendCircle/image/10-1.png" | 187 | + "https://h5.edcc.cn/FriendCircle/image/10-1.jpg" |
188 | ], | 188 | ], |
189 | "likeNameList": ["天和核心舱", "天问一号环绕器","玉兔二号","嫦娥五号","北斗三号"], | 189 | "likeNameList": ["天和核心舱", "天问一号环绕器","玉兔二号","嫦娥五号","北斗三号"], |
190 | "comments": [ | 190 | "comments": [ |
@@ -36,7 +36,7 @@ RectTransform: | @@ -36,7 +36,7 @@ RectTransform: | ||
36 | m_AnchorMin: {x: 0, y: 0} | 36 | m_AnchorMin: {x: 0, y: 0} |
37 | m_AnchorMax: {x: 0, y: 0} | 37 | m_AnchorMax: {x: 0, y: 0} |
38 | m_AnchoredPosition: {x: 0, y: 0} | 38 | m_AnchoredPosition: {x: 0, y: 0} |
39 | - m_SizeDelta: {x: 1141.1294, y: 0} | 39 | + m_SizeDelta: {x: 0, y: 0} |
40 | m_Pivot: {x: 0.5, y: 0.5} | 40 | m_Pivot: {x: 0.5, y: 0.5} |
41 | --- !u!222 &4867507668132122837 | 41 | --- !u!222 &4867507668132122837 |
42 | CanvasRenderer: | 42 | CanvasRenderer: |
@@ -129,7 +129,7 @@ MonoBehaviour: | @@ -129,7 +129,7 @@ MonoBehaviour: | ||
129 | m_VertexBufferAutoSizeReduction: 0 | 129 | m_VertexBufferAutoSizeReduction: 0 |
130 | m_useMaxVisibleDescender: 1 | 130 | m_useMaxVisibleDescender: 1 |
131 | m_pageToDisplay: 1 | 131 | m_pageToDisplay: 1 |
132 | - m_margin: {x: 3.3396606, y: 0, z: 23.896545, w: 0} | 132 | + m_margin: {x: 3.3396606, y: 0, z: 6.735901, w: 0} |
133 | m_isUsingLegacyAnimationComponent: 0 | 133 | m_isUsingLegacyAnimationComponent: 0 |
134 | m_isVolumetricText: 0 | 134 | m_isVolumetricText: 0 |
135 | m_hasFontAssetChanged: 0 | 135 | m_hasFontAssetChanged: 0 |
@@ -324,13 +324,13 @@ MonoBehaviour: | @@ -324,13 +324,13 @@ MonoBehaviour: | ||
324 | m_faceColor: | 324 | m_faceColor: |
325 | serializedVersion: 2 | 325 | serializedVersion: 2 |
326 | rgba: 4294967295 | 326 | rgba: 4294967295 |
327 | - m_fontSize: 40 | ||
328 | - m_fontSizeBase: 40 | 327 | + m_fontSize: 45 |
328 | + m_fontSizeBase: 45 | ||
329 | m_fontWeight: 400 | 329 | m_fontWeight: 400 |
330 | m_enableAutoSizing: 0 | 330 | m_enableAutoSizing: 0 |
331 | m_fontSizeMin: 18 | 331 | m_fontSizeMin: 18 |
332 | m_fontSizeMax: 72 | 332 | m_fontSizeMax: 72 |
333 | - m_fontStyle: 0 | 333 | + m_fontStyle: 1 |
334 | m_HorizontalAlignment: 32 | 334 | m_HorizontalAlignment: 32 |
335 | m_VerticalAlignment: 4096 | 335 | m_VerticalAlignment: 4096 |
336 | m_textAlignment: 65535 | 336 | m_textAlignment: 65535 |
@@ -722,7 +722,7 @@ RectTransform: | @@ -722,7 +722,7 @@ RectTransform: | ||
722 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 722 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
723 | m_AnchorMin: {x: 0.5, y: 0.5} | 723 | m_AnchorMin: {x: 0.5, y: 0.5} |
724 | m_AnchorMax: {x: 0.5, y: 0.5} | 724 | m_AnchorMax: {x: 0.5, y: 0.5} |
725 | - m_AnchoredPosition: {x: -153, y: 0} | 725 | + m_AnchoredPosition: {x: -202, y: 0} |
726 | m_SizeDelta: {x: 400, y: 100} | 726 | m_SizeDelta: {x: 400, y: 100} |
727 | m_Pivot: {x: 0.5, y: 0.5} | 727 | m_Pivot: {x: 0.5, y: 0.5} |
728 | --- !u!222 &2023033134325749515 | 728 | --- !u!222 &2023033134325749515 |
@@ -853,13 +853,15 @@ GameObject: | @@ -853,13 +853,15 @@ GameObject: | ||
853 | - component: {fileID: 3108337084099359238} | 853 | - component: {fileID: 3108337084099359238} |
854 | - component: {fileID: 7585877598886442541} | 854 | - component: {fileID: 7585877598886442541} |
855 | - component: {fileID: 7086642667860821389} | 855 | - component: {fileID: 7086642667860821389} |
856 | + - component: {fileID: 7866903808712037280} | ||
857 | + - component: {fileID: 7548172600992697048} | ||
856 | m_Layer: 5 | 858 | m_Layer: 5 |
857 | m_Name: BottomContainer | 859 | m_Name: BottomContainer |
858 | m_TagString: Untagged | 860 | m_TagString: Untagged |
859 | m_Icon: {fileID: 0} | 861 | m_Icon: {fileID: 0} |
860 | m_NavMeshLayer: 0 | 862 | m_NavMeshLayer: 0 |
861 | m_StaticEditorFlags: 0 | 863 | m_StaticEditorFlags: 0 |
862 | - m_IsActive: 0 | 864 | + m_IsActive: 1 |
863 | --- !u!224 &3108337084099359238 | 865 | --- !u!224 &3108337084099359238 |
864 | RectTransform: | 866 | RectTransform: |
865 | m_ObjectHideFlags: 0 | 867 | m_ObjectHideFlags: 0 |
@@ -874,10 +876,10 @@ RectTransform: | @@ -874,10 +876,10 @@ RectTransform: | ||
874 | m_Children: [] | 876 | m_Children: [] |
875 | m_Father: {fileID: 5137047804386020533} | 877 | m_Father: {fileID: 5137047804386020533} |
876 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 878 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
877 | - m_AnchorMin: {x: 0, y: 1} | ||
878 | - m_AnchorMax: {x: 0, y: 1} | ||
879 | - m_AnchoredPosition: {x: 411.90024, y: -1270} | ||
880 | - m_SizeDelta: {x: 823.8005, y: 100} | 879 | + m_AnchorMin: {x: 0, y: 0} |
880 | + m_AnchorMax: {x: 0, y: 0} | ||
881 | + m_AnchoredPosition: {x: 0, y: 0} | ||
882 | + m_SizeDelta: {x: 0, y: 0} | ||
881 | m_Pivot: {x: 0.5, y: 0.5} | 883 | m_Pivot: {x: 0.5, y: 0.5} |
882 | --- !u!114 &7585877598886442541 | 884 | --- !u!114 &7585877598886442541 |
883 | MonoBehaviour: | 885 | MonoBehaviour: |
@@ -893,7 +895,7 @@ MonoBehaviour: | @@ -893,7 +895,7 @@ MonoBehaviour: | ||
893 | m_EditorClassIdentifier: | 895 | m_EditorClassIdentifier: |
894 | m_IgnoreLayout: 0 | 896 | m_IgnoreLayout: 0 |
895 | m_MinWidth: -1 | 897 | m_MinWidth: -1 |
896 | - m_MinHeight: 100 | 898 | + m_MinHeight: 50 |
897 | m_PreferredWidth: -1 | 899 | m_PreferredWidth: -1 |
898 | m_PreferredHeight: -1 | 900 | m_PreferredHeight: -1 |
899 | m_FlexibleWidth: -1 | 901 | m_FlexibleWidth: -1 |
@@ -925,6 +927,44 @@ MonoBehaviour: | @@ -925,6 +927,44 @@ MonoBehaviour: | ||
925 | m_ChildScaleWidth: 0 | 927 | m_ChildScaleWidth: 0 |
926 | m_ChildScaleHeight: 0 | 928 | m_ChildScaleHeight: 0 |
927 | m_ReverseArrangement: 0 | 929 | m_ReverseArrangement: 0 |
930 | +--- !u!222 &7866903808712037280 | ||
931 | +CanvasRenderer: | ||
932 | + m_ObjectHideFlags: 0 | ||
933 | + m_CorrespondingSourceObject: {fileID: 0} | ||
934 | + m_PrefabInstance: {fileID: 0} | ||
935 | + m_PrefabAsset: {fileID: 0} | ||
936 | + m_GameObject: {fileID: 2517860416192966601} | ||
937 | + m_CullTransparentMesh: 1 | ||
938 | +--- !u!114 &7548172600992697048 | ||
939 | +MonoBehaviour: | ||
940 | + m_ObjectHideFlags: 0 | ||
941 | + m_CorrespondingSourceObject: {fileID: 0} | ||
942 | + m_PrefabInstance: {fileID: 0} | ||
943 | + m_PrefabAsset: {fileID: 0} | ||
944 | + m_GameObject: {fileID: 2517860416192966601} | ||
945 | + m_Enabled: 1 | ||
946 | + m_EditorHideFlags: 0 | ||
947 | + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||
948 | + m_Name: | ||
949 | + m_EditorClassIdentifier: | ||
950 | + m_Material: {fileID: 0} | ||
951 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
952 | + m_RaycastTarget: 1 | ||
953 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
954 | + m_Maskable: 1 | ||
955 | + m_OnCullStateChanged: | ||
956 | + m_PersistentCalls: | ||
957 | + m_Calls: [] | ||
958 | + m_Sprite: {fileID: 21300000, guid: 2aee09e01c54c4e4eaeab3cd2addc256, type: 3} | ||
959 | + m_Type: 0 | ||
960 | + m_PreserveAspect: 0 | ||
961 | + m_FillCenter: 1 | ||
962 | + m_FillMethod: 4 | ||
963 | + m_FillAmount: 1 | ||
964 | + m_FillClockwise: 1 | ||
965 | + m_FillOrigin: 0 | ||
966 | + m_UseSpriteMesh: 0 | ||
967 | + m_PixelsPerUnitMultiplier: 1 | ||
928 | --- !u!1 &3024470403460670727 | 968 | --- !u!1 &3024470403460670727 |
929 | GameObject: | 969 | GameObject: |
930 | m_ObjectHideFlags: 0 | 970 | m_ObjectHideFlags: 0 |
@@ -1097,6 +1137,81 @@ MonoBehaviour: | @@ -1097,6 +1137,81 @@ MonoBehaviour: | ||
1097 | m_OnClick: | 1137 | m_OnClick: |
1098 | m_PersistentCalls: | 1138 | m_PersistentCalls: |
1099 | m_Calls: [] | 1139 | m_Calls: [] |
1140 | +--- !u!1 &3695463578648953055 | ||
1141 | +GameObject: | ||
1142 | + m_ObjectHideFlags: 0 | ||
1143 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1144 | + m_PrefabInstance: {fileID: 0} | ||
1145 | + m_PrefabAsset: {fileID: 0} | ||
1146 | + serializedVersion: 6 | ||
1147 | + m_Component: | ||
1148 | + - component: {fileID: 4973245662616750736} | ||
1149 | + - component: {fileID: 6439733017192194499} | ||
1150 | + - component: {fileID: 4276570476397375809} | ||
1151 | + m_Layer: 5 | ||
1152 | + m_Name: DividingLine | ||
1153 | + m_TagString: Untagged | ||
1154 | + m_Icon: {fileID: 0} | ||
1155 | + m_NavMeshLayer: 0 | ||
1156 | + m_StaticEditorFlags: 0 | ||
1157 | + m_IsActive: 1 | ||
1158 | +--- !u!224 &4973245662616750736 | ||
1159 | +RectTransform: | ||
1160 | + m_ObjectHideFlags: 0 | ||
1161 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1162 | + m_PrefabInstance: {fileID: 0} | ||
1163 | + m_PrefabAsset: {fileID: 0} | ||
1164 | + m_GameObject: {fileID: 3695463578648953055} | ||
1165 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
1166 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
1167 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
1168 | + m_ConstrainProportionsScale: 0 | ||
1169 | + m_Children: [] | ||
1170 | + m_Father: {fileID: 4702000847190666268} | ||
1171 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
1172 | + m_AnchorMin: {x: 0, y: 0} | ||
1173 | + m_AnchorMax: {x: 0, y: 0} | ||
1174 | + m_AnchoredPosition: {x: 0, y: 0} | ||
1175 | + m_SizeDelta: {x: 0, y: 0} | ||
1176 | + m_Pivot: {x: 0.5, y: 0.5} | ||
1177 | +--- !u!222 &6439733017192194499 | ||
1178 | +CanvasRenderer: | ||
1179 | + m_ObjectHideFlags: 0 | ||
1180 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1181 | + m_PrefabInstance: {fileID: 0} | ||
1182 | + m_PrefabAsset: {fileID: 0} | ||
1183 | + m_GameObject: {fileID: 3695463578648953055} | ||
1184 | + m_CullTransparentMesh: 1 | ||
1185 | +--- !u!114 &4276570476397375809 | ||
1186 | +MonoBehaviour: | ||
1187 | + m_ObjectHideFlags: 0 | ||
1188 | + m_CorrespondingSourceObject: {fileID: 0} | ||
1189 | + m_PrefabInstance: {fileID: 0} | ||
1190 | + m_PrefabAsset: {fileID: 0} | ||
1191 | + m_GameObject: {fileID: 3695463578648953055} | ||
1192 | + m_Enabled: 1 | ||
1193 | + m_EditorHideFlags: 0 | ||
1194 | + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||
1195 | + m_Name: | ||
1196 | + m_EditorClassIdentifier: | ||
1197 | + m_Material: {fileID: 0} | ||
1198 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
1199 | + m_RaycastTarget: 1 | ||
1200 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
1201 | + m_Maskable: 1 | ||
1202 | + m_OnCullStateChanged: | ||
1203 | + m_PersistentCalls: | ||
1204 | + m_Calls: [] | ||
1205 | + m_Sprite: {fileID: 21300000, guid: 7a419cbf6ed6240c7b3884642cb6d8d3, type: 3} | ||
1206 | + m_Type: 0 | ||
1207 | + m_PreserveAspect: 0 | ||
1208 | + m_FillCenter: 1 | ||
1209 | + m_FillMethod: 4 | ||
1210 | + m_FillAmount: 1 | ||
1211 | + m_FillClockwise: 1 | ||
1212 | + m_FillOrigin: 0 | ||
1213 | + m_UseSpriteMesh: 0 | ||
1214 | + m_PixelsPerUnitMultiplier: 1 | ||
1100 | --- !u!1 &3888947954386717641 | 1215 | --- !u!1 &3888947954386717641 |
1101 | GameObject: | 1216 | GameObject: |
1102 | m_ObjectHideFlags: 0 | 1217 | m_ObjectHideFlags: 0 |
@@ -1375,14 +1490,14 @@ MonoBehaviour: | @@ -1375,14 +1490,14 @@ MonoBehaviour: | ||
1375 | m_Name: | 1490 | m_Name: |
1376 | m_EditorClassIdentifier: | 1491 | m_EditorClassIdentifier: |
1377 | m_Material: {fileID: 0} | 1492 | m_Material: {fileID: 0} |
1378 | - m_Color: {r: 0.92156863, g: 0.9254902, b: 0.92156863, a: 1} | 1493 | + m_Color: {r: 1, g: 1, b: 1, a: 1} |
1379 | m_RaycastTarget: 1 | 1494 | m_RaycastTarget: 1 |
1380 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | 1495 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
1381 | m_Maskable: 1 | 1496 | m_Maskable: 1 |
1382 | m_OnCullStateChanged: | 1497 | m_OnCullStateChanged: |
1383 | m_PersistentCalls: | 1498 | m_PersistentCalls: |
1384 | m_Calls: [] | 1499 | m_Calls: [] |
1385 | - m_Sprite: {fileID: 0} | 1500 | + m_Sprite: {fileID: 21300000, guid: 22f78cb9278c144079b8f60abc9acbb5, type: 3} |
1386 | m_Type: 0 | 1501 | m_Type: 0 |
1387 | m_PreserveAspect: 0 | 1502 | m_PreserveAspect: 0 |
1388 | m_FillCenter: 1 | 1503 | m_FillCenter: 1 |
@@ -1425,15 +1540,15 @@ MonoBehaviour: | @@ -1425,15 +1540,15 @@ MonoBehaviour: | ||
1425 | m_Name: | 1540 | m_Name: |
1426 | m_EditorClassIdentifier: | 1541 | m_EditorClassIdentifier: |
1427 | m_Padding: | 1542 | m_Padding: |
1428 | - m_Left: 0 | 1543 | + m_Left: 15 |
1429 | m_Right: 0 | 1544 | m_Right: 0 |
1430 | m_Top: 10 | 1545 | m_Top: 10 |
1431 | m_Bottom: 0 | 1546 | m_Bottom: 0 |
1432 | m_ChildAlignment: 0 | 1547 | m_ChildAlignment: 0 |
1433 | - m_Spacing: 0 | ||
1434 | - m_ChildForceExpandWidth: 1 | 1548 | + m_Spacing: 20 |
1549 | + m_ChildForceExpandWidth: 0 | ||
1435 | m_ChildForceExpandHeight: 0 | 1550 | m_ChildForceExpandHeight: 0 |
1436 | - m_ChildControlWidth: 0 | 1551 | + m_ChildControlWidth: 1 |
1437 | m_ChildControlHeight: 1 | 1552 | m_ChildControlHeight: 1 |
1438 | m_ChildScaleWidth: 0 | 1553 | m_ChildScaleWidth: 0 |
1439 | m_ChildScaleHeight: 0 | 1554 | m_ChildScaleHeight: 0 |
@@ -1472,8 +1587,8 @@ RectTransform: | @@ -1472,8 +1587,8 @@ RectTransform: | ||
1472 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1587 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1473 | m_AnchorMin: {x: 0, y: 1} | 1588 | m_AnchorMin: {x: 0, y: 1} |
1474 | m_AnchorMax: {x: 0, y: 1} | 1589 | m_AnchorMax: {x: 0, y: 1} |
1475 | - m_AnchoredPosition: {x: 27, y: -24} | ||
1476 | - m_SizeDelta: {x: 35, y: 30} | 1590 | + m_AnchoredPosition: {x: 27, y: -31} |
1591 | + m_SizeDelta: {x: 51, y: 42} | ||
1477 | m_Pivot: {x: 0.5, y: 0.5} | 1592 | m_Pivot: {x: 0.5, y: 0.5} |
1478 | --- !u!222 &888018792828137858 | 1593 | --- !u!222 &888018792828137858 |
1479 | CanvasRenderer: | 1594 | CanvasRenderer: |
@@ -1928,7 +2043,7 @@ MonoBehaviour: | @@ -1928,7 +2043,7 @@ MonoBehaviour: | ||
1928 | m_VertexBufferAutoSizeReduction: 0 | 2043 | m_VertexBufferAutoSizeReduction: 0 |
1929 | m_useMaxVisibleDescender: 1 | 2044 | m_useMaxVisibleDescender: 1 |
1930 | m_pageToDisplay: 1 | 2045 | m_pageToDisplay: 1 |
1931 | - m_margin: {x: 0, y: 0, z: 0, w: 0} | 2046 | + m_margin: {x: 20, y: 0, z: 20, w: 0} |
1932 | m_isUsingLegacyAnimationComponent: 0 | 2047 | m_isUsingLegacyAnimationComponent: 0 |
1933 | m_isVolumetricText: 0 | 2048 | m_isVolumetricText: 0 |
1934 | m_hasFontAssetChanged: 0 | 2049 | m_hasFontAssetChanged: 0 |
@@ -2256,6 +2371,7 @@ RectTransform: | @@ -2256,6 +2371,7 @@ RectTransform: | ||
2256 | m_LocalScale: {x: 1, y: 1, z: 1} | 2371 | m_LocalScale: {x: 1, y: 1, z: 1} |
2257 | m_ConstrainProportionsScale: 0 | 2372 | m_ConstrainProportionsScale: 0 |
2258 | m_Children: | 2373 | m_Children: |
2374 | + - {fileID: 4973245662616750736} | ||
2259 | - {fileID: 3052796486179379442} | 2375 | - {fileID: 3052796486179379442} |
2260 | m_Father: {fileID: 5137047804386020533} | 2376 | m_Father: {fileID: 5137047804386020533} |
2261 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 2377 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
@@ -2285,14 +2401,14 @@ MonoBehaviour: | @@ -2285,14 +2401,14 @@ MonoBehaviour: | ||
2285 | m_Name: | 2401 | m_Name: |
2286 | m_EditorClassIdentifier: | 2402 | m_EditorClassIdentifier: |
2287 | m_Material: {fileID: 0} | 2403 | m_Material: {fileID: 0} |
2288 | - m_Color: {r: 0.92156863, g: 0.9254902, b: 0.92156863, a: 1} | 2404 | + m_Color: {r: 1, g: 1, b: 1, a: 1} |
2289 | m_RaycastTarget: 1 | 2405 | m_RaycastTarget: 1 |
2290 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | 2406 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
2291 | m_Maskable: 1 | 2407 | m_Maskable: 1 |
2292 | m_OnCullStateChanged: | 2408 | m_OnCullStateChanged: |
2293 | m_PersistentCalls: | 2409 | m_PersistentCalls: |
2294 | m_Calls: [] | 2410 | m_Calls: [] |
2295 | - m_Sprite: {fileID: 0} | 2411 | + m_Sprite: {fileID: 21300000, guid: 8b5c00664fb2c49f89a5bac8f8f3a212, type: 3} |
2296 | m_Type: 0 | 2412 | m_Type: 0 |
2297 | m_PreserveAspect: 0 | 2413 | m_PreserveAspect: 0 |
2298 | m_FillCenter: 1 | 2414 | m_FillCenter: 1 |
@@ -2335,10 +2451,10 @@ MonoBehaviour: | @@ -2335,10 +2451,10 @@ MonoBehaviour: | ||
2335 | m_Name: | 2451 | m_Name: |
2336 | m_EditorClassIdentifier: | 2452 | m_EditorClassIdentifier: |
2337 | m_Padding: | 2453 | m_Padding: |
2338 | - m_Left: 20 | ||
2339 | - m_Right: 0 | 2454 | + m_Left: 5 |
2455 | + m_Right: 5 | ||
2340 | m_Top: 0 | 2456 | m_Top: 0 |
2341 | - m_Bottom: 20 | 2457 | + m_Bottom: 0 |
2342 | m_ChildAlignment: 0 | 2458 | m_ChildAlignment: 0 |
2343 | m_Spacing: 0 | 2459 | m_Spacing: 0 |
2344 | m_ChildForceExpandWidth: 1 | 2460 | m_ChildForceExpandWidth: 1 |
@@ -2383,7 +2499,7 @@ RectTransform: | @@ -2383,7 +2499,7 @@ RectTransform: | ||
2383 | m_AnchorMin: {x: 0, y: 0} | 2499 | m_AnchorMin: {x: 0, y: 0} |
2384 | m_AnchorMax: {x: 0, y: 0} | 2500 | m_AnchorMax: {x: 0, y: 0} |
2385 | m_AnchoredPosition: {x: 0, y: 0} | 2501 | m_AnchoredPosition: {x: 0, y: 0} |
2386 | - m_SizeDelta: {x: 52.323, y: 0} | 2502 | + m_SizeDelta: {x: 0, y: 0} |
2387 | m_Pivot: {x: 0.5, y: 0.5} | 2503 | m_Pivot: {x: 0.5, y: 0.5} |
2388 | --- !u!114 &7917989825231092027 | 2504 | --- !u!114 &7917989825231092027 |
2389 | MonoBehaviour: | 2505 | MonoBehaviour: |
@@ -12,8 +12,8 @@ PlayerSettings: | @@ -12,8 +12,8 @@ PlayerSettings: | ||
12 | targetDevice: 2 | 12 | targetDevice: 2 |
13 | useOnDemandResources: 0 | 13 | useOnDemandResources: 0 |
14 | accelerometerFrequency: 60 | 14 | accelerometerFrequency: 60 |
15 | - companyName: DefaultCompany | ||
16 | - productName: My project | 15 | + companyName: EDCC |
16 | + productName: FriendCircle | ||
17 | defaultCursor: {fileID: 0} | 17 | defaultCursor: {fileID: 0} |
18 | cursorHotspot: {x: 0, y: 0} | 18 | cursorHotspot: {x: 0, y: 0} |
19 | m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} | 19 | m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} |
@@ -162,7 +162,7 @@ PlayerSettings: | @@ -162,7 +162,7 @@ PlayerSettings: | ||
162 | androidSupportedAspectRatio: 1 | 162 | androidSupportedAspectRatio: 1 |
163 | androidMaxAspectRatio: 2.1 | 163 | androidMaxAspectRatio: 2.1 |
164 | applicationIdentifier: | 164 | applicationIdentifier: |
165 | - Android: com.DefaultCompany.Myproject | 165 | + Android: com.EDCC.FriendCircle |
166 | Standalone: com.DefaultCompany.My-project | 166 | Standalone: com.DefaultCompany.My-project |
167 | buildNumber: | 167 | buildNumber: |
168 | Standalone: 0 | 168 | Standalone: 0 |
-
Please register or login to post a comment