diff --git a/.gitignore b/.gitignore index fa33123c7..a26ecba4e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ OneSignalExample/.utmp/ OneSignalExample/Packages/com.unity.asset-store-tools/ .DS_Store +.gradle/ \ No newline at end of file diff --git a/OneSignalExample/.gitignore b/OneSignalExample/.gitignore index 8af868e8e..89c6cdb32 100644 --- a/OneSignalExample/.gitignore +++ b/OneSignalExample/.gitignore @@ -2,6 +2,7 @@ # # Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore # +/.utmp/ /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ @@ -9,6 +10,7 @@ /[Bb]uilds/ /[Ll]ogs/ /[Mm]emoryCaptures/ +/UserSettings/ # Asset meta data should only be ignored when the corresponding asset is also ignored !/[Aa]ssets/**/*.meta @@ -58,3 +60,12 @@ sysinfo.txt # Crashlytics generated file crashlytics-build.properties +# User-specific Unity Editor settings +/[Uu]serSettings/ + +# Gradle template backup files +*.backup +*.backup.meta +*.backup2 +*.backup2.meta + diff --git a/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef b/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef index 954c418d9..eb50b6a88 100644 --- a/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef +++ b/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef @@ -16,7 +16,7 @@ "versionDefines": [ { "name": "com.onesignal.unity.core", - "expression": "5.1.16", + "expression": "5.2.0", "define": "ONE_SIGNAL_INSTALLED" } ], diff --git a/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef b/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef index e02effcb1..53921af4e 100644 --- a/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef +++ b/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef @@ -16,7 +16,7 @@ "versionDefines": [ { "name": "com.onesignal.unity.core", - "expression": "5.1.16", + "expression": "5.2.0", "define": "ONE_SIGNAL_INSTALLED" } ], diff --git a/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef b/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef index ade4035fe..8bf8580b1 100644 --- a/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef +++ b/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef @@ -18,7 +18,7 @@ "versionDefines": [ { "name": "com.onesignal.unity.core", - "expression": "5.1.16", + "expression": "5.2.0", "define": "ONE_SIGNAL_INSTALLED" } ], diff --git a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs index 5198ab7f9..800e2c8df 100644 --- a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs +++ b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs @@ -461,6 +461,58 @@ public void GetTags() _log($"Get all user tags " + dictionaryString.TrimEnd(',', ' ') + "}"); } + public void TrackEvent() + { + // Detect platform + string platform = + Application.platform == RuntimePlatform.Android ? "android" + : Application.platform == RuntimePlatform.IPhonePlayer ? "ios" + : "unknown"; + + // Track event without properties + _log($"Tracking an event Unity-{platform}-noprops without properties"); + OneSignal.User.TrackEvent($"Unity-{platform}-noprops"); + + // Track event with comprehensive properties + var properties = new Dictionary + { + { "someNum", 123 }, + { "someFloat", 3.14159f }, + { "someString", "abc" }, + { "someBool", true }, + { + "someObject", + new Dictionary + { + { "abc", "123" }, + { + "nested", + new Dictionary { { "def", "456" } } + }, + } + }, + { + "someArray", + new List { 1, 2 } + }, + { + "someMixedArray", + new List + { + 1, + "2", + new Dictionary { { "abc", "123" } }, + } + }, + { "someNull", null }, + }; + + _log( + $"Tracking an event Unity-{platform} with properties: {Json.Serialize(properties)}" + ); + OneSignal.User.TrackEvent($"Unity-{platform}", properties); + } + /* * Outcomes */ diff --git a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity index fe91ab5ba..7681a945a 100644 --- a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity +++ b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657886, g: 0.49641275, b: 0.5748176, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -2708,7 +2704,7 @@ MonoBehaviour: email: externalId: phoneNumber: - appId: + appId: 77e32082-ea27-42e3-a898-c72e141824ef consentRequired: 0 consentGiven: 0 language: @@ -2720,6 +2716,9 @@ MonoBehaviour: triggerValue: outcomeKey: outcomeValue: 0 + eventName: + eventPropertyKey: + eventPropertyValue: liveActivityId: liveActivityIdToken: liveActivityType: @@ -5788,6 +5787,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 697472630} m_CullTransparentMesh: 1 +--- !u!1 &707775386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 707775387} + - component: {fileID: 707775390} + - component: {fileID: 707775389} + - component: {fileID: 707775388} + m_Layer: 5 + m_Name: button_track + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &707775387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707775386} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 808835462} + m_Father: {fileID: 1573374326} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &707775388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707775386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 707775389} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 307684281} + m_TargetAssemblyTypeName: OneSignalExampleBehaviour, OneSignal.UnityPackage.Example + m_MethodName: TrackEvent + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 +--- !u!114 &707775389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707775386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &707775390 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707775386} + m_CullTransparentMesh: 1 --- !u!1 &729372535 GameObject: m_ObjectHideFlags: 0 @@ -6552,6 +6684,85 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &808835461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808835462} + - component: {fileID: 808835464} + - component: {fileID: 808835463} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &808835462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808835461} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 707775387} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &808835463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808835461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Track Event +--- !u!222 &808835464 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808835461} + m_CullTransparentMesh: 1 --- !u!1 &815958052 GameObject: m_ObjectHideFlags: 0 @@ -6735,7 +6946,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -12482,9 +12693,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363215619} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -12534,8 +12744,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &1363215621 Transform: m_ObjectHideFlags: 0 @@ -14984,6 +15198,109 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1565302740} m_CullTransparentMesh: 1 +--- !u!1 &1573374325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1573374326} + - component: {fileID: 1573374329} + - component: {fileID: 1573374328} + - component: {fileID: 1573374327} + m_Layer: 5 + m_Name: track_event + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1573374326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573374325} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 707775387} + m_Father: {fileID: 1654894820} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1573374327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573374325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607844, g: 0.47450984, b: 0.47450984, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1573374328 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573374325} + m_CullTransparentMesh: 1 +--- !u!114 &1573374329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573374325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1581561354 GameObject: m_ObjectHideFlags: 0 @@ -15796,6 +16113,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 632752591} + - {fileID: 1573374326} - {fileID: 2086638413} - {fileID: 1037093730} - {fileID: 1144247376} diff --git a/OneSignalExample/Assets/OneSignal/VERSION b/OneSignalExample/Assets/OneSignal/VERSION index 16cf70e74..7cbea073b 100755 --- a/OneSignalExample/Assets/OneSignal/VERSION +++ b/OneSignalExample/Assets/OneSignal/VERSION @@ -1 +1 @@ -5.1.16 \ No newline at end of file +5.2.0 \ No newline at end of file diff --git a/OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties.backup b/OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties.backup deleted file mode 100644 index 4c2b1b2f9..000000000 --- a/OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties.backup +++ /dev/null @@ -1,8 +0,0 @@ -org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M -org.gradle.parallel=true -unityStreamingAssets=.unity3d**STREAMING_ASSETS** -# Android Resolver Properties Start -android.useAndroidX=true -android.enableJetifier=true -# Android Resolver Properties End -**ADDITIONAL_PROPERTIES** diff --git a/OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties.backup.meta b/OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties.backup.meta deleted file mode 100644 index e9c755ead..000000000 --- a/OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties.backup.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0ae810e7442784060be01bbd863c3355 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle index 67f435216..5d2e88bc0 100644 --- a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle +++ b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle @@ -7,7 +7,7 @@ apply from: '../shared/keepUnitySymbols.gradle' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android Resolver Dependencies Start - implementation 'com.onesignal:OneSignal:5.4.2' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 + implementation 'com.onesignal:OneSignal:5.6.0' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 // Android Resolver Dependencies End **DEPS**} diff --git a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle.backup b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle.backup deleted file mode 100644 index 0ce97f387..000000000 --- a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle.backup +++ /dev/null @@ -1,55 +0,0 @@ -// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN - -apply plugin: 'com.android.library' -**APPLY_PLUGINS** - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) -// Android Resolver Dependencies Start - implementation 'com.onesignal:OneSignal:5.4.2' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 -// Android Resolver Dependencies End -**DEPS**} - -// Android Resolver Exclusions Start -android { - packagingOptions { - exclude ('/lib/armeabi/*' + '*') - exclude ('/lib/mips/*' + '*') - exclude ('/lib/mips64/*' + '*') - exclude ('/lib/x86/*' + '*') - exclude ('/lib/x86_64/*' + '*') - } -} -// Android Resolver Exclusions End -android { - compileSdkVersion **APIVERSION** - buildToolsVersion '**BUILDTOOLS**' - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - minSdkVersion **MINSDKVERSION** - targetSdkVersion **TARGETSDKVERSION** - ndk { - abiFilters **ABIFILTERS** - } - versionCode **VERSIONCODE** - versionName '**VERSIONNAME**' - consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD** - } - - lintOptions { - abortOnError false - } - - aaptOptions { - noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ') - ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~" - }**PACKAGING_OPTIONS** -}**REPOSITORIES** -**IL_CPP_BUILD_SETUP** -**SOURCE_BUILD_SETUP** -**EXTERNAL_SOURCES** diff --git a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle.backup.meta b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle.backup.meta deleted file mode 100644 index ca953088e..000000000 --- a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle.backup.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 219a95088b39942d789aad72e89674fd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/OneSignalExample/Packages/packages-lock.json b/OneSignalExample/Packages/packages-lock.json index 98344d4d7..93f55afe5 100644 --- a/OneSignalExample/Packages/packages-lock.json +++ b/OneSignalExample/Packages/packages-lock.json @@ -5,7 +5,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.onesignal.unity.core": "5.1.16" + "com.onesignal.unity.core": "5.2.0" } }, "com.onesignal.unity.core": { @@ -19,7 +19,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.onesignal.unity.core": "5.1.16" + "com.onesignal.unity.core": "5.2.0" } }, "com.unity.ai.navigation": { diff --git a/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml b/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml index a293aee5a..a53e71608 100644 --- a/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml +++ b/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml @@ -1,6 +1,6 @@ - com.onesignal:OneSignal:5.4.2 + com.onesignal:OneSignal:5.6.0 diff --git a/OneSignalExample/ProjectSettings/MultiplayerManager.asset b/OneSignalExample/ProjectSettings/MultiplayerManager.asset deleted file mode 100644 index 2a936644e..000000000 --- a/OneSignalExample/ProjectSettings/MultiplayerManager.asset +++ /dev/null @@ -1,7 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!655991488 &1 -MultiplayerManager: - m_ObjectHideFlags: 0 - m_EnableMultiplayerRoles: 0 - m_StrippingTypes: {} diff --git a/OneSignalExample/ProjectSettings/ProjectSettings.asset b/OneSignalExample/ProjectSettings/ProjectSettings.asset index c4e534c44..646318ff7 100644 --- a/OneSignalExample/ProjectSettings/ProjectSettings.asset +++ b/OneSignalExample/ProjectSettings/ProjectSettings.asset @@ -142,7 +142,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 5.1.16 + bundleVersion: 5.2.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/OneSignalExample/ProjectSettings/SceneTemplateSettings.json b/OneSignalExample/ProjectSettings/SceneTemplateSettings.json index 6f3e60fd8..6ed312ae2 100644 --- a/OneSignalExample/ProjectSettings/SceneTemplateSettings.json +++ b/OneSignalExample/ProjectSettings/SceneTemplateSettings.json @@ -4,164 +4,123 @@ { "userAdded": false, "type": "UnityEngine.AnimationClip", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Animations.AnimatorController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.AnimatorOverrideController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Audio.AudioMixerController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.ComputeShader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Cubemap", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.GameObject", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.LightingDataAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.LightingSettings", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Material", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.MonoScript", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.PhysicMaterial", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.VolumeProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.SceneAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Shader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.ShaderVariantCollection", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Texture", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Texture2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Timeline.TimelineAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 } ], "defaultDependencyTypeInfo": { "userAdded": false, "type": "", - "ignore": false, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, "newSceneOverride": 0 } \ No newline at end of file diff --git a/OneSignalExample/UserSettings/EditorUserSettings.asset b/OneSignalExample/UserSettings/EditorUserSettings.asset deleted file mode 100644 index 2192a14f8..000000000 --- a/OneSignalExample/UserSettings/EditorUserSettings.asset +++ /dev/null @@ -1,24 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!162 &1 -EditorUserSettings: - m_ObjectHideFlags: 0 - serializedVersion: 4 - m_ConfigSettings: - RecentlyUsedScenePath-0: - value: 2242470311464674030b3f2b172d5e1c5932002b21382a3562061336d1e93336e3eb13f1e6372f303c31ec390a3b4f2afc031d12 - flags: 0 - vcSharedLogLevel: - value: 0d5e400f0650 - flags: 0 - m_VCAutomaticAdd: 1 - m_VCDebugCom: 0 - m_VCDebugCmd: 0 - m_VCDebugOut: 0 - m_SemanticMergeMode: 2 - m_VCShowFailedCheckout: 1 - m_VCOverwriteFailedCheckoutAssets: 1 - m_VCProjectOverlayIcons: 1 - m_VCHierarchyOverlayIcons: 1 - m_VCOtherOverlayIcons: 1 - m_VCAllowAsyncUpdate: 1 diff --git a/OneSignalExample/UserSettings/Layouts/default-6000.dwlt b/OneSignalExample/UserSettings/Layouts/default-6000.dwlt deleted file mode 100644 index 530840d2e..000000000 --- a/OneSignalExample/UserSettings/Layouts/default-6000.dwlt +++ /dev/null @@ -1,1563 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.ContainerWindow - m_PixelRect: - serializedVersion: 2 - x: 625 - y: -736 - width: 951 - height: 628 - m_ShowMode: 0 - m_Title: Project Settings - m_RootView: {fileID: 5} - m_MinSize: {x: 310, y: 226} - m_MaxSize: {x: 4000, y: 4026} - m_Maximized: 0 ---- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.ContainerWindow - m_PixelRect: - serializedVersion: 2 - x: 626 - y: -1343 - width: 725 - height: 578 - m_ShowMode: 0 - m_Title: Build Profiles - m_RootView: {fileID: 7} - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - m_Maximized: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 0 - y: 61 - width: 1728 - height: 1056 - m_ShowMode: 4 - m_Title: Console - m_RootView: {fileID: 12} - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectSettingsWindow - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.DockArea - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 951 - height: 628 - m_MinSize: {x: 310, y: 226} - m_MaxSize: {x: 4000, y: 4026} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.SplitView - m_Children: - - {fileID: 4} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 951 - height: 628 - m_MinSize: {x: 310, y: 226} - m_MaxSize: {x: 4000, y: 4026} - vertical: 0 - controlID: 912 - draggingID: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildProfileWindow - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.DockArea - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 725 - height: 578 - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.SplitView - m_Children: - - {fileID: 6} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 725 - height: 578 - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - vertical: 0 - controlID: 321 - draggingID: 0 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 15} - - {fileID: 9} - m_Position: - serializedVersion: 2 - x: 0 - y: 36 - width: 1728 - height: 1000 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 52 - draggingID: 0 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1274 - y: 0 - width: 454 - height: 1000 - m_MinSize: {x: 276, y: 76} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 21} - m_Panes: - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 261 - height: 639 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 22} - m_Panes: - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 639 - width: 1274 - height: 361 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 24} - m_Panes: - - {fileID: 20} - - {fileID: 24} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 13} - - {fileID: 8} - - {fileID: 14} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1728 - height: 1056 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 36 - m_UseBottomView: 1 - m_BottomViewHeight: 20 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1728 - height: 36 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 1036 - width: 1728 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 16} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1274 - height: 1000 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 53 - draggingID: 0 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 17} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1274 - height: 639 - m_MinSize: {x: 200, y: 50} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 54 - draggingID: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 261 - y: 0 - width: 1013 - height: 639 - m_MinSize: {x: 52, y: 76} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 25} - m_Panes: - - {fileID: 23} - - {fileID: 25} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.ProjectSettingsWindow - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Project Settings - m_Image: {fileID: 866346219090771560, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Project Settings\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 26 - width: 951 - height: 602 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 1255.9973} - m_Scope: 1 - m_SplitterPos: 100 - m_SearchText: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4dcf9b58 - m_LastClickedID: 1486606157 - m_ExpandedIDs: a01a5fa6000000007f0eae07e594f01a - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 15004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.BuildProfileModule.dll::UnityEditor.Build.Profile.BuildProfileWindow - m_MinSize: {x: 725, y: 400} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Profiles - m_Image: {fileID: 0} - m_Tooltip: - m_TextWithWhitespace: "Build Profiles\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 26 - width: 725 - height: 552 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 ---- !u!114 &20 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Project\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 739.5 - width: 1273 - height: 331.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets - m_Globs: [] - m_ProductIds: - m_AnyWithAssetOrigin: 0 - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets - m_LastFoldersGridSize: -1 - m_LastProjectPath: /Users/fadigeorge/Documents/Code/SDK/Mobile Wrappers/OneSignal-Unity-SDK/OneSignalExample - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 31} - m_SelectedIDs: 2a6f0000 - m_LastClickedID: 28458 - m_ExpandedIDs: 00000000b46a0000b66a0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000b46a0000b66a0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: dacdffff - m_LastClickedInstanceID: -12838 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 199 ---- !u!114 &21 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" - m_Pos: - serializedVersion: 2 - x: 1275 - y: 24 - width: 453 - height: 974 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &22 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Hierarchy\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 24 - width: 260 - height: 613 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: cce9ffffe4e9ffff22ebffff20fbffff - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 10} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 46b7a0fefa812c44ca6fda42b4d7b176 ---- !u!114 &23 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Scene\u200B" - m_Pos: - serializedVersion: 2 - x: 261 - y: 102 - width: 1011 - height: 611.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: - - dockPosition: 0 - containerId: overlay-toolbar__top - displayed: 1 - id: unity-transform-toolbar - index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-218.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: -218, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-toolbar__top - displayed: 0 - id: unity-scene-view-toolbar - index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-toolbar__top - displayed: 0 - id: unity-grid-and-snap-toolbar - index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Light Settings - index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Orientation - index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Camera - index: 2 - contents: - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Cloth Constraints - index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Cloth Collisions - index: 3 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Navmesh Display - index: 5 - contents: - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Agent Display - index: 6 - contents: - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Obstacle Display - index: 7 - contents: - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Occlusion Culling - index: 4 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Scene Visibility - index: 5 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: unity-search-toolbar - index: 6 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Particles - index: 8 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Physics Debugger - index: 9 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Tool Settings - index: 10 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 0 - containerId: overlay-toolbar__top - displayed: 0 - id: Brush Attributes - index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-toolbar__top - displayed: 1 - id: unity-scene-view-camera-mode-toolbar - index: 1 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 24, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 1 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 0 - containerId: overlay-toolbar__left - displayed: 0 - id: Terrain Tools - index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 0 - containerId: overlay-toolbar__left - displayed: 0 - id: Brush Masks - index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--left - displayed: 0 - id: Scene View/Lighting Visualization Colors - index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--left - displayed: 1 - id: Overlays/OverlayMenu - index: 1 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 24, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 1 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: APV Overlay - index: 14 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 1 - id: AINavigationOverlay - index: 7 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 24, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: SceneView/CamerasOverlay - index: 11 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/PBR Validation Settings - index: 12 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/TrailRenderer - index: 13 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Open Tile Palette - index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Tile Palette Clipboard - index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Tilemap Focus - index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Tile Palette Brush Pick - index: 4 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Path - index: 18 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Sprite Swap - index: 19 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - m_ContainerData: - - containerId: overlay-toolbar__top - scrollOffset: 0 - - containerId: overlay-toolbar__left - scrollOffset: 0 - - containerId: overlay-container--left - scrollOffset: 0 - - containerId: overlay-container--right - scrollOffset: 0 - - containerId: overlay-toolbar__right - scrollOffset: 0 - - containerId: overlay-toolbar__bottom - scrollOffset: 0 - - containerId: Floating - scrollOffset: 0 - m_OverlaysVisible: 1 - m_WindowGUID: d69a67902db7f994ca099bec79d22ce1 - m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 - m_SceneLighting: 1 - m_2DMode: 0 - m_isRotationLocked: 0 - m_PlayAudio: 0 - m_AudioPlay: 0 - m_DebugDrawModesUseInteractiveLightBakingData: 0 - m_Position: - m_Target: {x: 0, y: 0, z: 0} - speed: 2 - m_Value: {x: 0, y: 0, z: 0} - m_RenderMode: 0 - m_CameraMode: - drawMode: 0 - name: Shaded - section: Shading Mode - m_ValidateTrueMetals: 0 - m_DoValidateTrueMetals: 0 - m_SceneViewState: - m_AlwaysRefresh: 0 - showFog: 1 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - showParticleSystems: 1 - showVisualEffectGraphs: 1 - m_FxEnabled: 1 - m_Grid: - xGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - yGrid: - m_Fade: - m_Target: 1 - speed: 2 - m_Value: 1 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - zGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - m_ShowGrid: 1 - m_GridAxis: 1 - m_gridOpacity: 0.5 - m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_Size: - m_Target: 10 - speed: 2 - m_Value: 10 - m_Ortho: - m_Target: 0 - speed: 2 - m_Value: 0 - m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 - m_SpeedMin: 0.01 - m_SpeedMax: 2 - m_EasingEnabled: 1 - m_EasingDuration: 0.4 - m_AccelerationEnabled: 1 - m_FieldOfViewHorizontalOrVertical: 60 - m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 - m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_LastSceneViewOrtho: 0 - m_Viewpoint: - m_SceneView: {fileID: 23} - m_CameraOverscanSettings: - m_Opacity: 50 - m_Scale: 1 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_SceneVisActive: 1 - m_LastLockedObject: {fileID: 0} - m_LastDebugDrawMode: - drawMode: 35 - name: Contributors / Receivers - section: Lighting - m_ViewIsLockedToObject: 0 ---- !u!114 &24 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Console\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 663 - width: 1273 - height: 335 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 ---- !u!114 &25 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 50, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Game\u200B" - m_Pos: - serializedVersion: 2 - x: 262 - y: 24 - width: 1011 - height: 613 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - /Users/fadigeorge/Documents/Code/SDK/OneSignal-Unity-SDK/OneSignalExample/Library/PlayModeViewStates/35ac946aa01074e9f94057f0692f7d1e - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2022, y: 1184} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -505.5 - m_HBaseRangeMax: 505.5 - m_VBaseRangeMin: -296 - m_VBaseRangeMax: 296 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1011 - height: 592 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 505.5, y: 296} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -505.5 - y: -296 - width: 1011 - height: 592 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 2022, y: 1226} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} - m_showToolbar: 1 diff --git a/OneSignalExample/UserSettings/Search.index b/OneSignalExample/UserSettings/Search.index deleted file mode 100644 index dba62d53a..000000000 --- a/OneSignalExample/UserSettings/Search.index +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Assets", - "roots": ["Assets"], - "includes": [], - "excludes": [], - "options": { - "types": true, - "properties": true, - "extended": false, - "dependencies": false - }, - "baseScore": 999 -} \ No newline at end of file diff --git a/OneSignalExample/UserSettings/Search.settings b/OneSignalExample/UserSettings/Search.settings deleted file mode 100644 index c554aa076..000000000 --- a/OneSignalExample/UserSettings/Search.settings +++ /dev/null @@ -1,82 +0,0 @@ -trackSelection = true -refreshSearchWindowsInPlayMode = false -pickerAdvancedUI = false -fetchPreview = true -defaultFlags = 0 -keepOpen = true -queryFolder = "Assets" -onBoardingDoNotAskAgain = true -showPackageIndexes = false -showStatusBar = false -scopes = { -} -providers = { - asset = { - active = true - priority = 25 - defaultAction = null - } - scene = { - active = true - priority = 50 - defaultAction = null - } - adb = { - active = false - priority = 2500 - defaultAction = null - } - presets_provider = { - active = false - priority = -10 - defaultAction = null - } - find = { - active = true - priority = 25 - defaultAction = null - } - packages = { - active = false - priority = 90 - defaultAction = null - } - profilermarkers = { - active = false - priority = 100 - defaultAction = null - } - performance = { - active = false - priority = 100 - defaultAction = null - } - store = { - active = false - priority = 100 - defaultAction = null - } - log = { - active = false - priority = 210 - defaultAction = null - } -} -objectSelectors = { -} -recentSearches = [ -] -searchItemFavorites = [ -] -savedSearchesSortOrder = 0 -showSavedSearchPanel = false -hideTabs = false -expandedQueries = [ -] -queryBuilder = true -ignoredProperties = "id;name;classname;imagecontentshash" -helperWidgetCurrentArea = "all" -disabledIndexers = "" -minIndexVariations = 2 -findProviderIndexHelper = true -itemIconSize = 32 \ No newline at end of file diff --git a/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml b/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml index eba59b7b6..87b1b8b2a 100644 --- a/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml +++ b/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml @@ -1,8 +1,8 @@ - + https://repo.maven.apache.org/maven2 - + diff --git a/com.onesignal.unity.android/Runtime/AndroidUserManager.cs b/com.onesignal.unity.android/Runtime/AndroidUserManager.cs index 88d8c077e..1b7242a67 100644 --- a/com.onesignal.unity.android/Runtime/AndroidUserManager.cs +++ b/com.onesignal.unity.android/Runtime/AndroidUserManager.cs @@ -109,6 +109,9 @@ public void RemoveAliases(params string[] labels) => public void RemoveSms(string sms) => _user.Call("removeSms", sms); + public void TrackEvent(string name, Dictionary properties = null) => + _user.Call("trackEvent", name, properties?.ToMap()); + public void Initialize() { _user.Call("addObserver", new InternalUserChangedHandler(this)); diff --git a/com.onesignal.unity.android/Runtime/Utilities/AndroidJavaObjectExtensions.cs b/com.onesignal.unity.android/Runtime/Utilities/AndroidJavaObjectExtensions.cs index 4fca3fe78..960631414 100644 --- a/com.onesignal.unity.android/Runtime/Utilities/AndroidJavaObjectExtensions.cs +++ b/com.onesignal.unity.android/Runtime/Utilities/AndroidJavaObjectExtensions.cs @@ -135,6 +135,9 @@ public static AndroidJavaObject ToMap(this Dictionary source) public static AndroidJavaObject ToMap(this Dictionary source) { + if (source == null) + return null; + var map = new AndroidJavaObject("java.util.HashMap"); var put = AndroidJNIHelper.GetMethodID( map.GetRawClass(), @@ -145,18 +148,67 @@ public static AndroidJavaObject ToMap(this Dictionary source) var entryArgs = new object[2]; foreach (var kv in source) { - var key = new AndroidJavaObject("java.lang.String", kv.Key); - var value = new AndroidJavaClass("java.lang.String").CallStatic( - "valueOf", - kv.Value - ); - entryArgs[0] = key; - entryArgs[1] = value; - AndroidJNI.CallObjectMethod( - map.GetRawObject(), - put, - AndroidJNIHelper.CreateJNIArgArray(entryArgs) - ); + using (var key = new AndroidJavaObject("java.lang.String", kv.Key)) + { + AndroidJavaObject value = null; + + // Preserve original data types + switch (kv.Value) + { + case string stringValue: + value = new AndroidJavaObject("java.lang.String", stringValue); + break; + case int intValue: + value = new AndroidJavaObject("java.lang.Integer", intValue); + break; + case long longValue: + value = new AndroidJavaObject("java.lang.Long", longValue); + break; + case float floatValue: + value = new AndroidJavaObject("java.lang.Float", floatValue); + break; + case double doubleValue: + value = new AndroidJavaObject("java.lang.Double", doubleValue); + break; + case bool boolValue: + value = new AndroidJavaObject("java.lang.Boolean", boolValue); + break; + case Dictionary dictValue: + value = new AndroidJavaObject( + "org.json.JSONObject", + Json.Serialize(dictValue) + ); + break; + case System.Collections.IList listValue: + value = new AndroidJavaObject( + "org.json.JSONArray", + Json.Serialize(listValue) + ); + break; + case null: + value = null; + break; + default: + // Fallback to string representation for unsupported types + value = new AndroidJavaObject("java.lang.String", kv.Value.ToString()); + break; + } + + try + { + entryArgs[0] = key; + entryArgs[1] = value; + AndroidJNI.CallObjectMethod( + map.GetRawObject(), + put, + AndroidJNIHelper.CreateJNIArgArray(entryArgs) + ); + } + finally + { + value?.Dispose(); + } + } } return map; diff --git a/com.onesignal.unity.android/package.json b/com.onesignal.unity.android/package.json index b2ae43f2d..e439b6119 100644 --- a/com.onesignal.unity.android/package.json +++ b/com.onesignal.unity.android/package.json @@ -1,11 +1,11 @@ { "name": "com.onesignal.unity.android", "displayName": "OneSignal Unity SDK - Android", - "version": "5.1.16", + "version": "5.2.0", "unity": "2018.4", "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.", "dependencies": { - "com.onesignal.unity.core": "5.1.16" + "com.onesignal.unity.core": "5.2.0" }, "keywords": [ "push-notifications", diff --git a/com.onesignal.unity.core/Editor/Platform/UserManager.cs b/com.onesignal.unity.core/Editor/Platform/UserManager.cs index 27fb9cee9..58170395d 100644 --- a/com.onesignal.unity.core/Editor/Platform/UserManager.cs +++ b/com.onesignal.unity.core/Editor/Platform/UserManager.cs @@ -85,5 +85,7 @@ public void RemoveEmail(string email) { } public void AddSms(string sms) { } public void RemoveSms(string sms) { } + + public void TrackEvent(string name, Dictionary properties = null) { } } } diff --git a/com.onesignal.unity.core/Runtime/OneSignal.cs b/com.onesignal.unity.core/Runtime/OneSignal.cs index a2a35cbe7..a18e52d40 100755 --- a/com.onesignal.unity.core/Runtime/OneSignal.cs +++ b/com.onesignal.unity.core/Runtime/OneSignal.cs @@ -42,7 +42,7 @@ namespace OneSignalSDK /// public static partial class OneSignal { - public const string Version = "5.1.16"; + public const string Version = "5.2.0"; /// /// The default static instance of the OneSignal Unity SDK diff --git a/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs b/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs index a07544e31..2e3ecc85b 100644 --- a/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs +++ b/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs @@ -40,7 +40,7 @@ namespace OneSignalSDK { public abstract class OneSignalPlatform { - public const string VersionHeader = "005116"; + public const string VersionHeader = "000520"; internal static event Action OnInitialize; diff --git a/com.onesignal.unity.core/Runtime/User/IUserManager.cs b/com.onesignal.unity.core/Runtime/User/IUserManager.cs index 23eaaa4d8..d90c0f8ab 100644 --- a/com.onesignal.unity.core/Runtime/User/IUserManager.cs +++ b/com.onesignal.unity.core/Runtime/User/IUserManager.cs @@ -179,5 +179,12 @@ public interface IUserManager /// /// The sms address that the current user was subscribed for, and should no longer be. void RemoveSms(string sms); + + /// + /// Track a custom event for the current user. + /// + /// The name of the event to track. + /// A dictionary of properties associated with the event. Values can be strings, numbers, or booleans. + void TrackEvent(string name, Dictionary properties = null); } } diff --git a/com.onesignal.unity.core/package.json b/com.onesignal.unity.core/package.json index 5f3438609..c51044ef8 100644 --- a/com.onesignal.unity.core/package.json +++ b/com.onesignal.unity.core/package.json @@ -1,7 +1,7 @@ { "name": "com.onesignal.unity.core", "displayName": "OneSignal Unity SDK - Core", - "version": "5.1.16", + "version": "5.2.0", "unity": "2018.4", "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.", "dependencies": { diff --git a/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml b/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml index b0afe4823..31fdb77f9 100644 --- a/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml +++ b/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml @@ -1,5 +1,5 @@ - + - + diff --git a/com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm b/com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm index 0e6cf28d7..54485008d 100644 --- a/com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm +++ b/com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm @@ -249,4 +249,16 @@ void _oneSignalPushSubscriptionAddStateChangedCallback(StateListenerDelegate cal void _oneSignalUserAddStateChangedCallback(UserStateListenerDelegate callback) { [[OneSignalUserStateObserver sharedUserObserver] setUserStateDelegate:callback]; } -} + + void _oneSignalUserTrackEvent(const char *name, const char *propertiesJson) { + NSString *eventName = TO_NSSTRING(name); + + if (propertiesJson != NULL) { + NSDictionary *properties = + oneSignalDictionaryFromJsonString(propertiesJson); + [OneSignal.User trackEventWithName:eventName properties:properties]; + } else { + [OneSignal.User trackEventWithName:eventName properties:nil]; + } + } +} \ No newline at end of file diff --git a/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm b/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm index af77a8d1e..05820b55e 100644 --- a/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm +++ b/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm @@ -97,7 +97,7 @@ - (void)setOneSignalUnityDelegate:(id )delegate { - (BOOL)oneSignalApplication:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [OneSignalWrapper setSdkType:@"unity"]; - [OneSignalWrapper setSdkVersion:@"005116"]; + [OneSignalWrapper setSdkVersion:@"000520"]; [OneSignal initialize:nil withLaunchOptions:launchOptions]; if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)]) diff --git a/com.onesignal.unity.ios/Runtime/iOSUserManager.cs b/com.onesignal.unity.ios/Runtime/iOSUserManager.cs index 2310bb9b5..66ddd3449 100644 --- a/com.onesignal.unity.ios/Runtime/iOSUserManager.cs +++ b/com.onesignal.unity.ios/Runtime/iOSUserManager.cs @@ -91,6 +91,9 @@ private static extern void _oneSignalUserAddStateChangedCallback( UserStateListenerDelegate callback ); + [DllImport("__Internal")] + private static extern void _oneSignalUserTrackEvent(string name, string propertiesJson); + public delegate void UserStateListenerDelegate(string current); public event EventHandler Changed; @@ -163,6 +166,14 @@ public void RemoveAliases(params string[] labels) => public void RemoveSms(string sms) => _oneSignalUserRemoveSms(sms); + public void TrackEvent(string name, Dictionary properties = null) + { + if (properties != null) + _oneSignalUserTrackEvent(name, Json.Serialize(properties)); + else + _oneSignalUserTrackEvent(name, null); + } + public void Initialize() { _pushSubscription.Initialize(); diff --git a/com.onesignal.unity.ios/package.json b/com.onesignal.unity.ios/package.json index a1b08c49b..e6da9779d 100644 --- a/com.onesignal.unity.ios/package.json +++ b/com.onesignal.unity.ios/package.json @@ -1,11 +1,11 @@ { "name": "com.onesignal.unity.ios", "displayName": "OneSignal Unity SDK - iOS", - "version": "5.1.16", + "version": "5.2.0", "unity": "2018.4", "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.", "dependencies": { - "com.onesignal.unity.core": "5.1.16" + "com.onesignal.unity.core": "5.2.0" }, "keywords": [ "push-notifications",