Skip to content

Commit 63d8b25

Browse files
JohannesLootJohannesLoot
authored
Merge pull request #28 from LootLocker/fix/AssetInstanceKeyValues
Fix/asset instance key values + character functions
2 parents 85eb173 + 1e7bf33 commit 63d8b25

File tree

3 files changed

+74
-18
lines changed

3 files changed

+74
-18
lines changed

‎Runtime/Game/LootLockerSDKManager.cs

Lines changed: 72 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,25 @@ public static void UpdateCharacter(string characterID, string newCharacterName,
863863
LootLockerAPIManager.UpdateCharacter(lootLockerGetRequest, data, onComplete);
864864
}
865865

866+
public static void SetDefaultCharacter(string characterID, Action<LootLockerCharacterLoadoutResponse> onComplete)
867+
{
868+
if (!CheckInitialized())
869+
{
870+
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerCharacterLoadoutResponse>());
871+
return;
872+
}
873+
874+
LootLockerUpdateCharacterRequest data = new LootLockerUpdateCharacterRequest();
875+
876+
data.is_default = true;
877+
878+
LootLockerGetRequest lootLockerGetRequest = new LootLockerGetRequest();
879+
880+
lootLockerGetRequest.getRequests.Add(characterID);
881+
882+
LootLockerAPIManager.UpdateCharacter(lootLockerGetRequest, data, onComplete);
883+
}
884+
866885
public static void EquipIdAssetToDefaultCharacter(string assetInstanceId, Action<EquipAssetToCharacterLoadoutResponse> onComplete)
867886
{
868887
if (!CheckInitialized())
@@ -1186,55 +1205,55 @@ public static void GetAllKeyValuePairsForAssetInstances(Action<LootLockerGetAllK
11861205
LootLockerAPIManager.GetAllKeyValuePairs(onComplete);
11871206
}
11881207

1189-
public static void GetAllKeyValuePairsToAnInstance(int instanceId, Action<LootLockerAssetDefaultResponse> onComplete)
1208+
public static void GetAllKeyValuePairsToAnInstance(int assetInstanceID, Action<LootLockerAssetDefaultResponse> onComplete)
11901209
{
11911210
if (!CheckInitialized())
11921211
{
11931212
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerAssetDefaultResponse>());
11941213
return;
11951214
}
11961215
LootLockerGetRequest data = new LootLockerGetRequest();
1197-
data.getRequests.Add(instanceId.ToString());
1216+
data.getRequests.Add(assetInstanceID.ToString());
11981217
LootLockerAPIManager.GetAllKeyValuePairsToAnInstance(data, onComplete);
11991218
}
12001219

1201-
public static void GetAKeyValuePairByIdForAssetInstances(int assetId, int instanceId, Action<LootLockerGetSingleKeyValuePairsResponse> onComplete)
1220+
public static void GetAKeyValuePairByIdForAssetInstances(int assetInstanceID, int keyValueID, Action<LootLockerGetSingleKeyValuePairsResponse> onComplete)
12021221
{
12031222
if (!CheckInitialized())
12041223
{
12051224
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerGetSingleKeyValuePairsResponse>());
12061225
return;
12071226
}
12081227
LootLockerGetRequest data = new LootLockerGetRequest();
1209-
data.getRequests.Add(assetId.ToString());
1210-
data.getRequests.Add(instanceId.ToString());
1228+
data.getRequests.Add(assetInstanceID.ToString());
1229+
data.getRequests.Add(keyValueID.ToString());
12111230
LootLockerAPIManager.GetAKeyValuePairById(data, onComplete);
12121231
}
12131232

1214-
public static void CreateKeyValuePairForAssetInstances(int assetId, string key, string value, Action<LootLockerAssetDefaultResponse> onComplete)
1233+
public static void CreateKeyValuePairForAssetInstances(int assetInstanceID, string key, string value, Action<LootLockerAssetDefaultResponse> onComplete)
12151234
{
12161235
if (!CheckInitialized())
12171236
{
12181237
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerAssetDefaultResponse>());
12191238
return;
12201239
}
12211240
LootLockerGetRequest data = new LootLockerGetRequest();
1222-
data.getRequests.Add(assetId.ToString());
1241+
data.getRequests.Add(assetInstanceID.ToString());
12231242
LootLockerCreateKeyValuePairRequest createKeyValuePairRequest = new LootLockerCreateKeyValuePairRequest();
12241243
createKeyValuePairRequest.key = key;
12251244
createKeyValuePairRequest.value = value;
12261245
LootLockerAPIManager.CreateKeyValuePair(data, createKeyValuePairRequest, onComplete);
12271246
}
12281247

1229-
public static void UpdateOneOrMoreKeyValuePairForAssetInstances(int assetId, Dictionary<string, string> data, Action<LootLockerAssetDefaultResponse> onComplete)
1248+
public static void UpdateOneOrMoreKeyValuePairForAssetInstances(int assetInstanceID, Dictionary<string, string> data, Action<LootLockerAssetDefaultResponse> onComplete)
12301249
{
12311250
if (!CheckInitialized())
12321251
{
12331252
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerAssetDefaultResponse>());
12341253
return;
12351254
}
12361255
LootLockerGetRequest request = new LootLockerGetRequest();
1237-
request.getRequests.Add(assetId.ToString());
1256+
request.getRequests.Add(assetInstanceID.ToString());
12381257
LootLockerUpdateOneOrMoreKeyValuePairRequest createKeyValuePairRequest = new LootLockerUpdateOneOrMoreKeyValuePairRequest();
12391258
List<LootLockerCreateKeyValuePairRequest> temp = new List<LootLockerCreateKeyValuePairRequest>();
12401259
foreach (var d in data)
@@ -1244,7 +1263,22 @@ public static void UpdateOneOrMoreKeyValuePairForAssetInstances(int assetId, Dic
12441263
createKeyValuePairRequest.storage = temp.ToArray();
12451264
LootLockerAPIManager.UpdateOneOrMoreKeyValuePair(request, createKeyValuePairRequest, onComplete);
12461265
}
1247-
1266+
public static void UpdateKeyValuePairForAssetInstances(int assetInstanceID, string key, string value, Action<LootLockerAssetDefaultResponse> onComplete)
1267+
{
1268+
if (!CheckInitialized())
1269+
{
1270+
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerAssetDefaultResponse>());
1271+
return;
1272+
}
1273+
LootLockerGetRequest request = new LootLockerGetRequest();
1274+
request.getRequests.Add(assetInstanceID.ToString());
1275+
LootLockerUpdateOneOrMoreKeyValuePairRequest createKeyValuePairRequest = new LootLockerUpdateOneOrMoreKeyValuePairRequest();
1276+
List<LootLockerCreateKeyValuePairRequest> temp = new List<LootLockerCreateKeyValuePairRequest>();
1277+
temp.Add(new LootLockerCreateKeyValuePairRequest { key = key, value = value });
1278+
createKeyValuePairRequest.storage = temp.ToArray();
1279+
LootLockerAPIManager.UpdateOneOrMoreKeyValuePair(request, createKeyValuePairRequest, onComplete);
1280+
}
1281+
[ObsoleteAttribute("This function with 3 parameters is deprecated, use this function with 4 parameters instead:\n(int assetInstanceID, int keyValueID, string value, string key, Action<LootLockerAssetDefaultResponse> onComplete)")]
12481282
public static void UpdateKeyValuePairByIdForAssetInstances(int assetId, string key, string value, Action<LootLockerAssetDefaultResponse> onComplete)
12491283
{
12501284
if (!CheckInitialized())
@@ -1259,41 +1293,62 @@ public static void UpdateKeyValuePairByIdForAssetInstances(int assetId, string k
12591293
createKeyValuePairRequest.value = value;
12601294
LootLockerAPIManager.UpdateKeyValuePairById(data, createKeyValuePairRequest, onComplete);
12611295
}
1296+
public static void UpdateKeyValuePairByIdForAssetInstances(int assetInstanceID, int keyValueID, string value, string key, Action<LootLockerAssetDefaultResponse> onComplete)
1297+
{
1298+
if (!CheckInitialized())
1299+
{
1300+
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerAssetDefaultResponse>());
1301+
return;
1302+
}
1303+
LootLockerGetRequest data = new LootLockerGetRequest();
1304+
data.getRequests.Add(assetInstanceID.ToString());
1305+
data.getRequests.Add(keyValueID.ToString());
1306+
LootLockerCreateKeyValuePairRequest createKeyValuePairRequest = new LootLockerCreateKeyValuePairRequest();
1307+
if (key != null)
1308+
{
1309+
createKeyValuePairRequest.key = key;
1310+
}
1311+
if (value != null)
1312+
{
1313+
createKeyValuePairRequest.value = value;
1314+
}
1315+
LootLockerAPIManager.UpdateKeyValuePairById(data, createKeyValuePairRequest, onComplete);
1316+
}
12621317

1263-
public static void DeleteKeyValuePairForAssetInstances(int assetId, int instanceId, Action<LootLockerAssetDefaultResponse> onComplete)
1318+
public static void DeleteKeyValuePairForAssetInstances(int assetInstanceID, int keyValueID, Action<LootLockerAssetDefaultResponse> onComplete)
12641319
{
12651320
if (!CheckInitialized())
12661321
{
12671322
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerAssetDefaultResponse>());
12681323
return;
12691324
}
12701325
LootLockerGetRequest data = new LootLockerGetRequest();
1271-
data.getRequests.Add(assetId.ToString());
1272-
data.getRequests.Add(instanceId.ToString());
1326+
data.getRequests.Add(assetInstanceID.ToString());
1327+
data.getRequests.Add(keyValueID.ToString());
12731328
LootLockerAPIManager.DeleteKeyValuePair(data, onComplete);
12741329
}
12751330

1276-
public static void InspectALootBoxForAssetInstances(int assetId, Action<LootLockerInspectALootBoxResponse> onComplete)
1331+
public static void InspectALootBoxForAssetInstances(int assetInstanceID, Action<LootLockerInspectALootBoxResponse> onComplete)
12771332
{
12781333
if (!CheckInitialized())
12791334
{
12801335
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerInspectALootBoxResponse>());
12811336
return;
12821337
}
12831338
LootLockerGetRequest data = new LootLockerGetRequest();
1284-
data.getRequests.Add(assetId.ToString());
1339+
data.getRequests.Add(assetInstanceID.ToString());
12851340
LootLockerAPIManager.InspectALootBox(data, onComplete);
12861341
}
12871342

1288-
public static void OpenALootBoxForAssetInstances(int assetId, Action<LootLockerOpenLootBoxResponse> onComplete)
1343+
public static void OpenALootBoxForAssetInstances(int assetInstanceID, Action<LootLockerOpenLootBoxResponse> onComplete)
12891344
{
12901345
if (!CheckInitialized())
12911346
{
12921347
onComplete?.Invoke(LootLockerResponseFactory.SDKNotInitializedError<LootLockerOpenLootBoxResponse>());
12931348
return;
12941349
}
12951350
LootLockerGetRequest data = new LootLockerGetRequest();
1296-
data.getRequests.Add(assetId.ToString());
1351+
data.getRequests.Add(assetInstanceID.ToString());
12971352
LootLockerAPIManager.OpenALootBox(data, onComplete);
12981353
}
12991354
#endregion

‎Runtime/Game/Requests/CharacterRequest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class LootLockerCharacter_Types
4343
public int id;
4444
public bool is_default;
4545
public string name;
46+
public LootLockerStorage [] storage;
4647
}
4748

4849

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.lootlocker.lootlockersdk",
3-
"version": "1.1.18",
3+
"version": "1.1.19",
44
"displayName": "LootLocker",
55
"description": "LootLocker SDK",
66
"unity": "2019.2",

0 commit comments

Comments
 (0)