Skip to content

Commit e8dd6f9

Browse files
authored
Merge branch 'dev' into feat/seed-local-player-crdt-on-scene-init
2 parents 7173eea + 0acc5be commit e8dd6f9

15 files changed

Lines changed: 216 additions & 262 deletions

File tree

Explorer/Assets/DCL/Backpack/Gifting/Notifications/Prefab/GiftReceivedPopup.prefab

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,12 +1872,12 @@ MonoBehaviour:
18721872
m_Name:
18731873
m_EditorClassIdentifier:
18741874
<Button>k__BackingField: {fileID: 3818101583891139926}
1875-
<ButtonPressedAudio>k__BackingField: {fileID: 11400000, guid: 9c57af4963cf9cf4194435271beb8b73, type: 2}
1876-
<ButtonHoverAudio>k__BackingField: {fileID: 11400000, guid: 59da234351971c0498a566fb811b0c36, type: 2}
18771875
<images>k__BackingField: []
18781876
<text>k__BackingField: {fileID: 0}
18791877
interactableColor: {r: 1, g: 1, b: 1, a: 1}
18801878
hoverColor: {r: 0.54, g: 0.54, b: 0.54, a: 1}
1879+
<ButtonPressedAudio>k__BackingField: {fileID: 11400000, guid: 9c57af4963cf9cf4194435271beb8b73, type: 2}
1880+
<ButtonHoverAudio>k__BackingField: {fileID: 11400000, guid: 59da234351971c0498a566fb811b0c36, type: 2}
18811881
--- !u!1 &7146219950259528395
18821882
GameObject:
18831883
m_ObjectHideFlags: 0
@@ -1963,6 +1963,7 @@ Canvas:
19631963
m_OverridePixelPerfect: 0
19641964
m_SortingBucketNormalizedSize: 0
19651965
m_VertexColorAlwaysGammaSpace: 0
1966+
m_UseReflectionProbes: 0
19661967
m_AdditionalShaderChannelsFlag: 25
19671968
m_UpdateRectTransformForStandalone: 0
19681969
m_SortingLayerID: 0
@@ -2215,6 +2216,7 @@ GameObject:
22152216
- component: {fileID: 9072841955768298993}
22162217
- component: {fileID: 3560963596135746078}
22172218
- component: {fileID: 7667598112777776212}
2219+
- component: {fileID: 4114434700856588832}
22182220
m_Layer: 5
22192221
m_Name: Thumbnail
22202222
m_TagString: Untagged
@@ -2231,7 +2233,7 @@ RectTransform:
22312233
m_GameObject: {fileID: 8193094171510782914}
22322234
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
22332235
m_LocalPosition: {x: 0, y: 0, z: 0}
2234-
m_LocalScale: {x: 1, y: 1, z: 1}
2236+
m_LocalScale: {x: 0.98, y: 0.98, z: 0.98}
22352237
m_ConstrainProportionsScale: 0
22362238
m_Children: []
22372239
m_Father: {fileID: 4374271691098607111}
@@ -2311,6 +2313,29 @@ MonoBehaviour:
23112313
<imageLoadingFadeDuration>k__BackingField: 0.3
23122314
aspectRatioFitter: {fileID: 3560963596135746078}
23132315
rectTransform: {fileID: 727816672550444537}
2316+
--- !u!114 &4114434700856588832
2317+
MonoBehaviour:
2318+
m_ObjectHideFlags: 0
2319+
m_CorrespondingSourceObject: {fileID: 0}
2320+
m_PrefabInstance: {fileID: 0}
2321+
m_PrefabAsset: {fileID: 0}
2322+
m_GameObject: {fileID: 8193094171510782914}
2323+
m_Enabled: 1
2324+
m_EditorHideFlags: 0
2325+
m_Script: {fileID: 11500000, guid: 385b7d1277b6c4007a84c065696e0f8c, type: 3}
2326+
m_Name:
2327+
m_EditorClassIdentifier: Coffee.SoftMaskForUGUI::Coffee.UISoftMask.SoftMask
2328+
m_ShowMaskGraphic: 1
2329+
m_MaskingMode: 0
2330+
m_AlphaHitTest: 0
2331+
m_SoftnessRange:
2332+
m_Min: 0
2333+
m_Max: 1
2334+
m_DownSamplingRate: 0
2335+
m_AntiAliasingThreshold: 0
2336+
m_Alpha: -1
2337+
m_Softness: -1
2338+
m_PartOfParent: 0
23142339
--- !u!1 &8475371522446432737
23152340
GameObject:
23162341
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)