Showing
4 changed files
with
162 additions
and
69 deletions
@@ -2777,11 +2777,11 @@ MonoBehaviour: | @@ -2777,11 +2777,11 @@ MonoBehaviour: | ||
2777 | m_Content: {fileID: 1316319039} | 2777 | m_Content: {fileID: 1316319039} |
2778 | m_Horizontal: 0 | 2778 | m_Horizontal: 0 |
2779 | m_Vertical: 1 | 2779 | m_Vertical: 1 |
2780 | - m_MovementType: 1 | 2780 | + m_MovementType: 2 |
2781 | m_Elasticity: 0.1 | 2781 | m_Elasticity: 0.1 |
2782 | m_Inertia: 1 | 2782 | m_Inertia: 1 |
2783 | - m_DecelerationRate: 0.135 | ||
2784 | - m_ScrollSensitivity: 1 | 2783 | + m_DecelerationRate: 0.001 |
2784 | + m_ScrollSensitivity: 0.1 | ||
2785 | m_Viewport: {fileID: 57721547} | 2785 | m_Viewport: {fileID: 57721547} |
2786 | m_HorizontalScrollbar: {fileID: 0} | 2786 | m_HorizontalScrollbar: {fileID: 0} |
2787 | m_VerticalScrollbar: {fileID: 0} | 2787 | m_VerticalScrollbar: {fileID: 0} |
@@ -3302,63 +3302,63 @@ PrefabInstance: | @@ -3302,63 +3302,63 @@ PrefabInstance: | ||
3302 | objectReference: {fileID: 0} | 3302 | objectReference: {fileID: 0} |
3303 | - target: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3303 | - target: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3304 | propertyPath: m_IsActive | 3304 | propertyPath: m_IsActive |
3305 | - value: 0 | 3305 | + value: 1 |
3306 | objectReference: {fileID: 0} | 3306 | objectReference: {fileID: 0} |
3307 | - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3307 | - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3308 | propertyPath: m_AnchorMax.x | 3308 | propertyPath: m_AnchorMax.x |
3309 | - value: 1 | 3309 | + value: 0 |
3310 | objectReference: {fileID: 0} | 3310 | objectReference: {fileID: 0} |
3311 | - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3311 | - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3312 | propertyPath: m_AnchorMax.y | 3312 | propertyPath: m_AnchorMax.y |
3313 | - value: 1 | 3313 | + value: 0 |
3314 | objectReference: {fileID: 0} | 3314 | objectReference: {fileID: 0} |
3315 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3315 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3316 | propertyPath: m_AnchorMax.y | 3316 | propertyPath: m_AnchorMax.y |
3317 | - value: 1 | 3317 | + value: 0 |
3318 | objectReference: {fileID: 0} | 3318 | objectReference: {fileID: 0} |
3319 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3319 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3320 | propertyPath: m_AnchorMin.y | 3320 | propertyPath: m_AnchorMin.y |
3321 | - value: 1 | 3321 | + value: 0 |
3322 | objectReference: {fileID: 0} | 3322 | objectReference: {fileID: 0} |
3323 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3323 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3324 | propertyPath: m_SizeDelta.x | 3324 | propertyPath: m_SizeDelta.x |
3325 | - value: 49.875004 | 3325 | + value: 0 |
3326 | objectReference: {fileID: 0} | 3326 | objectReference: {fileID: 0} |
3327 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3327 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3328 | propertyPath: m_SizeDelta.y | 3328 | propertyPath: m_SizeDelta.y |
3329 | - value: 36 | 3329 | + value: 0 |
3330 | objectReference: {fileID: 0} | 3330 | objectReference: {fileID: 0} |
3331 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3331 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3332 | propertyPath: m_AnchoredPosition.x | 3332 | propertyPath: m_AnchoredPosition.x |
3333 | - value: 200.43752 | 3333 | + value: 0 |
3334 | objectReference: {fileID: 0} | 3334 | objectReference: {fileID: 0} |
3335 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3335 | - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3336 | propertyPath: m_AnchoredPosition.y | 3336 | propertyPath: m_AnchoredPosition.y |
3337 | - value: -18 | 3337 | + value: 0 |
3338 | objectReference: {fileID: 0} | 3338 | objectReference: {fileID: 0} |
3339 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3339 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3340 | propertyPath: m_AnchorMax.y | 3340 | propertyPath: m_AnchorMax.y |
3341 | - value: 1 | 3341 | + value: 0 |
3342 | objectReference: {fileID: 0} | 3342 | objectReference: {fileID: 0} |
3343 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3343 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3344 | propertyPath: m_AnchorMin.y | 3344 | propertyPath: m_AnchorMin.y |
3345 | - value: 1 | 3345 | + value: 0 |
3346 | objectReference: {fileID: 0} | 3346 | objectReference: {fileID: 0} |
3347 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3347 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3348 | propertyPath: m_SizeDelta.x | 3348 | propertyPath: m_SizeDelta.x |
3349 | - value: 49.875004 | 3349 | + value: 0 |
3350 | objectReference: {fileID: 0} | 3350 | objectReference: {fileID: 0} |
3351 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3351 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3352 | propertyPath: m_SizeDelta.y | 3352 | propertyPath: m_SizeDelta.y |
3353 | - value: 36 | 3353 | + value: 0 |
3354 | objectReference: {fileID: 0} | 3354 | objectReference: {fileID: 0} |
3355 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3355 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3356 | propertyPath: m_AnchoredPosition.x | 3356 | propertyPath: m_AnchoredPosition.x |
3357 | - value: 250.31252 | 3357 | + value: 0 |
3358 | objectReference: {fileID: 0} | 3358 | objectReference: {fileID: 0} |
3359 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3359 | - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3360 | propertyPath: m_AnchoredPosition.y | 3360 | propertyPath: m_AnchoredPosition.y |
3361 | - value: -18 | 3361 | + value: 0 |
3362 | objectReference: {fileID: 0} | 3362 | objectReference: {fileID: 0} |
3363 | - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3363 | - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3364 | propertyPath: m_Pivot.x | 3364 | propertyPath: m_Pivot.x |
@@ -3442,123 +3442,123 @@ PrefabInstance: | @@ -3442,123 +3442,123 @@ PrefabInstance: | ||
3442 | objectReference: {fileID: 0} | 3442 | objectReference: {fileID: 0} |
3443 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3443 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3444 | propertyPath: m_AnchorMax.y | 3444 | propertyPath: m_AnchorMax.y |
3445 | - value: 1 | 3445 | + value: 0 |
3446 | objectReference: {fileID: 0} | 3446 | objectReference: {fileID: 0} |
3447 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3447 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3448 | propertyPath: m_AnchorMin.y | 3448 | propertyPath: m_AnchorMin.y |
3449 | - value: 1 | 3449 | + value: 0 |
3450 | objectReference: {fileID: 0} | 3450 | objectReference: {fileID: 0} |
3451 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3451 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3452 | propertyPath: m_SizeDelta.x | 3452 | propertyPath: m_SizeDelta.x |
3453 | - value: 49.875004 | 3453 | + value: 0 |
3454 | objectReference: {fileID: 0} | 3454 | objectReference: {fileID: 0} |
3455 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3455 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3456 | propertyPath: m_SizeDelta.y | 3456 | propertyPath: m_SizeDelta.y |
3457 | - value: 36 | 3457 | + value: 0 |
3458 | objectReference: {fileID: 0} | 3458 | objectReference: {fileID: 0} |
3459 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3459 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3460 | propertyPath: m_AnchoredPosition.x | 3460 | propertyPath: m_AnchoredPosition.x |
3461 | - value: 350.06253 | 3461 | + value: 0 |
3462 | objectReference: {fileID: 0} | 3462 | objectReference: {fileID: 0} |
3463 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3463 | - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3464 | propertyPath: m_AnchoredPosition.y | 3464 | propertyPath: m_AnchoredPosition.y |
3465 | - value: -18 | 3465 | + value: 0 |
3466 | objectReference: {fileID: 0} | 3466 | objectReference: {fileID: 0} |
3467 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3467 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3468 | propertyPath: m_AnchorMax.y | 3468 | propertyPath: m_AnchorMax.y |
3469 | - value: 1 | 3469 | + value: 0 |
3470 | objectReference: {fileID: 0} | 3470 | objectReference: {fileID: 0} |
3471 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3471 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3472 | propertyPath: m_AnchorMin.y | 3472 | propertyPath: m_AnchorMin.y |
3473 | - value: 1 | 3473 | + value: 0 |
3474 | objectReference: {fileID: 0} | 3474 | objectReference: {fileID: 0} |
3475 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3475 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3476 | propertyPath: m_SizeDelta.x | 3476 | propertyPath: m_SizeDelta.x |
3477 | - value: 49.875004 | 3477 | + value: 0 |
3478 | objectReference: {fileID: 0} | 3478 | objectReference: {fileID: 0} |
3479 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3479 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3480 | propertyPath: m_SizeDelta.y | 3480 | propertyPath: m_SizeDelta.y |
3481 | - value: 36 | 3481 | + value: 0 |
3482 | objectReference: {fileID: 0} | 3482 | objectReference: {fileID: 0} |
3483 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3483 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3484 | propertyPath: m_AnchoredPosition.x | 3484 | propertyPath: m_AnchoredPosition.x |
3485 | - value: 74.81251 | 3485 | + value: 0 |
3486 | objectReference: {fileID: 0} | 3486 | objectReference: {fileID: 0} |
3487 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3487 | - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3488 | propertyPath: m_AnchoredPosition.y | 3488 | propertyPath: m_AnchoredPosition.y |
3489 | - value: -18 | 3489 | + value: 0 |
3490 | objectReference: {fileID: 0} | 3490 | objectReference: {fileID: 0} |
3491 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3491 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3492 | propertyPath: m_AnchorMax.y | 3492 | propertyPath: m_AnchorMax.y |
3493 | - value: 1 | 3493 | + value: 0 |
3494 | objectReference: {fileID: 0} | 3494 | objectReference: {fileID: 0} |
3495 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3495 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3496 | propertyPath: m_AnchorMin.y | 3496 | propertyPath: m_AnchorMin.y |
3497 | - value: 1 | 3497 | + value: 0 |
3498 | objectReference: {fileID: 0} | 3498 | objectReference: {fileID: 0} |
3499 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3499 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3500 | propertyPath: m_SizeDelta.x | 3500 | propertyPath: m_SizeDelta.x |
3501 | - value: 49.875004 | 3501 | + value: 0 |
3502 | objectReference: {fileID: 0} | 3502 | objectReference: {fileID: 0} |
3503 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3503 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3504 | propertyPath: m_SizeDelta.y | 3504 | propertyPath: m_SizeDelta.y |
3505 | - value: 36 | 3505 | + value: 0 |
3506 | objectReference: {fileID: 0} | 3506 | objectReference: {fileID: 0} |
3507 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3507 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3508 | propertyPath: m_AnchoredPosition.x | 3508 | propertyPath: m_AnchoredPosition.x |
3509 | - value: 300.18753 | 3509 | + value: 0 |
3510 | objectReference: {fileID: 0} | 3510 | objectReference: {fileID: 0} |
3511 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3511 | - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3512 | propertyPath: m_AnchoredPosition.y | 3512 | propertyPath: m_AnchoredPosition.y |
3513 | - value: -18 | 3513 | + value: 0 |
3514 | objectReference: {fileID: 0} | 3514 | objectReference: {fileID: 0} |
3515 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3515 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3516 | propertyPath: m_AnchorMax.y | 3516 | propertyPath: m_AnchorMax.y |
3517 | - value: 1 | 3517 | + value: 0 |
3518 | objectReference: {fileID: 0} | 3518 | objectReference: {fileID: 0} |
3519 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3519 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3520 | propertyPath: m_AnchorMin.y | 3520 | propertyPath: m_AnchorMin.y |
3521 | - value: 1 | 3521 | + value: 0 |
3522 | objectReference: {fileID: 0} | 3522 | objectReference: {fileID: 0} |
3523 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3523 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3524 | propertyPath: m_SizeDelta.x | 3524 | propertyPath: m_SizeDelta.x |
3525 | - value: 75.75001 | 3525 | + value: 0 |
3526 | objectReference: {fileID: 0} | 3526 | objectReference: {fileID: 0} |
3527 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3527 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3528 | propertyPath: m_SizeDelta.y | 3528 | propertyPath: m_SizeDelta.y |
3529 | - value: 36 | 3529 | + value: 0 |
3530 | objectReference: {fileID: 0} | 3530 | objectReference: {fileID: 0} |
3531 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3531 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3532 | propertyPath: m_AnchoredPosition.x | 3532 | propertyPath: m_AnchoredPosition.x |
3533 | - value: 137.62502 | 3533 | + value: 0 |
3534 | objectReference: {fileID: 0} | 3534 | objectReference: {fileID: 0} |
3535 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3535 | - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3536 | propertyPath: m_AnchoredPosition.y | 3536 | propertyPath: m_AnchoredPosition.y |
3537 | - value: -18 | 3537 | + value: 0 |
3538 | objectReference: {fileID: 0} | 3538 | objectReference: {fileID: 0} |
3539 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3539 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3540 | propertyPath: m_AnchorMax.y | 3540 | propertyPath: m_AnchorMax.y |
3541 | - value: 1 | 3541 | + value: 0 |
3542 | objectReference: {fileID: 0} | 3542 | objectReference: {fileID: 0} |
3543 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3543 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3544 | propertyPath: m_AnchorMin.y | 3544 | propertyPath: m_AnchorMin.y |
3545 | - value: 1 | 3545 | + value: 0 |
3546 | objectReference: {fileID: 0} | 3546 | objectReference: {fileID: 0} |
3547 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3547 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3548 | propertyPath: m_SizeDelta.x | 3548 | propertyPath: m_SizeDelta.x |
3549 | - value: 49.875004 | 3549 | + value: 0 |
3550 | objectReference: {fileID: 0} | 3550 | objectReference: {fileID: 0} |
3551 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3551 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3552 | propertyPath: m_SizeDelta.y | 3552 | propertyPath: m_SizeDelta.y |
3553 | - value: 36 | 3553 | + value: 0 |
3554 | objectReference: {fileID: 0} | 3554 | objectReference: {fileID: 0} |
3555 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3555 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3556 | propertyPath: m_AnchoredPosition.x | 3556 | propertyPath: m_AnchoredPosition.x |
3557 | - value: 24.937502 | 3557 | + value: 0 |
3558 | objectReference: {fileID: 0} | 3558 | objectReference: {fileID: 0} |
3559 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} | 3559 | - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} |
3560 | propertyPath: m_AnchoredPosition.y | 3560 | propertyPath: m_AnchoredPosition.y |
3561 | - value: -18 | 3561 | + value: 0 |
3562 | objectReference: {fileID: 0} | 3562 | objectReference: {fileID: 0} |
3563 | m_RemovedComponents: [] | 3563 | m_RemovedComponents: [] |
3564 | m_RemovedGameObjects: [] | 3564 | m_RemovedGameObjects: [] |
@@ -15,6 +15,13 @@ public class MomentManager : MonoBehaviour | @@ -15,6 +15,13 @@ public class MomentManager : MonoBehaviour | ||
15 | 15 | ||
16 | void Start() | 16 | void Start() |
17 | { | 17 | { |
18 | + // 尝试设置刷新率为最高支持值 | ||
19 | + int highest = Screen.resolutions[Screen.resolutions.Length - 1].refreshRate; | ||
20 | + Screen.SetResolution(Screen.currentResolution.width, Screen.currentResolution.height, true, highest); | ||
21 | + Application.targetFrameRate = highest; | ||
22 | + | ||
23 | + Debug.Log("设置刷新率为:" + highest); | ||
24 | + | ||
18 | StartCoroutine(JsonLoaderManager.LoadJson("https://h5.edcc.cn/FriendCircle/json/friend_data.json","Jsons/friend_data",data => | 25 | StartCoroutine(JsonLoaderManager.LoadJson("https://h5.edcc.cn/FriendCircle/json/friend_data.json","Jsons/friend_data",data => |
19 | { | 26 | { |
20 | Debug.Log("最终获取到的 JSON 数据:\n" + data); | 27 | Debug.Log("最终获取到的 JSON 数据:\n" + data); |
@@ -869,7 +869,7 @@ RectTransform: | @@ -869,7 +869,7 @@ RectTransform: | ||
869 | m_PrefabInstance: {fileID: 0} | 869 | m_PrefabInstance: {fileID: 0} |
870 | m_PrefabAsset: {fileID: 0} | 870 | m_PrefabAsset: {fileID: 0} |
871 | m_GameObject: {fileID: 2517860416192966601} | 871 | m_GameObject: {fileID: 2517860416192966601} |
872 | - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 872 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
873 | m_LocalPosition: {x: 0, y: 0, z: 0} | 873 | m_LocalPosition: {x: 0, y: 0, z: 0} |
874 | m_LocalScale: {x: 1, y: 1, z: 1} | 874 | m_LocalScale: {x: 1, y: 1, z: 1} |
875 | m_ConstrainProportionsScale: 0 | 875 | m_ConstrainProportionsScale: 0 |
@@ -6,7 +6,7 @@ QualitySettings: | @@ -6,7 +6,7 @@ QualitySettings: | ||
6 | serializedVersion: 5 | 6 | serializedVersion: 5 |
7 | m_CurrentQuality: 5 | 7 | m_CurrentQuality: 5 |
8 | m_QualitySettings: | 8 | m_QualitySettings: |
9 | - - serializedVersion: 2 | 9 | + - serializedVersion: 3 |
10 | name: Very Low | 10 | name: Very Low |
11 | pixelLightCount: 0 | 11 | pixelLightCount: 0 |
12 | shadows: 0 | 12 | shadows: 0 |
@@ -18,17 +18,21 @@ QualitySettings: | @@ -18,17 +18,21 @@ QualitySettings: | ||
18 | shadowCascade2Split: 0.33333334 | 18 | shadowCascade2Split: 0.33333334 |
19 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} | 19 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} |
20 | shadowmaskMode: 0 | 20 | shadowmaskMode: 0 |
21 | - blendWeights: 1 | ||
22 | - textureQuality: 1 | 21 | + skinWeights: 1 |
22 | + globalTextureMipmapLimit: 1 | ||
23 | + textureMipmapLimitSettings: [] | ||
23 | anisotropicTextures: 0 | 24 | anisotropicTextures: 0 |
24 | antiAliasing: 0 | 25 | antiAliasing: 0 |
25 | softParticles: 0 | 26 | softParticles: 0 |
26 | softVegetation: 0 | 27 | softVegetation: 0 |
27 | realtimeReflectionProbes: 0 | 28 | realtimeReflectionProbes: 0 |
28 | billboardsFaceCameraPosition: 0 | 29 | billboardsFaceCameraPosition: 0 |
30 | + useLegacyDetailDistribution: 1 | ||
29 | vSyncCount: 0 | 31 | vSyncCount: 0 |
32 | + realtimeGICPUUsage: 25 | ||
30 | lodBias: 0.3 | 33 | lodBias: 0.3 |
31 | maximumLODLevel: 0 | 34 | maximumLODLevel: 0 |
35 | + enableLODCrossFade: 1 | ||
32 | streamingMipmapsActive: 0 | 36 | streamingMipmapsActive: 0 |
33 | streamingMipmapsAddAllCameras: 1 | 37 | streamingMipmapsAddAllCameras: 1 |
34 | streamingMipmapsMemoryBudget: 512 | 38 | streamingMipmapsMemoryBudget: 512 |
@@ -40,8 +44,18 @@ QualitySettings: | @@ -40,8 +44,18 @@ QualitySettings: | ||
40 | asyncUploadBufferSize: 16 | 44 | asyncUploadBufferSize: 16 |
41 | asyncUploadPersistentBuffer: 1 | 45 | asyncUploadPersistentBuffer: 1 |
42 | resolutionScalingFixedDPIFactor: 1 | 46 | resolutionScalingFixedDPIFactor: 1 |
47 | + customRenderPipeline: {fileID: 0} | ||
48 | + terrainQualityOverrides: 0 | ||
49 | + terrainPixelError: 1 | ||
50 | + terrainDetailDensityScale: 1 | ||
51 | + terrainBasemapDistance: 1000 | ||
52 | + terrainDetailDistance: 80 | ||
53 | + terrainTreeDistance: 5000 | ||
54 | + terrainBillboardStart: 50 | ||
55 | + terrainFadeLength: 5 | ||
56 | + terrainMaxTrees: 50 | ||
43 | excludedTargetPlatforms: [] | 57 | excludedTargetPlatforms: [] |
44 | - - serializedVersion: 2 | 58 | + - serializedVersion: 3 |
45 | name: Low | 59 | name: Low |
46 | pixelLightCount: 0 | 60 | pixelLightCount: 0 |
47 | shadows: 0 | 61 | shadows: 0 |
@@ -53,17 +67,21 @@ QualitySettings: | @@ -53,17 +67,21 @@ QualitySettings: | ||
53 | shadowCascade2Split: 0.33333334 | 67 | shadowCascade2Split: 0.33333334 |
54 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} | 68 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} |
55 | shadowmaskMode: 0 | 69 | shadowmaskMode: 0 |
56 | - blendWeights: 2 | ||
57 | - textureQuality: 0 | 70 | + skinWeights: 2 |
71 | + globalTextureMipmapLimit: 0 | ||
72 | + textureMipmapLimitSettings: [] | ||
58 | anisotropicTextures: 0 | 73 | anisotropicTextures: 0 |
59 | antiAliasing: 0 | 74 | antiAliasing: 0 |
60 | softParticles: 0 | 75 | softParticles: 0 |
61 | softVegetation: 0 | 76 | softVegetation: 0 |
62 | realtimeReflectionProbes: 0 | 77 | realtimeReflectionProbes: 0 |
63 | billboardsFaceCameraPosition: 0 | 78 | billboardsFaceCameraPosition: 0 |
79 | + useLegacyDetailDistribution: 1 | ||
64 | vSyncCount: 0 | 80 | vSyncCount: 0 |
81 | + realtimeGICPUUsage: 25 | ||
65 | lodBias: 0.4 | 82 | lodBias: 0.4 |
66 | maximumLODLevel: 0 | 83 | maximumLODLevel: 0 |
84 | + enableLODCrossFade: 1 | ||
67 | streamingMipmapsActive: 0 | 85 | streamingMipmapsActive: 0 |
68 | streamingMipmapsAddAllCameras: 1 | 86 | streamingMipmapsAddAllCameras: 1 |
69 | streamingMipmapsMemoryBudget: 512 | 87 | streamingMipmapsMemoryBudget: 512 |
@@ -75,8 +93,18 @@ QualitySettings: | @@ -75,8 +93,18 @@ QualitySettings: | ||
75 | asyncUploadBufferSize: 16 | 93 | asyncUploadBufferSize: 16 |
76 | asyncUploadPersistentBuffer: 1 | 94 | asyncUploadPersistentBuffer: 1 |
77 | resolutionScalingFixedDPIFactor: 1 | 95 | resolutionScalingFixedDPIFactor: 1 |
96 | + customRenderPipeline: {fileID: 0} | ||
97 | + terrainQualityOverrides: 0 | ||
98 | + terrainPixelError: 1 | ||
99 | + terrainDetailDensityScale: 1 | ||
100 | + terrainBasemapDistance: 1000 | ||
101 | + terrainDetailDistance: 80 | ||
102 | + terrainTreeDistance: 5000 | ||
103 | + terrainBillboardStart: 50 | ||
104 | + terrainFadeLength: 5 | ||
105 | + terrainMaxTrees: 50 | ||
78 | excludedTargetPlatforms: [] | 106 | excludedTargetPlatforms: [] |
79 | - - serializedVersion: 2 | 107 | + - serializedVersion: 3 |
80 | name: Medium | 108 | name: Medium |
81 | pixelLightCount: 1 | 109 | pixelLightCount: 1 |
82 | shadows: 1 | 110 | shadows: 1 |
@@ -88,17 +116,21 @@ QualitySettings: | @@ -88,17 +116,21 @@ QualitySettings: | ||
88 | shadowCascade2Split: 0.33333334 | 116 | shadowCascade2Split: 0.33333334 |
89 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} | 117 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} |
90 | shadowmaskMode: 0 | 118 | shadowmaskMode: 0 |
91 | - blendWeights: 2 | ||
92 | - textureQuality: 0 | 119 | + skinWeights: 2 |
120 | + globalTextureMipmapLimit: 0 | ||
121 | + textureMipmapLimitSettings: [] | ||
93 | anisotropicTextures: 1 | 122 | anisotropicTextures: 1 |
94 | antiAliasing: 0 | 123 | antiAliasing: 0 |
95 | softParticles: 0 | 124 | softParticles: 0 |
96 | softVegetation: 0 | 125 | softVegetation: 0 |
97 | realtimeReflectionProbes: 0 | 126 | realtimeReflectionProbes: 0 |
98 | billboardsFaceCameraPosition: 0 | 127 | billboardsFaceCameraPosition: 0 |
128 | + useLegacyDetailDistribution: 1 | ||
99 | vSyncCount: 1 | 129 | vSyncCount: 1 |
130 | + realtimeGICPUUsage: 25 | ||
100 | lodBias: 0.7 | 131 | lodBias: 0.7 |
101 | maximumLODLevel: 0 | 132 | maximumLODLevel: 0 |
133 | + enableLODCrossFade: 1 | ||
102 | streamingMipmapsActive: 0 | 134 | streamingMipmapsActive: 0 |
103 | streamingMipmapsAddAllCameras: 1 | 135 | streamingMipmapsAddAllCameras: 1 |
104 | streamingMipmapsMemoryBudget: 512 | 136 | streamingMipmapsMemoryBudget: 512 |
@@ -110,8 +142,18 @@ QualitySettings: | @@ -110,8 +142,18 @@ QualitySettings: | ||
110 | asyncUploadBufferSize: 16 | 142 | asyncUploadBufferSize: 16 |
111 | asyncUploadPersistentBuffer: 1 | 143 | asyncUploadPersistentBuffer: 1 |
112 | resolutionScalingFixedDPIFactor: 1 | 144 | resolutionScalingFixedDPIFactor: 1 |
145 | + customRenderPipeline: {fileID: 0} | ||
146 | + terrainQualityOverrides: 0 | ||
147 | + terrainPixelError: 1 | ||
148 | + terrainDetailDensityScale: 1 | ||
149 | + terrainBasemapDistance: 1000 | ||
150 | + terrainDetailDistance: 80 | ||
151 | + terrainTreeDistance: 5000 | ||
152 | + terrainBillboardStart: 50 | ||
153 | + terrainFadeLength: 5 | ||
154 | + terrainMaxTrees: 50 | ||
113 | excludedTargetPlatforms: [] | 155 | excludedTargetPlatforms: [] |
114 | - - serializedVersion: 2 | 156 | + - serializedVersion: 3 |
115 | name: High | 157 | name: High |
116 | pixelLightCount: 2 | 158 | pixelLightCount: 2 |
117 | shadows: 2 | 159 | shadows: 2 |
@@ -123,17 +165,21 @@ QualitySettings: | @@ -123,17 +165,21 @@ QualitySettings: | ||
123 | shadowCascade2Split: 0.33333334 | 165 | shadowCascade2Split: 0.33333334 |
124 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} | 166 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} |
125 | shadowmaskMode: 1 | 167 | shadowmaskMode: 1 |
126 | - blendWeights: 2 | ||
127 | - textureQuality: 0 | 168 | + skinWeights: 2 |
169 | + globalTextureMipmapLimit: 0 | ||
170 | + textureMipmapLimitSettings: [] | ||
128 | anisotropicTextures: 1 | 171 | anisotropicTextures: 1 |
129 | antiAliasing: 0 | 172 | antiAliasing: 0 |
130 | softParticles: 0 | 173 | softParticles: 0 |
131 | softVegetation: 1 | 174 | softVegetation: 1 |
132 | realtimeReflectionProbes: 1 | 175 | realtimeReflectionProbes: 1 |
133 | billboardsFaceCameraPosition: 1 | 176 | billboardsFaceCameraPosition: 1 |
177 | + useLegacyDetailDistribution: 1 | ||
134 | vSyncCount: 1 | 178 | vSyncCount: 1 |
179 | + realtimeGICPUUsage: 50 | ||
135 | lodBias: 1 | 180 | lodBias: 1 |
136 | maximumLODLevel: 0 | 181 | maximumLODLevel: 0 |
182 | + enableLODCrossFade: 1 | ||
137 | streamingMipmapsActive: 0 | 183 | streamingMipmapsActive: 0 |
138 | streamingMipmapsAddAllCameras: 1 | 184 | streamingMipmapsAddAllCameras: 1 |
139 | streamingMipmapsMemoryBudget: 512 | 185 | streamingMipmapsMemoryBudget: 512 |
@@ -145,8 +191,18 @@ QualitySettings: | @@ -145,8 +191,18 @@ QualitySettings: | ||
145 | asyncUploadBufferSize: 16 | 191 | asyncUploadBufferSize: 16 |
146 | asyncUploadPersistentBuffer: 1 | 192 | asyncUploadPersistentBuffer: 1 |
147 | resolutionScalingFixedDPIFactor: 1 | 193 | resolutionScalingFixedDPIFactor: 1 |
194 | + customRenderPipeline: {fileID: 0} | ||
195 | + terrainQualityOverrides: 0 | ||
196 | + terrainPixelError: 1 | ||
197 | + terrainDetailDensityScale: 1 | ||
198 | + terrainBasemapDistance: 1000 | ||
199 | + terrainDetailDistance: 80 | ||
200 | + terrainTreeDistance: 5000 | ||
201 | + terrainBillboardStart: 50 | ||
202 | + terrainFadeLength: 5 | ||
203 | + terrainMaxTrees: 50 | ||
148 | excludedTargetPlatforms: [] | 204 | excludedTargetPlatforms: [] |
149 | - - serializedVersion: 2 | 205 | + - serializedVersion: 3 |
150 | name: Very High | 206 | name: Very High |
151 | pixelLightCount: 3 | 207 | pixelLightCount: 3 |
152 | shadows: 2 | 208 | shadows: 2 |
@@ -158,17 +214,21 @@ QualitySettings: | @@ -158,17 +214,21 @@ QualitySettings: | ||
158 | shadowCascade2Split: 0.33333334 | 214 | shadowCascade2Split: 0.33333334 |
159 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} | 215 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} |
160 | shadowmaskMode: 1 | 216 | shadowmaskMode: 1 |
161 | - blendWeights: 4 | ||
162 | - textureQuality: 0 | 217 | + skinWeights: 4 |
218 | + globalTextureMipmapLimit: 0 | ||
219 | + textureMipmapLimitSettings: [] | ||
163 | anisotropicTextures: 2 | 220 | anisotropicTextures: 2 |
164 | antiAliasing: 2 | 221 | antiAliasing: 2 |
165 | softParticles: 1 | 222 | softParticles: 1 |
166 | softVegetation: 1 | 223 | softVegetation: 1 |
167 | realtimeReflectionProbes: 1 | 224 | realtimeReflectionProbes: 1 |
168 | billboardsFaceCameraPosition: 1 | 225 | billboardsFaceCameraPosition: 1 |
226 | + useLegacyDetailDistribution: 1 | ||
169 | vSyncCount: 1 | 227 | vSyncCount: 1 |
228 | + realtimeGICPUUsage: 50 | ||
170 | lodBias: 1.5 | 229 | lodBias: 1.5 |
171 | maximumLODLevel: 0 | 230 | maximumLODLevel: 0 |
231 | + enableLODCrossFade: 1 | ||
172 | streamingMipmapsActive: 0 | 232 | streamingMipmapsActive: 0 |
173 | streamingMipmapsAddAllCameras: 1 | 233 | streamingMipmapsAddAllCameras: 1 |
174 | streamingMipmapsMemoryBudget: 512 | 234 | streamingMipmapsMemoryBudget: 512 |
@@ -180,8 +240,18 @@ QualitySettings: | @@ -180,8 +240,18 @@ QualitySettings: | ||
180 | asyncUploadBufferSize: 16 | 240 | asyncUploadBufferSize: 16 |
181 | asyncUploadPersistentBuffer: 1 | 241 | asyncUploadPersistentBuffer: 1 |
182 | resolutionScalingFixedDPIFactor: 1 | 242 | resolutionScalingFixedDPIFactor: 1 |
243 | + customRenderPipeline: {fileID: 0} | ||
244 | + terrainQualityOverrides: 0 | ||
245 | + terrainPixelError: 1 | ||
246 | + terrainDetailDensityScale: 1 | ||
247 | + terrainBasemapDistance: 1000 | ||
248 | + terrainDetailDistance: 80 | ||
249 | + terrainTreeDistance: 5000 | ||
250 | + terrainBillboardStart: 50 | ||
251 | + terrainFadeLength: 5 | ||
252 | + terrainMaxTrees: 50 | ||
183 | excludedTargetPlatforms: [] | 253 | excludedTargetPlatforms: [] |
184 | - - serializedVersion: 2 | 254 | + - serializedVersion: 3 |
185 | name: Ultra | 255 | name: Ultra |
186 | pixelLightCount: 4 | 256 | pixelLightCount: 4 |
187 | shadows: 2 | 257 | shadows: 2 |
@@ -193,17 +263,21 @@ QualitySettings: | @@ -193,17 +263,21 @@ QualitySettings: | ||
193 | shadowCascade2Split: 0.33333334 | 263 | shadowCascade2Split: 0.33333334 |
194 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} | 264 | shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} |
195 | shadowmaskMode: 1 | 265 | shadowmaskMode: 1 |
196 | - blendWeights: 4 | ||
197 | - textureQuality: 0 | 266 | + skinWeights: 4 |
267 | + globalTextureMipmapLimit: 0 | ||
268 | + textureMipmapLimitSettings: [] | ||
198 | anisotropicTextures: 2 | 269 | anisotropicTextures: 2 |
199 | antiAliasing: 2 | 270 | antiAliasing: 2 |
200 | softParticles: 1 | 271 | softParticles: 1 |
201 | softVegetation: 1 | 272 | softVegetation: 1 |
202 | realtimeReflectionProbes: 1 | 273 | realtimeReflectionProbes: 1 |
203 | billboardsFaceCameraPosition: 1 | 274 | billboardsFaceCameraPosition: 1 |
204 | - vSyncCount: 1 | 275 | + useLegacyDetailDistribution: 1 |
276 | + vSyncCount: 0 | ||
277 | + realtimeGICPUUsage: 100 | ||
205 | lodBias: 2 | 278 | lodBias: 2 |
206 | maximumLODLevel: 0 | 279 | maximumLODLevel: 0 |
280 | + enableLODCrossFade: 1 | ||
207 | streamingMipmapsActive: 0 | 281 | streamingMipmapsActive: 0 |
208 | streamingMipmapsAddAllCameras: 1 | 282 | streamingMipmapsAddAllCameras: 1 |
209 | streamingMipmapsMemoryBudget: 512 | 283 | streamingMipmapsMemoryBudget: 512 |
@@ -215,16 +289,28 @@ QualitySettings: | @@ -215,16 +289,28 @@ QualitySettings: | ||
215 | asyncUploadBufferSize: 16 | 289 | asyncUploadBufferSize: 16 |
216 | asyncUploadPersistentBuffer: 1 | 290 | asyncUploadPersistentBuffer: 1 |
217 | resolutionScalingFixedDPIFactor: 1 | 291 | resolutionScalingFixedDPIFactor: 1 |
292 | + customRenderPipeline: {fileID: 0} | ||
293 | + terrainQualityOverrides: 0 | ||
294 | + terrainPixelError: 1 | ||
295 | + terrainDetailDensityScale: 1 | ||
296 | + terrainBasemapDistance: 1000 | ||
297 | + terrainDetailDistance: 80 | ||
298 | + terrainTreeDistance: 5000 | ||
299 | + terrainBillboardStart: 50 | ||
300 | + terrainFadeLength: 5 | ||
301 | + terrainMaxTrees: 50 | ||
218 | excludedTargetPlatforms: [] | 302 | excludedTargetPlatforms: [] |
303 | + m_TextureMipmapLimitGroupNames: [] | ||
219 | m_PerPlatformDefaultQuality: | 304 | m_PerPlatformDefaultQuality: |
220 | Android: 2 | 305 | Android: 2 |
221 | - Lumin: 5 | ||
222 | GameCoreScarlett: 5 | 306 | GameCoreScarlett: 5 |
223 | GameCoreXboxOne: 5 | 307 | GameCoreXboxOne: 5 |
308 | + Lumin: 5 | ||
224 | Nintendo 3DS: 5 | 309 | Nintendo 3DS: 5 |
225 | Nintendo Switch: 5 | 310 | Nintendo Switch: 5 |
226 | PS4: 5 | 311 | PS4: 5 |
227 | PS5: 5 | 312 | PS5: 5 |
313 | + Server: 0 | ||
228 | Stadia: 5 | 314 | Stadia: 5 |
229 | Standalone: 5 | 315 | Standalone: 5 |
230 | WebGL: 3 | 316 | WebGL: 3 |
-
Please register or login to post a comment