Skip to content

Commit 1c8e997

Browse files
gracebarsnygracebarsny
authored
Merge pull request #103 from PickupPup/fix/reversing-temp-features
Reversing temp features
2 parents cc90456 + bc8d90b commit 1c8e997

File tree

10 files changed

+951
-472
lines changed

10 files changed

+951
-472
lines changed

‎Assets/Plugins/UnityPurchasing/Bin/Android/CloudMoolah.aar.meta‎

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Prefabs/PickupPup/Core/UI/DogBrowser.prefab‎

Lines changed: 64 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ GameObject:
393393
m_Icon: {fileID: 0}
394394
m_NavMeshLayer: 0
395395
m_StaticEditorFlags: 0
396-
m_IsActive: 0
396+
m_IsActive: 1
397397
--- !u!1 &1315980639523594
398398
GameObject:
399399
m_ObjectHideFlags: 1
@@ -1082,6 +1082,7 @@ MonoBehaviour:
10821082
preserveOnSceneChange: 0
10831083
alternateSprites: []
10841084
shouldCollectInSpawnPool: 1
1085+
suppressStandardSFX: 0
10851086
--- !u!114 &114118330859755862
10861087
MonoBehaviour:
10871088
m_ObjectHideFlags: 1
@@ -1230,6 +1231,7 @@ MonoBehaviour:
12301231
preserveOnSceneChange: 0
12311232
alternateSprites: []
12321233
shouldCollectInSpawnPool: 1
1234+
suppressStandardSFX: 0
12331235
--- !u!114 &114165749212004550
12341236
MonoBehaviour:
12351237
m_ObjectHideFlags: 1
@@ -1686,6 +1688,7 @@ MonoBehaviour:
16861688
preserveOnSceneChange: 0
16871689
alternateSprites: []
16881690
shouldCollectInSpawnPool: 1
1691+
suppressStandardSFX: 0
16891692
--- !u!114 &114355284150489916
16901693
MonoBehaviour:
16911694
m_ObjectHideFlags: 1
@@ -1700,6 +1703,7 @@ MonoBehaviour:
17001703
preserveOnSceneChange: 0
17011704
alternateSprites: []
17021705
shouldCollectInSpawnPool: 1
1706+
suppressStandardSFX: 0
17031707
shouldToggleImage: 0
17041708
toggleImage: {fileID: 0}
17051709
imageOn: {fileID: 0}
@@ -1721,6 +1725,7 @@ MonoBehaviour:
17211725
preserveOnSceneChange: 0
17221726
alternateSprites: []
17231727
shouldCollectInSpawnPool: 1
1728+
suppressStandardSFX: 0
17241729
--- !u!114 &114367544271088896
17251730
MonoBehaviour:
17261731
m_ObjectHideFlags: 1
@@ -1762,6 +1767,7 @@ MonoBehaviour:
17621767
preserveOnSceneChange: 0
17631768
alternateSprites: []
17641769
shouldCollectInSpawnPool: 1
1770+
suppressStandardSFX: 0
17651771
--- !u!114 &114391478249890366
17661772
MonoBehaviour:
17671773
m_ObjectHideFlags: 1
@@ -1928,6 +1934,7 @@ MonoBehaviour:
19281934
preserveOnSceneChange: 0
19291935
alternateSprites: []
19301936
shouldCollectInSpawnPool: 1
1937+
suppressStandardSFX: 0
19311938
--- !u!114 &114449385275538018
19321939
MonoBehaviour:
19331940
m_ObjectHideFlags: 1
@@ -2302,6 +2309,7 @@ MonoBehaviour:
23022309
preserveOnSceneChange: 0
23032310
alternateSprites: []
23042311
shouldCollectInSpawnPool: 1
2312+
suppressStandardSFX: 0
23052313
shouldToggleImage: 0
23062314
toggleImage: {fileID: 0}
23072315
imageOn: {fileID: 0}
@@ -2351,6 +2359,7 @@ MonoBehaviour:
23512359
preserveOnSceneChange: 0
23522360
alternateSprites: []
23532361
shouldCollectInSpawnPool: 1
2362+
suppressStandardSFX: 0
23542363
--- !u!114 &114548680165801052
23552364
MonoBehaviour:
23562365
m_ObjectHideFlags: 1
@@ -2392,6 +2401,7 @@ MonoBehaviour:
23922401
preserveOnSceneChange: 0
23932402
alternateSprites: []
23942403
shouldCollectInSpawnPool: 1
2404+
suppressStandardSFX: 0
23952405
--- !u!114 &114555548088272452
23962406
MonoBehaviour:
23972407
m_ObjectHideFlags: 1
@@ -2433,6 +2443,7 @@ MonoBehaviour:
24332443
preserveOnSceneChange: 0
24342444
alternateSprites: []
24352445
shouldCollectInSpawnPool: 1
2446+
suppressStandardSFX: 0
24362447
shouldToggleImage: 0
24372448
toggleImage: {fileID: 0}
24382449
imageOn: {fileID: 0}
@@ -2493,6 +2504,7 @@ MonoBehaviour:
24932504
preserveOnSceneChange: 0
24942505
alternateSprites: []
24952506
shouldCollectInSpawnPool: 1
2507+
suppressStandardSFX: 0
24962508
--- !u!114 &114619871212938550
24972509
MonoBehaviour:
24982510
m_ObjectHideFlags: 1
@@ -2507,6 +2519,7 @@ MonoBehaviour:
25072519
preserveOnSceneChange: 0
25082520
alternateSprites: []
25092521
shouldCollectInSpawnPool: 1
2522+
suppressStandardSFX: 0
25102523
shouldToggleImage: 0
25112524
toggleImage: {fileID: 0}
25122525
imageOn: {fileID: 0}
@@ -2874,6 +2887,7 @@ MonoBehaviour:
28742887
preserveOnSceneChange: 0
28752888
alternateSprites: []
28762889
shouldCollectInSpawnPool: 1
2890+
suppressStandardSFX: 0
28772891
shouldToggleImage: 0
28782892
toggleImage: {fileID: 0}
28792893
imageOn: {fileID: 0}
@@ -2992,6 +3006,7 @@ MonoBehaviour:
29923006
preserveOnSceneChange: 0
29933007
alternateSprites: []
29943008
shouldCollectInSpawnPool: 1
3009+
suppressStandardSFX: 0
29953010
--- !u!114 &114854917295863130
29963011
MonoBehaviour:
29973012
m_ObjectHideFlags: 1
@@ -3261,6 +3276,7 @@ MonoBehaviour:
32613276
preserveOnSceneChange: 0
32623277
alternateSprites: []
32633278
shouldCollectInSpawnPool: 1
3279+
suppressStandardSFX: 0
32643280
--- !u!114 &114971762276300524
32653281
MonoBehaviour:
32663282
m_ObjectHideFlags: 1
@@ -3728,10 +3744,10 @@ RectTransform:
37283744
m_Father: {fileID: 224252396492356978}
37293745
m_RootOrder: 0
37303746
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3731-
m_AnchorMin: {x: 0, y: 1}
3732-
m_AnchorMax: {x: 0, y: 1}
3733-
m_AnchoredPosition: {x: 102.5, y: -98}
3734-
m_SizeDelta: {x: 142, y: 140}
3747+
m_AnchorMin: {x: 0, y: 0}
3748+
m_AnchorMax: {x: 0, y: 0}
3749+
m_AnchoredPosition: {x: 0, y: 0}
3750+
m_SizeDelta: {x: 0, y: 0}
37353751
m_Pivot: {x: 0.5, y: 0.5}
37363752
--- !u!224 &224169835410025816
37373753
RectTransform:
@@ -3786,9 +3802,9 @@ RectTransform:
37863802
m_Father: {fileID: 224220737125569122}
37873803
m_RootOrder: 4
37883804
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3789-
m_AnchorMin: {x: 0, y: 1}
3790-
m_AnchorMax: {x: 0, y: 1}
3791-
m_AnchoredPosition: {x: 250, y: -43.2}
3805+
m_AnchorMin: {x: 0, y: 0}
3806+
m_AnchorMax: {x: 0, y: 0}
3807+
m_AnchoredPosition: {x: 0, y: 0}
37923808
m_SizeDelta: {x: 32, y: 32}
37933809
m_Pivot: {x: 0.5, y: 0.5}
37943810
--- !u!224 &224208769071516860
@@ -3806,10 +3822,10 @@ RectTransform:
38063822
m_Father: {fileID: 224252396492356978}
38073823
m_RootOrder: 3
38083824
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3809-
m_AnchorMin: {x: 0, y: 1}
3810-
m_AnchorMax: {x: 0, y: 1}
3811-
m_AnchoredPosition: {x: 597.5, y: -98}
3812-
m_SizeDelta: {x: 142, y: 140}
3825+
m_AnchorMin: {x: 0, y: 0}
3826+
m_AnchorMax: {x: 0, y: 0}
3827+
m_AnchoredPosition: {x: 0, y: 0}
3828+
m_SizeDelta: {x: 0, y: 0}
38133829
m_Pivot: {x: 0.5, y: 0.5}
38143830
--- !u!224 &224218566854341388
38153831
RectTransform:
@@ -3921,10 +3937,10 @@ RectTransform:
39213937
m_Father: {fileID: 224252396492356978}
39223938
m_RootOrder: 5
39233939
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3924-
m_AnchorMin: {x: 0, y: 1}
3925-
m_AnchorMax: {x: 0, y: 1}
3926-
m_AnchoredPosition: {x: 267.5, y: -256}
3927-
m_SizeDelta: {x: 142, y: 140}
3940+
m_AnchorMin: {x: 0, y: 0}
3941+
m_AnchorMax: {x: 0, y: 0}
3942+
m_AnchoredPosition: {x: 0, y: 0}
3943+
m_SizeDelta: {x: 0, y: 0}
39283944
m_Pivot: {x: 0.5, y: 0.5}
39293945
--- !u!224 &224252396492356978
39303946
RectTransform:
@@ -4003,10 +4019,10 @@ RectTransform:
40034019
m_Father: {fileID: 224252396492356978}
40044020
m_RootOrder: 7
40054021
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4006-
m_AnchorMin: {x: 0, y: 1}
4007-
m_AnchorMax: {x: 0, y: 1}
4008-
m_AnchoredPosition: {x: 597.5, y: -256}
4009-
m_SizeDelta: {x: 142, y: 140}
4022+
m_AnchorMin: {x: 0, y: 0}
4023+
m_AnchorMax: {x: 0, y: 0}
4024+
m_AnchoredPosition: {x: 0, y: 0}
4025+
m_SizeDelta: {x: 0, y: 0}
40104026
m_Pivot: {x: 0.5, y: 0.5}
40114027
--- !u!224 &224414124107268346
40124028
RectTransform:
@@ -4021,9 +4037,9 @@ RectTransform:
40214037
m_Father: {fileID: 224220737125569122}
40224038
m_RootOrder: 2
40234039
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4024-
m_AnchorMin: {x: 0, y: 1}
4025-
m_AnchorMax: {x: 0, y: 1}
4026-
m_AnchoredPosition: {x: 150, y: -43.2}
4040+
m_AnchorMin: {x: 0, y: 0}
4041+
m_AnchorMax: {x: 0, y: 0}
4042+
m_AnchoredPosition: {x: 0, y: 0}
40274043
m_SizeDelta: {x: 32, y: 32}
40284044
m_Pivot: {x: 0.5, y: 0.5}
40294045
--- !u!224 &224426113105592682
@@ -4093,9 +4109,9 @@ RectTransform:
40934109
m_Father: {fileID: 224220737125569122}
40944110
m_RootOrder: 1
40954111
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4096-
m_AnchorMin: {x: 0, y: 1}
4097-
m_AnchorMax: {x: 0, y: 1}
4098-
m_AnchoredPosition: {x: 100, y: -43.2}
4112+
m_AnchorMin: {x: 0, y: 0}
4113+
m_AnchorMax: {x: 0, y: 0}
4114+
m_AnchoredPosition: {x: 0, y: 0}
40994115
m_SizeDelta: {x: 32, y: 32}
41004116
m_Pivot: {x: 0.5, y: 0.5}
41014117
--- !u!224 &224544538619099280
@@ -4185,10 +4201,10 @@ RectTransform:
41854201
m_Father: {fileID: 224252396492356978}
41864202
m_RootOrder: 1
41874203
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4188-
m_AnchorMin: {x: 0, y: 1}
4189-
m_AnchorMax: {x: 0, y: 1}
4190-
m_AnchoredPosition: {x: 267.5, y: -98}
4191-
m_SizeDelta: {x: 142, y: 140}
4204+
m_AnchorMin: {x: 0, y: 0}
4205+
m_AnchorMax: {x: 0, y: 0}
4206+
m_AnchoredPosition: {x: 0, y: 0}
4207+
m_SizeDelta: {x: 0, y: 0}
41924208
m_Pivot: {x: 0.5, y: 0.5}
41934209
--- !u!224 &224621290889110474
41944210
RectTransform:
@@ -4355,9 +4371,9 @@ RectTransform:
43554371
m_Father: {fileID: 224220737125569122}
43564372
m_RootOrder: 0
43574373
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4358-
m_AnchorMin: {x: 0, y: 1}
4359-
m_AnchorMax: {x: 0, y: 1}
4360-
m_AnchoredPosition: {x: 50, y: -43.2}
4374+
m_AnchorMin: {x: 0, y: 0}
4375+
m_AnchorMax: {x: 0, y: 0}
4376+
m_AnchoredPosition: {x: 0, y: 0}
43614377
m_SizeDelta: {x: 32, y: 32}
43624378
m_Pivot: {x: 0.5, y: 0.5}
43634379
--- !u!224 &224724549228165398
@@ -4373,9 +4389,9 @@ RectTransform:
43734389
m_Father: {fileID: 224220737125569122}
43744390
m_RootOrder: 3
43754391
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4376-
m_AnchorMin: {x: 0, y: 1}
4377-
m_AnchorMax: {x: 0, y: 1}
4378-
m_AnchoredPosition: {x: 200, y: -43.2}
4392+
m_AnchorMin: {x: 0, y: 0}
4393+
m_AnchorMax: {x: 0, y: 0}
4394+
m_AnchoredPosition: {x: 0, y: 0}
43794395
m_SizeDelta: {x: 32, y: 32}
43804396
m_Pivot: {x: 0.5, y: 0.5}
43814397
--- !u!224 &224734211378111074
@@ -4393,10 +4409,10 @@ RectTransform:
43934409
m_Father: {fileID: 224252396492356978}
43944410
m_RootOrder: 6
43954411
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4396-
m_AnchorMin: {x: 0, y: 1}
4397-
m_AnchorMax: {x: 0, y: 1}
4398-
m_AnchoredPosition: {x: 432.5, y: -256}
4399-
m_SizeDelta: {x: 142, y: 140}
4412+
m_AnchorMin: {x: 0, y: 0}
4413+
m_AnchorMax: {x: 0, y: 0}
4414+
m_AnchoredPosition: {x: 0, y: 0}
4415+
m_SizeDelta: {x: 0, y: 0}
44004416
m_Pivot: {x: 0.5, y: 0.5}
44014417
--- !u!224 &224755462002084826
44024418
RectTransform:
@@ -4469,10 +4485,10 @@ RectTransform:
44694485
m_Father: {fileID: 224252396492356978}
44704486
m_RootOrder: 2
44714487
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4472-
m_AnchorMin: {x: 0, y: 1}
4473-
m_AnchorMax: {x: 0, y: 1}
4474-
m_AnchoredPosition: {x: 432.5, y: -98}
4475-
m_SizeDelta: {x: 142, y: 140}
4488+
m_AnchorMin: {x: 0, y: 0}
4489+
m_AnchorMax: {x: 0, y: 0}
4490+
m_AnchoredPosition: {x: 0, y: 0}
4491+
m_SizeDelta: {x: 0, y: 0}
44764492
m_Pivot: {x: 0.5, y: 0.5}
44774493
--- !u!224 &224822860168974766
44784494
RectTransform:
@@ -4489,10 +4505,10 @@ RectTransform:
44894505
m_Father: {fileID: 224252396492356978}
44904506
m_RootOrder: 4
44914507
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4492-
m_AnchorMin: {x: 0, y: 1}
4493-
m_AnchorMax: {x: 0, y: 1}
4494-
m_AnchoredPosition: {x: 102.5, y: -256}
4495-
m_SizeDelta: {x: 142, y: 140}
4508+
m_AnchorMin: {x: 0, y: 0}
4509+
m_AnchorMax: {x: 0, y: 0}
4510+
m_AnchoredPosition: {x: 0, y: 0}
4511+
m_SizeDelta: {x: 0, y: 0}
44964512
m_Pivot: {x: 0.5, y: 0.5}
44974513
--- !u!224 &224888211606906956
44984514
RectTransform:

0 commit comments

Comments
 (0)