Skip to content

Commit 1912fa4

Browse files
committed
fixed issue wth endpoints
1 parent 827924f commit 1912fa4

File tree

5 files changed

+85
-7
lines changed

5 files changed

+85
-7
lines changed

Assets/LootLocker/Game/LootLockerSDKManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public static void GetAssetsById(string[] assetIdsToRetrieve, Action<AssetRespon
417417
for (int i = 0; i < assetIdsToRetrieve.Length; i++)
418418
data.getRequests.Add(assetIdsToRetrieve[i]);
419419

420-
LootLockerAPIManager.RemoveFavouriteAsset(data, onComplete);
420+
LootLockerAPIManager.GetAssetsById(data, onComplete);
421421
}
422422

423423
#endregion

Assets/LootLocker/Game/Requests/AssetRequest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static void ListFavouriteAssets(Action<FavouritesListResponse> onComplete
247247

248248
public static void AddFavouriteAsset(LootLockerGetRequest data, Action<AssetResponse> onComplete)
249249
{
250-
EndPointClass endPoint = LootLockerEndPoints.current.gettingAssetInformationForOneorMoreAssets;
250+
EndPointClass endPoint = LootLockerEndPoints.current.addingFavouriteAssets;
251251

252252
string getVariable = string.Format(endPoint.endPoint, data.getRequests[0]);
253253

@@ -272,7 +272,7 @@ public static void AddFavouriteAsset(LootLockerGetRequest data, Action<AssetResp
272272

273273
public static void RemoveFavouriteAsset(LootLockerGetRequest data, Action<AssetResponse> onComplete)
274274
{
275-
EndPointClass endPoint = LootLockerEndPoints.current.gettingAssetInformationForOneorMoreAssets;
275+
EndPointClass endPoint = LootLockerEndPoints.current.removingFavouriteAssets;
276276

277277
string getVariable = string.Format(endPoint.endPoint, data.getRequests[0]);
278278

Assets/LootLocker/Game/Resources/Config/LootLockerEndPoints.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ MonoBehaviour:
139139
endPoint: v1/assets/list?after={0}&count={1}
140140
httpMethod: 0
141141
getAssetsById:
142-
endPoint:
142+
endPoint: v1/assets/by/id?asset_ids={0}
143143
httpMethod: 0
144144
gettingAllAssets:
145145
endPoint: v1/assets

Assets/LootLocker/Game/Samples/Scenes/GameTestScenes/AssetsScene.unity

Lines changed: 80 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RenderSettings:
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
46-
serializedVersion: 11
46+
serializedVersion: 12
4747
m_GIWorkflowMode: 1
4848
m_GISettings:
4949
serializedVersion: 2
@@ -98,7 +98,7 @@ LightmapSettings:
9898
m_TrainingDataDestination: TrainingData
9999
m_LightProbeSampleCountMultiplier: 4
100100
m_LightingDataAsset: {fileID: 0}
101-
m_UseShadowmask: 1
101+
m_LightingSettings: {fileID: 535673864}
102102
--- !u!196 &4
103103
NavMeshSettings:
104104
serializedVersion: 2
@@ -118,6 +118,8 @@ NavMeshSettings:
118118
manualTileSize: 0
119119
tileSize: 256
120120
accuratePlacement: 0
121+
maxJobWorkers: 0
122+
preserveTilesOutsideBounds: 0
121123
debug:
122124
m_Flags: 0
123125
m_NavMeshData: {fileID: 0}
@@ -204,18 +206,94 @@ Transform:
204206
m_Father: {fileID: 0}
205207
m_RootOrder: 0
206208
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
209+
--- !u!850595691 &535673864
210+
LightingSettings:
211+
m_ObjectHideFlags: 0
212+
m_CorrespondingSourceObject: {fileID: 0}
213+
m_PrefabInstance: {fileID: 0}
214+
m_PrefabAsset: {fileID: 0}
215+
m_Name: Settings.lighting
216+
serializedVersion: 2
217+
m_GIWorkflowMode: 1
218+
m_EnableBakedLightmaps: 0
219+
m_EnableRealtimeLightmaps: 0
220+
m_RealtimeEnvironmentLighting: 1
221+
m_BounceScale: 1
222+
m_AlbedoBoost: 1
223+
m_IndirectOutputScale: 1
224+
m_UsingShadowmask: 1
225+
m_BakeBackend: 1
226+
m_LightmapMaxSize: 1024
227+
m_BakeResolution: 40
228+
m_Padding: 2
229+
m_TextureCompression: 1
230+
m_AO: 0
231+
m_AOMaxDistance: 1
232+
m_CompAOExponent: 1
233+
m_CompAOExponentDirect: 0
234+
m_ExtractAO: 0
235+
m_MixedBakeMode: 2
236+
m_LightmapsBakeMode: 1
237+
m_FilterMode: 1
238+
m_LightmapParameters: {fileID: 0}
239+
m_ExportTrainingData: 0
240+
m_TrainingDataDestination: TrainingData
241+
m_RealtimeResolution: 2
242+
m_ForceWhiteAlbedo: 0
243+
m_ForceUpdates: 0
244+
m_FinalGather: 0
245+
m_FinalGatherRayCount: 256
246+
m_FinalGatherFiltering: 1
247+
m_PVRCulling: 1
248+
m_PVRSampling: 1
249+
m_PVRDirectSampleCount: 32
250+
m_PVRSampleCount: 512
251+
m_PVREnvironmentSampleCount: 256
252+
m_PVREnvironmentReferencePointCount: 2048
253+
m_LightProbeSampleCountMultiplier: 4
254+
m_PVRBounces: 2
255+
m_PVRRussianRouletteStartBounce: 2
256+
m_PVREnvironmentMIS: 1
257+
m_PVRFilteringMode: 1
258+
m_PVRDenoiserTypeDirect: 1
259+
m_PVRDenoiserTypeIndirect: 1
260+
m_PVRDenoiserTypeAO: 1
261+
m_PVRFilterTypeDirect: 0
262+
m_PVRFilterTypeIndirect: 0
263+
m_PVRFilterTypeAO: 0
264+
m_PVRFilteringGaussRadiusDirect: 1
265+
m_PVRFilteringGaussRadiusIndirect: 5
266+
m_PVRFilteringGaussRadiusAO: 2
267+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
268+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
269+
m_PVRFilteringAtrousPositionSigmaAO: 1
207270
--- !u!1001 &2048821473
208271
PrefabInstance:
209272
m_ObjectHideFlags: 0
210273
serializedVersion: 2
211274
m_Modification:
212275
m_TransformParent: {fileID: 0}
213276
m_Modifications:
277+
- target: {fileID: 2770848158039835156, guid: cee2985c86b19c245847700449017d5e,
278+
type: 3}
279+
propertyPath: assetsToRequest.Array.size
280+
value: 2
281+
objectReference: {fileID: 0}
214282
- target: {fileID: 2770848158039835156, guid: cee2985c86b19c245847700449017d5e,
215283
type: 3}
216284
propertyPath: assetCountToDownload
217285
value: 20
218286
objectReference: {fileID: 0}
287+
- target: {fileID: 2770848158039835156, guid: cee2985c86b19c245847700449017d5e,
288+
type: 3}
289+
propertyPath: assetsToRequest.Array.data[0]
290+
value: 6505
291+
objectReference: {fileID: 0}
292+
- target: {fileID: 2770848158039835156, guid: cee2985c86b19c245847700449017d5e,
293+
type: 3}
294+
propertyPath: assetsToRequest.Array.data[1]
295+
value: 6509
296+
objectReference: {fileID: 0}
219297
- target: {fileID: 2770848158039835157, guid: cee2985c86b19c245847700449017d5e,
220298
type: 3}
221299
propertyPath: m_LocalPosition.x

Assets/LootLocker/Game/Samples/Scripts/AssetTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public void RemoveFavouriteAsset()
216216
});
217217
}
218218

219-
[ContextMenu("RemoveFavouriteAsset")]
219+
[ContextMenu("GetAssetsByiD")]
220220
public void GetAssetsByIds()
221221
{
222222
LootLockerSDKManager.GetAssetsById(assetsToRequest, (response) =>

0 commit comments

Comments
 (0)