Skip to content

Commit 5bba22a

Browse files
uerceguerceg
authored
Merge pull request #155 from adjust/v4190
Version 4.19.0
2 parents 92502c5 + 3ee7d52 commit 5bba22a

29 files changed

+678
-526
lines changed

‎Assets/Adjust/Adjust.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,19 @@ public static void gdprForgetMe()
197197
#endif
198198
}
199199

200+
public static void disableThirdPartySharing()
201+
{
202+
#if UNITY_IOS
203+
AdjustiOS.DisableThirdPartySharing();
204+
#elif UNITY_ANDROID
205+
AdjustAndroid.DisableThirdPartySharing();
206+
#elif (UNITY_WSA || UNITY_WP8)
207+
Debug.Log("Disable third party sharing is only supported for Android and iOS platforms.")
208+
#else
209+
Debug.Log(errorMsgPlatform);
210+
#endif
211+
}
212+
200213
public static void appWillOpenUrl(string url)
201214
{
202215
if (IsEditor()) { return; }

‎Assets/Adjust/Adjust.prefab

-2.92 KB
Binary file not shown.

‎Assets/Adjust/Android/AdjustAndroid.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
88
#if UNITY_ANDROID
99
public class AdjustAndroid
1010
{
11-
private const string sdkPrefix = "unity4.18.2";
11+
private const string sdkPrefix = "unity4.19.0";
1212
private static bool launchDeferredDeeplink = true;
1313
private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
1414
private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");
@@ -258,6 +258,11 @@ public static void GdprForgetMe()
258258
ajcAdjust.CallStatic("gdprForgetMe", ajoCurrentActivity);
259259
}
260260

261+
public static void DisableThirdPartySharing()
262+
{
263+
ajcAdjust.CallStatic("disableThirdPartySharing", ajoCurrentActivity);
264+
}
265+
261266
public static AdjustAttribution GetAttribution()
262267
{
263268
try

‎Assets/Adjust/Android/Test/adjust-test.jar

69 Bytes
Binary file not shown.

‎Assets/Adjust/Android/adjust-android.jar

26.7 KB
Binary file not shown.

‎Assets/Adjust/ExampleGUI/ExampleGUI.prefab

-4.12 KB
Binary file not shown.

‎Assets/Adjust/ExampleGUI/ExampleGUI.unity

2.1 KB
Binary file not shown.

‎Assets/Adjust/Test/CommandExecutor.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public void ExecuteCommand(Command command)
6666
case "sendReferrer": SetReferrer(); break;
6767
case "gdprForgetMe": GdprForgetMe(); break;
6868
case "trackAdRevenue": TrackAdRevenue(); break;
69+
case "disableThirdPartySharing": DisableThirdPartySharing(); break;
6970

7071
default: CommandNotFound(_command.ClassName, _command.MethodName); break;
7172
}
@@ -559,6 +560,11 @@ public void GdprForgetMe()
559560
Adjust.gdprForgetMe();
560561
}
561562

563+
public void DisableThirdPartySharing()
564+
{
565+
Adjust.disableThirdPartySharing();
566+
}
567+
562568
private void SetOfflineMode()
563569
{
564570
var enabled = bool.Parse(_command.GetFirstParameterValue("enabled"));

‎Assets/Adjust/Test/TestApp.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ public class TestApp : MonoBehaviour
99
{
1010
public static readonly string TAG = "[TestApp]";
1111

12-
#if (UNITY_WSA || UNITY_WP8)
12+
#if (UNITY_STANDALONE_WIN)
1313
private const string PORT = ":8080";
1414
private const string PROTOCOL = "http://";
1515
private const string IP = "localhost";
1616
#elif UNITY_ANDROID
1717
private const string PORT = ":8443";
1818
private const string PROTOCOL = "https://";
19-
private const string IP = "192.168.8.207";
19+
private const string IP = "192.168.10.137";
2020
#elif UNITY_IOS
2121
private const string PORT = ":8080";
2222
private const string PROTOCOL = "http://";
23-
private const string IP = "192.168.8.207";
23+
private const string IP = "192.168.10.137";
2424
private TestLibraryiOS _testLibraryiOS;
2525
#endif
2626
private const string BASE_URL = PROTOCOL + IP + PORT;

‎Assets/Adjust/Test/TestApp.unity

Lines changed: 29 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 9
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -39,7 +39,6 @@ RenderSettings:
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
4141
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
42-
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &4
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
@@ -50,19 +49,20 @@ LightmapSettings:
5049
m_BounceScale: 1
5150
m_IndirectOutputScale: 1
5251
m_AlbedoBoost: 1
52+
m_TemporalCoherenceThreshold: 1
5353
m_EnvironmentLightingMode: 0
5454
m_EnableBakedLightmaps: 1
5555
m_EnableRealtimeLightmaps: 0
5656
m_LightmapEditorSettings:
57-
serializedVersion: 12
57+
serializedVersion: 9
5858
m_Resolution: 1
5959
m_BakeResolution: 50
60-
m_AtlasSize: 1024
60+
m_TextureWidth: 1024
61+
m_TextureHeight: 1024
6162
m_AO: 0
6263
m_AOMaxDistance: 1
6364
m_CompAOExponent: 0
6465
m_CompAOExponentDirect: 0
65-
m_ExtractAmbientOcclusion: 0
6666
m_Padding: 2
6767
m_LightmapParameters: {fileID: 0}
6868
m_LightmapsBakeMode: 1
@@ -77,16 +77,10 @@ LightmapSettings:
7777
m_PVRDirectSampleCount: 32
7878
m_PVRSampleCount: 500
7979
m_PVRBounces: 2
80-
m_PVREnvironmentSampleCount: 500
81-
m_PVREnvironmentReferencePointCount: 2048
82-
m_PVRFilteringMode: 2
83-
m_PVRDenoiserTypeDirect: 0
84-
m_PVRDenoiserTypeIndirect: 0
85-
m_PVRDenoiserTypeAO: 0
8680
m_PVRFilterTypeDirect: 0
8781
m_PVRFilterTypeIndirect: 0
8882
m_PVRFilterTypeAO: 0
89-
m_PVREnvironmentMIS: 0
83+
m_PVRFilteringMode: 2
9084
m_PVRCulling: 1
9185
m_PVRFilteringGaussRadiusDirect: 1
9286
m_PVRFilteringGaussRadiusIndirect: 5
@@ -95,7 +89,6 @@ LightmapSettings:
9589
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9690
m_PVRFilteringAtrousPositionSigmaAO: 1
9791
m_ShowResolutionOverlay: 1
98-
m_ExportTrainingData: 0
9992
m_LightingDataAsset: {fileID: 0}
10093
m_UseShadowmask: 0
10194
--- !u!196 &5
@@ -120,60 +113,54 @@ NavMeshSettings:
120113
debug:
121114
m_Flags: 0
122115
m_NavMeshData: {fileID: 0}
123-
--- !u!1001 &1736520633
124-
PrefabInstance:
116+
--- !u!1001 &1452326133
117+
Prefab:
125118
m_ObjectHideFlags: 0
126119
serializedVersion: 2
127120
m_Modification:
128121
m_TransformParent: {fileID: 0}
129122
m_Modifications:
130-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
123+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
131124
propertyPath: m_LocalPosition.x
132125
value: 0
133126
objectReference: {fileID: 0}
134-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
127+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
135128
propertyPath: m_LocalPosition.y
136-
value: 1
129+
value: 0
137130
objectReference: {fileID: 0}
138-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
131+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
139132
propertyPath: m_LocalPosition.z
140-
value: -10
133+
value: 0
141134
objectReference: {fileID: 0}
142-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
135+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
143136
propertyPath: m_LocalRotation.x
144137
value: 0
145138
objectReference: {fileID: 0}
146-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
139+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
147140
propertyPath: m_LocalRotation.y
148141
value: 0
149142
objectReference: {fileID: 0}
150-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
143+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
151144
propertyPath: m_LocalRotation.z
152145
value: 0
153146
objectReference: {fileID: 0}
154-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
147+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
155148
propertyPath: m_LocalRotation.w
156149
value: 1
157150
objectReference: {fileID: 0}
158-
- target: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
151+
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
159152
propertyPath: m_RootOrder
160-
value: 0
161-
objectReference: {fileID: 0}
162-
- target: {fileID: 11400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
163-
propertyPath: m_Enabled
164-
value: 0
153+
value: 1
165154
objectReference: {fileID: 0}
166-
m_RemovedComponents:
167-
- {fileID: 11400000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
168-
m_SourcePrefab: {fileID: 100100000, guid: ad78aa2c254af445c98de30c7ac88cb1, type: 2}
155+
m_RemovedComponents: []
156+
m_ParentPrefab: {fileID: 100100000, guid: a3267720e82aa41c1a05ab29824902b4, type: 2}
157+
m_IsPrefabParent: 0
169158
--- !u!1 &1736520634
170159
GameObject:
171160
m_ObjectHideFlags: 0
172-
m_CorrespondingSourceObject: {fileID: 100000, guid: ad78aa2c254af445c98de30c7ac88cb1,
173-
type: 2}
174-
m_PrefabInstance: {fileID: 1736520633}
175-
m_PrefabAsset: {fileID: 0}
176-
serializedVersion: 6
161+
m_PrefabParentObject: {fileID: 0}
162+
m_PrefabInternal: {fileID: 0}
163+
serializedVersion: 5
177164
m_Component:
178165
- component: {fileID: 1736520636}
179166
- component: {fileID: 1736520635}
@@ -187,9 +174,8 @@ GameObject:
187174
--- !u!114 &1736520635
188175
MonoBehaviour:
189176
m_ObjectHideFlags: 0
190-
m_CorrespondingSourceObject: {fileID: 0}
191-
m_PrefabInstance: {fileID: 0}
192-
m_PrefabAsset: {fileID: 0}
177+
m_PrefabParentObject: {fileID: 0}
178+
m_PrefabInternal: {fileID: 0}
193179
m_GameObject: {fileID: 1736520634}
194180
m_Enabled: 1
195181
m_EditorHideFlags: 0
@@ -199,10 +185,8 @@ MonoBehaviour:
199185
--- !u!4 &1736520636
200186
Transform:
201187
m_ObjectHideFlags: 0
202-
m_CorrespondingSourceObject: {fileID: 400000, guid: ad78aa2c254af445c98de30c7ac88cb1,
203-
type: 2}
204-
m_PrefabInstance: {fileID: 1736520633}
205-
m_PrefabAsset: {fileID: 0}
188+
m_PrefabParentObject: {fileID: 0}
189+
m_PrefabInternal: {fileID: 0}
206190
m_GameObject: {fileID: 1736520634}
207191
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
208192
m_LocalPosition: {x: 0, y: 1, z: -10}
@@ -211,44 +195,3 @@ Transform:
211195
m_Father: {fileID: 0}
212196
m_RootOrder: 0
213197
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
214-
--- !u!1001 &1831652741
215-
PrefabInstance:
216-
m_ObjectHideFlags: 0
217-
serializedVersion: 2
218-
m_Modification:
219-
m_TransformParent: {fileID: 0}
220-
m_Modifications:
221-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
222-
propertyPath: m_LocalPosition.x
223-
value: 0
224-
objectReference: {fileID: 0}
225-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
226-
propertyPath: m_LocalPosition.y
227-
value: 0
228-
objectReference: {fileID: 0}
229-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
230-
propertyPath: m_LocalPosition.z
231-
value: 0
232-
objectReference: {fileID: 0}
233-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
234-
propertyPath: m_LocalRotation.x
235-
value: 0
236-
objectReference: {fileID: 0}
237-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
238-
propertyPath: m_LocalRotation.y
239-
value: 0
240-
objectReference: {fileID: 0}
241-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
242-
propertyPath: m_LocalRotation.z
243-
value: 0
244-
objectReference: {fileID: 0}
245-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
246-
propertyPath: m_LocalRotation.w
247-
value: 1
248-
objectReference: {fileID: 0}
249-
- target: {fileID: 415478, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}
250-
propertyPath: m_RootOrder
251-
value: 1
252-
objectReference: {fileID: 0}
253-
m_RemovedComponents: []
254-
m_SourcePrefab: {fileID: 100100000, guid: a3267720e82aa41c1a05ab29824902b4, type: 3}

‎Assets/Adjust/Windows/AdjustWindows.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace com.adjust.sdk
1717
{
1818
public class AdjustWindows
1919
{
20-
private const string sdkPrefix = "unity4.18.2";
20+
private const string sdkPrefix = "unity4.19.0";
2121
private static bool appLaunched = false;
2222

2323
public static void Start(AdjustConfig adjustConfig)

0 commit comments

Comments
 (0)