Skip to content

Commit a8e2aeb

Browse files
committed
Android GMS registration fix.
* Fixed issue where Android device would not register in some cases if Google Play services 8.1.0 or newer was used in the project.
1 parent 1d60b13 commit a8e2aeb

21 files changed

+27
-40
lines changed
Binary file not shown.

Unity4.6OneSignalExample/Assets/Plugins/OneSignal/Example/OneSignalExampleScene.unity

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,70 +12,57 @@ SceneSettings:
1212
backfaceThreshold: 100
1313
--- !u!104 &2
1414
RenderSettings:
15-
m_ObjectHideFlags: 0
16-
serializedVersion: 6
1715
m_Fog: 0
1816
m_FogColor: {r: .5, g: .5, b: .5, a: 1}
1917
m_FogMode: 3
2018
m_FogDensity: .00999999978
2119
m_LinearFogStart: 0
2220
m_LinearFogEnd: 300
23-
m_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
24-
m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
25-
m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
26-
m_AmbientIntensity: 1
27-
m_AmbientMode: 3
21+
m_AmbientLight: {r: .200000003, g: .200000003, b: .200000003, a: 1}
2822
m_SkyboxMaterial: {fileID: 0}
2923
m_HaloStrength: .5
3024
m_FlareStrength: 1
3125
m_FlareFadeSpeed: 3
3226
m_HaloTexture: {fileID: 0}
3327
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
34-
m_DefaultReflectionMode: 0
35-
m_DefaultReflectionResolution: 128
36-
m_ReflectionBounces: 1
37-
m_ReflectionIntensity: 1
38-
m_CustomReflection: {fileID: 0}
39-
m_Sun: {fileID: 0}
28+
m_ObjectHideFlags: 0
4029
--- !u!127 &3
4130
LevelGameManager:
4231
m_ObjectHideFlags: 0
4332
--- !u!157 &4
4433
LightmapSettings:
4534
m_ObjectHideFlags: 0
46-
serializedVersion: 5
47-
m_GIWorkflowMode: 1
35+
m_LightProbes: {fileID: 0}
36+
m_Lightmaps: []
4837
m_LightmapsMode: 1
49-
m_GISettings:
50-
serializedVersion: 2
51-
m_BounceScale: 1
52-
m_IndirectOutputScale: 1
53-
m_AlbedoBoost: 1
54-
m_TemporalCoherenceThreshold: 1
55-
m_EnvironmentLightingMode: 0
56-
m_EnableBakedLightmaps: 1
57-
m_EnableRealtimeLightmaps: 0
38+
m_BakedColorSpace: 0
39+
m_UseDualLightmapsInForward: 0
5840
m_LightmapEditorSettings:
59-
serializedVersion: 3
6041
m_Resolution: 1
61-
m_BakeResolution: 50
42+
m_LastUsedResolution: 0
6243
m_TextureWidth: 1024
6344
m_TextureHeight: 1024
45+
m_BounceBoost: 1
46+
m_BounceIntensity: 1
47+
m_SkyLightColor: {r: .860000014, g: .930000007, b: 1, a: 1}
48+
m_SkyLightIntensity: 0
49+
m_Quality: 0
50+
m_Bounces: 1
51+
m_FinalGatherRays: 1000
52+
m_FinalGatherContrastThreshold: .0500000007
53+
m_FinalGatherGradientThreshold: 0
54+
m_FinalGatherInterpolationPoints: 15
55+
m_AOAmount: 0
6456
m_AOMaxDistance: 1
57+
m_AOContrast: 1
58+
m_LODSurfaceMappingDistance: 1
6559
m_Padding: 2
66-
m_CompAOExponent: 0
67-
m_LightmapParameters: {fileID: 0}
6860
m_TextureCompression: 0
69-
m_FinalGather: 0
70-
m_FinalGatherRayCount: 1024
71-
m_LightmapSnapshot: {fileID: 0}
72-
m_RuntimeCPUUsage: 25
61+
m_LockAtlas: 0
7362
--- !u!196 &5
7463
NavMeshSettings:
75-
serializedVersion: 2
7664
m_ObjectHideFlags: 0
7765
m_BuildSettings:
78-
serializedVersion: 2
7966
agentRadius: .5
8067
agentHeight: 2
8168
agentSlope: 45
@@ -84,9 +71,10 @@ NavMeshSettings:
8471
maxJumpAcrossDistance: 0
8572
accuratePlacement: 0
8673
minRegionArea: 2
87-
cellSize: .166666657
88-
manualCellSize: 0
89-
m_NavMeshData: {fileID: 0}
74+
widthInaccuracy: 16.666666
75+
heightInaccuracy: 10
76+
tileSizeHint: 0
77+
m_NavMesh: {fileID: 0}
9078
--- !u!1 &1154340127
9179
GameObject:
9280
m_ObjectHideFlags: 0
@@ -159,7 +147,6 @@ Camera:
159147
m_OcclusionCulling: 1
160148
m_StereoConvergence: 10
161149
m_StereoSeparation: .0219999999
162-
m_StereoMirrorMode: 0
163150
--- !u!4 &1154340133
164151
Transform:
165152
m_ObjectHideFlags: 0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.12.0
1+
1.12.1
-21.9 KB
Binary file not shown.
-3.8 KB
Binary file not shown.
-3.53 KB
Binary file not shown.
-3.79 KB
Binary file not shown.
-3.74 KB
Binary file not shown.
-3.69 KB
Binary file not shown.
399 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)