Push API changes
* Fix item repair cost formula * Add "RequestUpdateAvailableFreeLoadout" function (WIP) * Fix item sell formula * Fix item stack split on sell * Fix contract progression counting for objectives other than owned items * Refactor balance into a proper struct * Separate and update Season 2 and Season 3 data
This commit is contained in:
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Options;
|
|||||||
using Prospect.Server.Api.Config;
|
using Prospect.Server.Api.Config;
|
||||||
using Prospect.Server.Api.Models.Client;
|
using Prospect.Server.Api.Models.Client;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth;
|
using Prospect.Server.Api.Services.Auth;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.Auth.User;
|
using Prospect.Server.Api.Services.Auth.User;
|
||||||
@@ -296,7 +297,7 @@ public class ClientController : Controller
|
|||||||
Data = new FGetUserInventoryResult
|
Data = new FGetUserInventoryResult
|
||||||
{
|
{
|
||||||
Inventory = items,
|
Inventory = items,
|
||||||
VirtualCurrency = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value),
|
VirtualCurrency = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value),
|
||||||
VirtualCurrencyRechargeTimes = new Dictionary<string, FVirtualCurrencyRechargeTime>()
|
VirtualCurrencyRechargeTimes = new Dictionary<string, FVirtualCurrencyRechargeTime>()
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client;
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
@@ -17,7 +18,7 @@ public class FGetUserInventoryResult
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[JsonPropertyName("VirtualCurrency")]
|
[JsonPropertyName("VirtualCurrency")]
|
||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public Dictionary<string, int>? VirtualCurrency { get; set; }
|
public PlayerBalance? VirtualCurrency { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// [optional] Array of virtual currency balance(s) belonging to the user.
|
/// [optional] Array of virtual currency balance(s) belonging to the user.
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Models.Data;
|
||||||
|
|
||||||
|
public class PlayerBalance
|
||||||
|
{
|
||||||
|
[JsonPropertyName("AU")]
|
||||||
|
public int HardCurrency { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("SC")]
|
||||||
|
public int SoftCurrency { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("IN")]
|
||||||
|
public int InsuranceTokens { get; set; }
|
||||||
|
}
|
||||||
@@ -15,6 +15,8 @@ public class TitleDataContractInfo {
|
|||||||
public TitleDataContractInfoUnlockData UnlockData { get; set; }
|
public TitleDataContractInfoUnlockData UnlockData { get; set; }
|
||||||
[JsonPropertyName("IsMainContract")]
|
[JsonPropertyName("IsMainContract")]
|
||||||
public bool IsMainContract { get; set; }
|
public bool IsMainContract { get; set; }
|
||||||
|
[JsonPropertyName("ContractDifficulty")]
|
||||||
|
public EYContractDifficulty ContractDifficulty { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TitleDataContractInfoReward {
|
public class TitleDataContractInfoReward {
|
||||||
@@ -26,7 +28,7 @@ public class TitleDataContractInfoReward {
|
|||||||
|
|
||||||
public class TitleDataContractInfoObjective {
|
public class TitleDataContractInfoObjective {
|
||||||
[JsonPropertyName("Type")]
|
[JsonPropertyName("Type")]
|
||||||
public int Type { get; set; }
|
public EYContractObjectiveType Type { get; set; }
|
||||||
[JsonPropertyName("MaxProgress")]
|
[JsonPropertyName("MaxProgress")]
|
||||||
public int MaxProgress { get; set; }
|
public int MaxProgress { get; set; }
|
||||||
[JsonPropertyName("ItemToOwn")]
|
[JsonPropertyName("ItemToOwn")]
|
||||||
@@ -37,5 +39,26 @@ public class TitleDataContractInfoUnlockData {
|
|||||||
[JsonPropertyName("Level")]
|
[JsonPropertyName("Level")]
|
||||||
public int Level { get; set; }
|
public int Level { get; set; }
|
||||||
[JsonPropertyName("Contracts")]
|
[JsonPropertyName("Contracts")]
|
||||||
public string[] Contracts { get; set; }
|
public HashSet<string> Contracts { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum EYContractObjectiveType {
|
||||||
|
Invalid = 0,
|
||||||
|
Kills = 1,
|
||||||
|
OwnNumOfItem = 2,
|
||||||
|
DeadDrop = 3,
|
||||||
|
VisitArea = 4,
|
||||||
|
LootContainer = 5,
|
||||||
|
FactionLevel = 6,
|
||||||
|
CompletedMission = 7,
|
||||||
|
MAX = 8
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum EYContractDifficulty
|
||||||
|
{
|
||||||
|
Invalid = 0,
|
||||||
|
Easy = 1,
|
||||||
|
Medium = 2,
|
||||||
|
Hard = 3,
|
||||||
|
MAX = 4
|
||||||
|
};
|
||||||
|
|||||||
@@ -28,11 +28,11 @@ public class TitleDataBlueprintInfo {
|
|||||||
[JsonPropertyName("ScrappingFactionProgressionIncrement")]
|
[JsonPropertyName("ScrappingFactionProgressionIncrement")]
|
||||||
public int ScrappingFactionProgressionIncrement { get; set; }
|
public int ScrappingFactionProgressionIncrement { get; set; }
|
||||||
[JsonPropertyName("UnlockData")]
|
[JsonPropertyName("UnlockData")]
|
||||||
public object UnlockData { get; set; }
|
public TitleDataItemUnlockData UnlockData { get; set; }
|
||||||
[JsonPropertyName("ModID")]
|
[JsonPropertyName("ModID")]
|
||||||
public int? ModID { get; set; }
|
public int? ModID { get; set; }
|
||||||
[JsonPropertyName("AlienForgeCatalystToUpgradedItemMap")]
|
[JsonPropertyName("AlienForgeCatalystToUpgradedItemMap")]
|
||||||
public object? AlienForgeCatalystToUpgradedItemMap { get; set; }
|
public TitleDataItemAlienForgeCatalystToUpgradedItemMap AlienForgeCatalystToUpgradedItemMap { get; set; }
|
||||||
[JsonPropertyName("Rarity")]
|
[JsonPropertyName("Rarity")]
|
||||||
public int Rarity { get; set; }
|
public int Rarity { get; set; }
|
||||||
[JsonPropertyName("Kind")]
|
[JsonPropertyName("Kind")]
|
||||||
@@ -61,6 +61,22 @@ public class TitleDataItemRecipeCostType {
|
|||||||
public int Amount { get; set; }
|
public int Amount { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class TitleDataItemUnlockData {
|
||||||
|
[JsonPropertyName("FactionUnlockLevel")]
|
||||||
|
public int FactionUnlockLevel { get; set; }
|
||||||
|
[JsonPropertyName("ContractLockPurchase")]
|
||||||
|
public string ContractLockPurchase { get; set; }
|
||||||
|
[JsonPropertyName("ContractLockCrafting")]
|
||||||
|
public string ContractLockCrafting { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TitleDataItemAlienForgeCatalystToUpgradedItemMap {
|
||||||
|
[JsonPropertyName("Catalyst")]
|
||||||
|
public string Catalyst { get; set; }
|
||||||
|
[JsonPropertyName("NextItem")]
|
||||||
|
public string NextItem { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
enum class EYItemType : uint8_t
|
enum class EYItemType : uint8_t
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,6 +4,23 @@
|
|||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>true</ImplicitUsings>
|
<ImplicitUsings>true</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Season 3 Debug|AnyCPU'">
|
||||||
|
<Optimize>False</Optimize>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Season 3 Release|AnyCPU'">
|
||||||
|
<Optimize>True</Optimize>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Season 2 Release|AnyCPU'">
|
||||||
|
<Optimize>True</Optimize>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||||
|
<Optimize>True</Optimize>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -87,7 +88,7 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
var factionProgression = JsonSerializer.Deserialize<int>(userData[factionKey].Value);
|
var factionProgression = JsonSerializer.Deserialize<int>(userData[factionKey].Value);
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == request.ContractID);
|
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == request.ContractID);
|
||||||
@@ -102,14 +103,16 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
|
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
|
|
||||||
|
var targetContract = contractsActive.Contracts[targetContractIdx];
|
||||||
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
||||||
HashSet<string> deletedItemsIds = [];
|
HashSet<string> deletedItemsIds = [];
|
||||||
// TODO: Proper progress verification of all objectives
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
foreach (var objective in contract.Objectives) {
|
var objective = contract.Objectives[i];
|
||||||
int remaining = objective.MaxProgress;
|
int remaining = objective.MaxProgress;
|
||||||
if (objective.Type == 2) {
|
if (objective.Type == EYContractObjectiveType.OwnNumOfItem) {
|
||||||
for (var i = 0; i < inventory.Count; i++) {
|
// NOTE: The backend may perform item ownership validation
|
||||||
var item = inventory[i];
|
// since it has the information about the player's items.
|
||||||
|
foreach (var item in inventory) {
|
||||||
if (item.BaseItemId != objective.ItemToOwn) {
|
if (item.BaseItemId != objective.ItemToOwn) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -125,6 +128,11 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// NOTE: A game server must write the correct progress
|
||||||
|
// for other types of objectives.
|
||||||
|
// The objectives are mapped by array index.
|
||||||
|
remaining -= targetContract.Progress[i];
|
||||||
}
|
}
|
||||||
if (remaining > 0) {
|
if (remaining > 0) {
|
||||||
return new FYClaimCompletedActiveContractRewardsResult
|
return new FYClaimCompletedActiveContractRewardsResult
|
||||||
@@ -148,15 +156,17 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
List<FYCurrencyItem> changedCurrencies = [];
|
List<FYCurrencyItem> changedCurrencies = [];
|
||||||
foreach (var reward in contract.Rewards) {
|
foreach (var reward in contract.Rewards) {
|
||||||
if (reward.ItemID == "SoftCurrency") {
|
if (reward.ItemID == "SoftCurrency") {
|
||||||
balance["SC"] += reward.Amount;
|
balance.SoftCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
} else if (reward.ItemID == "Aurum") {
|
} else if (reward.ItemID == "Aurum") {
|
||||||
balance["AU"] += reward.Amount;
|
balance.HardCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.ItemID == "InsuranceToken") {
|
} else if (reward.ItemID == "InsuranceToken") {
|
||||||
balance["IN"] += reward.Amount;
|
balance.InsuranceTokens += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance["IN"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
||||||
} else {
|
} else {
|
||||||
|
// TODO: Inventory limit check
|
||||||
|
|
||||||
var blueprintData = blueprints[reward.ItemID];
|
var blueprintData = blueprints[reward.ItemID];
|
||||||
var remainingAmount = reward.Amount * blueprintData.AmountPerPurchase;
|
var remainingAmount = reward.Amount * blueprintData.AmountPerPurchase;
|
||||||
|
|
||||||
|
|||||||
+8
-6
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -103,7 +104,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var techTreeBonuses = JsonSerializer.Deserialize<CharacterTechTreeBonuses>(userData["CharacterTechTreeBonuses"].Value);
|
var techTreeBonuses = JsonSerializer.Deserialize<CharacterTechTreeBonuses>(userData["CharacterTechTreeBonuses"].Value);
|
||||||
|
|
||||||
@@ -136,8 +137,8 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
balance["SC"] += claimableAmount;
|
balance.SoftCurrency += claimableAmount;
|
||||||
changedCurrencies = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
changedCurrencies = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "playerquarters_gen_aurum": {
|
case "playerquarters_gen_aurum": {
|
||||||
@@ -162,8 +163,8 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
balance["AU"] += claimableAmount;
|
balance.HardCurrency += claimableAmount;
|
||||||
changedCurrencies = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
changedCurrencies = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "playerquarters_gen_crate": {
|
case "playerquarters_gen_crate": {
|
||||||
@@ -190,7 +191,8 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
var rewardsPool = dailyCrateRewards[crateTier - 1];
|
var rewardsPool = dailyCrateRewards[crateTier - 1];
|
||||||
|
|
||||||
var items = PickItems(rewardsPool, 5); // TODO: Not sure how many items were granted
|
// TODO: Get rewardGrants from PassiveGenerators_CrateRewards_DT
|
||||||
|
var items = PickItems(rewardsPool, 5);
|
||||||
// TODO: Stackable? GrantedItems doesn't imply granted OR updated.
|
// TODO: Stackable? GrantedItems doesn't imply granted OR updated.
|
||||||
foreach (var item in items) {
|
foreach (var item in items) {
|
||||||
var itemInfo = blueprints[item.Name];
|
var itemInfo = blueprints[item.Name];
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -138,7 +139,7 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
|||||||
}
|
}
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance"});
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(blueprintsData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(blueprintsData["Blueprints"]);
|
||||||
if (!blueprints.ContainsKey(request.BaseItemID)) {
|
if (!blueprints.ContainsKey(request.BaseItemID)) {
|
||||||
@@ -165,16 +166,15 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
|||||||
if (ingredient.Currency == "SoftCurrency") {
|
if (ingredient.Currency == "SoftCurrency") {
|
||||||
var buyCost = request.PurchaseAmount * ingredient.Amount;
|
var buyCost = request.PurchaseAmount * ingredient.Amount;
|
||||||
remaining -= buyCost;
|
remaining -= buyCost;
|
||||||
balance["SC"] -= buyCost;
|
balance.SoftCurrency -= buyCost;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
} else if (ingredient.Currency == "Aurum") {
|
} else if (ingredient.Currency == "Aurum") {
|
||||||
var buyCost = request.PurchaseAmount * ingredient.Amount;
|
var buyCost = request.PurchaseAmount * ingredient.Amount;
|
||||||
remaining -= buyCost;
|
remaining -= buyCost;
|
||||||
balance["AU"] -= buyCost;
|
balance.HardCurrency -= buyCost;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else {
|
} else {
|
||||||
for (var i = 0; i < inventory.Count; i++) {
|
foreach (var item in inventory) {
|
||||||
var item = inventory[i];
|
|
||||||
if (item.BaseItemId != ingredient.Currency) {
|
if (item.BaseItemId != ingredient.Currency) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -209,6 +209,7 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Inventory limit check
|
||||||
// TODO: Refactor into a helper function
|
// TODO: Refactor into a helper function
|
||||||
var remainingAmount = request.PurchaseAmount * blueprintData.AmountPerPurchase;
|
var remainingAmount = request.PurchaseAmount * blueprintData.AmountPerPurchase;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
using Prospect.Server.Api.Utils;
|
using Prospect.Server.Api.Utils;
|
||||||
@@ -65,20 +66,20 @@ public class RepairItem : ICloudScriptFunction<FYRepairItemRequest, FYRepairItem
|
|||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
var blueprintData = blueprints[item.BaseItemId];
|
var blueprintData = blueprints[item.BaseItemId];
|
||||||
|
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
|
|
||||||
var repairCost = MapValue.Map(item.Durability, blueprintData.DurabilityMax, 0, blueprintData.RepairCostBase, blueprintData.RepairCostMaxDurability);
|
var repairCost = blueprintData.RepairCostBase + (int)Math.Ceiling((1 - (float)item.Durability / blueprintData.DurabilityMax) * blueprintData.RepairCostMaxDurability);
|
||||||
if (item.Durability == 0) {
|
if (item.Durability == 0) {
|
||||||
repairCost += blueprintData.RepairCostModifierBroken;
|
repairCost += blueprintData.RepairCostModifierBroken;
|
||||||
}
|
}
|
||||||
if (balance["SC"] < repairCost) {
|
if (balance.SoftCurrency < repairCost) {
|
||||||
return new FYRepairItemResult
|
return new FYRepairItemResult
|
||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "Insufficient balance",
|
Error = "Insufficient balance",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
balance["SC"] -= repairCost;
|
balance.SoftCurrency -= repairCost;
|
||||||
item.Durability = blueprintData.DurabilityMax;
|
item.Durability = blueprintData.DurabilityMax;
|
||||||
|
|
||||||
await _userDataService.UpdateAsync(
|
await _userDataService.UpdateAsync(
|
||||||
@@ -95,7 +96,7 @@ public class RepairItem : ICloudScriptFunction<FYRepairItemRequest, FYRepairItem
|
|||||||
Error = "",
|
Error = "",
|
||||||
ChangedItems = [item],
|
ChangedItems = [item],
|
||||||
ChangedCurrencies = [
|
ChangedCurrencies = [
|
||||||
new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] },
|
new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency },
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
@@ -54,7 +55,7 @@ public class RequestMissionCompleted : ICloudScriptFunction<FYRequestMissionComp
|
|||||||
var rewards = JsonSerializer.Deserialize<Dictionary<string, TitleDataMissionRewardInfo>>(titleData["OnboardingRewardMissions"]);
|
var rewards = JsonSerializer.Deserialize<Dictionary<string, TitleDataMissionRewardInfo>>(titleData["OnboardingRewardMissions"]);
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
var missions = JsonSerializer.Deserialize<Dictionary<string, TitleDataMissionInfo>>(titleData["OnboardingMissions"]);
|
var missions = JsonSerializer.Deserialize<Dictionary<string, TitleDataMissionInfo>>(titleData["OnboardingMissions"]);
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
|
|
||||||
var currentMission = missions[onboardingMission.CurrentMissionID];
|
var currentMission = missions[onboardingMission.CurrentMissionID];
|
||||||
var missionRewardId = currentMission.OnboardingRewards.RowName;
|
var missionRewardId = currentMission.OnboardingRewards.RowName;
|
||||||
@@ -68,15 +69,16 @@ public class RequestMissionCompleted : ICloudScriptFunction<FYRequestMissionComp
|
|||||||
var missionRewards = rewards[missionRewardId].RewardEntries;
|
var missionRewards = rewards[missionRewardId].RewardEntries;
|
||||||
foreach (var reward in missionRewards) {
|
foreach (var reward in missionRewards) {
|
||||||
if (reward.RewardRowHandle.RowName == "SoftCurrency") {
|
if (reward.RewardRowHandle.RowName == "SoftCurrency") {
|
||||||
balance["SC"] += reward.RewardAmount;
|
balance.SoftCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
||||||
balance["AU"] += reward.RewardAmount;
|
balance.HardCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.RewardRowHandle.RowName == "InsuranceToken") {
|
} else if (reward.RewardRowHandle.RowName == "InsuranceToken") {
|
||||||
balance["IN"] += reward.RewardAmount;
|
balance.InsuranceTokens += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance["IN"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
||||||
} else {
|
} else {
|
||||||
|
// TODO: Inventory limit check
|
||||||
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
||||||
var remainingAmount = reward.RewardAmount * blueprintData.AmountPerPurchase;
|
var remainingAmount = reward.RewardAmount * blueprintData.AmountPerPurchase;
|
||||||
while (remainingAmount > 0) {
|
while (remainingAmount > 0) {
|
||||||
|
|||||||
+47
@@ -0,0 +1,47 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
|
||||||
|
public class RequestUpdateAvailableFreeLoadoutRequest
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public class RequestUpdateAvailableFreeLoadoutResponse
|
||||||
|
{
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserId { get; set; }
|
||||||
|
[JsonPropertyName("error")]
|
||||||
|
public string Error { get; set; }
|
||||||
|
[JsonPropertyName("newRandomSeed")]
|
||||||
|
public int NewRandomSeed { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[CloudScriptFunction("RequestUpdateAvailableFreeLoadout")]
|
||||||
|
public class RequestUpdateAvailableFreeLoadoutFunction : ICloudScriptFunction<RequestUpdateAvailableFreeLoadoutRequest, RequestUpdateAvailableFreeLoadoutResponse>
|
||||||
|
{
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly ILogger<RequestUpdateAvailableFreeLoadoutFunction> _logger;
|
||||||
|
|
||||||
|
public RequestUpdateAvailableFreeLoadoutFunction(ILogger<RequestUpdateAvailableFreeLoadoutFunction> logger, IHttpContextAccessor httpContextAccessor)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<RequestUpdateAvailableFreeLoadoutResponse> ExecuteAsync(RequestUpdateAvailableFreeLoadoutRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
|
return new RequestUpdateAvailableFreeLoadoutResponse
|
||||||
|
{
|
||||||
|
UserId = userId,
|
||||||
|
Error = "",
|
||||||
|
NewRandomSeed = 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -9,9 +9,9 @@ public class RequestUpdateSeasonWipeDataRequest
|
|||||||
public class RequestUpdateSeasonWipeDataResponse
|
public class RequestUpdateSeasonWipeDataResponse
|
||||||
{
|
{
|
||||||
[JsonPropertyName("userId")]
|
[JsonPropertyName("userId")]
|
||||||
public string UserId;
|
public string UserId { get; set; }
|
||||||
[JsonPropertyName("error")]
|
[JsonPropertyName("error")]
|
||||||
public string Error;
|
public string Error { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[CloudScriptFunction("RequestUpdateSeasonWipeData")]
|
[CloudScriptFunction("RequestUpdateSeasonWipeData")]
|
||||||
|
|||||||
+6
-1
@@ -76,6 +76,12 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
// TODO: Optimize
|
// TODO: Optimize
|
||||||
|
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
||||||
|
// Process inventory update. The player may:
|
||||||
|
// 1. Split item stack - creates a new item and updates amount of existing item.
|
||||||
|
// 2. Stack existing items - deletes existing items and updates amount of existing item.
|
||||||
|
// 3. Change vanity data - updates an existing item.
|
||||||
|
// 4. Change weapon mods - updates an existing item.
|
||||||
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||||
foreach (var item in inventory) {
|
foreach (var item in inventory) {
|
||||||
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
||||||
@@ -83,7 +89,6 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
|
||||||
foreach (var item in request.ItemsToUpdateAmount) {
|
foreach (var item in request.ItemsToUpdateAmount) {
|
||||||
var inventoryItem = newInventory.Find(i => i.ItemId == item.ItemId);
|
var inventoryItem = newInventory.Find(i => i.ItemId == item.ItemId);
|
||||||
if (inventoryItem == null) {
|
if (inventoryItem == null) {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -33,7 +34,7 @@ public class SellItemsClientResponse
|
|||||||
[JsonPropertyName("scrappedItemIds")]
|
[JsonPropertyName("scrappedItemIds")]
|
||||||
public HashSet<string> ScrappedItemIDs { get; set; }
|
public HashSet<string> ScrappedItemIDs { get; set; }
|
||||||
[JsonPropertyName("changedItems")]
|
[JsonPropertyName("changedItems")]
|
||||||
public FYCustomItemInfo[] ChangedItems { get; set; }
|
public List<FYCustomItemInfo> ChangedItems { get; set; }
|
||||||
[JsonPropertyName("changedCurrencies")]
|
[JsonPropertyName("changedCurrencies")]
|
||||||
public FYCurrencyItem[] ChangedCurrencies { get; set; }
|
public FYCurrencyItem[] ChangedCurrencies { get; set; }
|
||||||
[JsonPropertyName("playerFactionProgressionData")]
|
[JsonPropertyName("playerFactionProgressionData")]
|
||||||
@@ -71,39 +72,63 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var progressionFactionKey = "FactionProgression" + request.FactionID;
|
var progressionFactionKey = $"FactionProgression{request.FactionID}";
|
||||||
|
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance", progressionFactionKey});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance", progressionFactionKey});
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var balanceData = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var factionProgression = JsonSerializer.Deserialize<int>(userData[progressionFactionKey].Value);
|
var factionProgression = JsonSerializer.Deserialize<int>(userData[progressionFactionKey].Value);
|
||||||
|
|
||||||
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(blueprintsData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(blueprintsData["Blueprints"]);
|
||||||
|
|
||||||
var playerBalance = balanceData["SC"];
|
// TODO: Optimize
|
||||||
|
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
||||||
|
// Process inventory update before selling since a player may split item stack.
|
||||||
|
// This will result in creating a new item and updating amount of existing item.
|
||||||
|
// NOTE: Stacking items back doesn't seem to work, at least in single-player station. Bug?
|
||||||
|
// var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||||
|
// foreach (var item in inventory) {
|
||||||
|
// if (!request.InventoryUpdateData.ItemsToRemove.Contains(item.ItemId)) {
|
||||||
|
// newInventory.Add(item);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
var changedItems = new List<FYCustomItemInfo>();
|
||||||
|
foreach (var item in request.InventoryUpdateData.ItemsToUpdateAmount) {
|
||||||
|
var inventoryItem = inventory.Find(i => i.ItemId == item.ItemId);
|
||||||
|
if (inventoryItem == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
inventoryItem.Amount = item.Amount;
|
||||||
|
// NOTE: Vanity and mod data cannot be managed in sell menu
|
||||||
|
changedItems.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var item in request.InventoryUpdateData.ItemsToAdd) {
|
||||||
|
inventory.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Then process selling. The game client provides item IDs for newly added items.
|
||||||
HashSet<string> scrappedItemIds = [];
|
HashSet<string> scrappedItemIds = [];
|
||||||
foreach (var itemId in request.IDs) {
|
foreach (var itemId in request.IDs) {
|
||||||
var inventoryItemIdx = inventory.FindIndex(i => i.ItemId == itemId);
|
var inventoryItem = inventory.Find(i => i.ItemId == itemId);
|
||||||
if (inventoryItemIdx == -1) {
|
if (inventoryItem == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var inventoryItem = inventory[inventoryItemIdx];
|
|
||||||
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
||||||
// TODO: Probably better to decide based on item kind instead
|
// TODO: Probably better to decide based on item kind instead
|
||||||
if (inventoryItem.Durability == -1) {
|
if (inventoryItem.Durability == -1) {
|
||||||
factionProgression += blueprintData.OverrideScrappingReputation * inventoryItem.Amount;
|
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
playerBalance += blueprintData.OverrideScrappingReturns * inventoryItem.Amount;
|
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
} else {
|
} else {
|
||||||
// Items that have durability are not stackable so it's always 1 item
|
factionProgression += (int)Math.Max(
|
||||||
factionProgression += MapValue.Map(
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
||||||
inventoryItem.Durability,
|
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
blueprintData.DurabilityMax, 0,
|
|
||||||
blueprintData.OverrideScrappingReputation, (int)(blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier)
|
|
||||||
);
|
);
|
||||||
playerBalance += MapValue.Map(
|
balance.SoftCurrency += (int)Math.Max(
|
||||||
inventoryItem.Durability,
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
||||||
blueprintData.DurabilityMax, 0,
|
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
blueprintData.OverrideScrappingReturns, (int)(blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,13 +143,11 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
balanceData["SC"] = playerBalance;
|
|
||||||
|
|
||||||
await _userDataService.UpdateAsync(
|
await _userDataService.UpdateAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
new Dictionary<string, string>{
|
new Dictionary<string, string>{
|
||||||
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
["Balance"] = JsonSerializer.Serialize(balanceData),
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
[progressionFactionKey] = JsonSerializer.Serialize(factionProgression),
|
[progressionFactionKey] = JsonSerializer.Serialize(factionProgression),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -135,14 +158,14 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
Error = "",
|
Error = "",
|
||||||
ChangedCurrencies = [new FYCurrencyItem {
|
ChangedCurrencies = [new FYCurrencyItem {
|
||||||
CurrencyName = "SoftCurrency",
|
CurrencyName = "SoftCurrency",
|
||||||
Amount = playerBalance,
|
Amount = balance.SoftCurrency,
|
||||||
}],
|
}],
|
||||||
PlayerFactionProgressionData = new FYPlayerFactionProgressData {
|
PlayerFactionProgressionData = new FYPlayerFactionProgressData {
|
||||||
FactionID = request.FactionID,
|
FactionID = request.FactionID,
|
||||||
CurrentProgression = factionProgression,
|
CurrentProgression = factionProgression,
|
||||||
},
|
},
|
||||||
ScrappedItemIDs = scrappedItemIds,
|
ScrappedItemIDs = scrappedItemIds,
|
||||||
ChangedItems = [], // TODO: Changed items from InventoryUpdateData
|
ChangedItems = changedItems,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-4
@@ -47,10 +47,18 @@ public class SetCharacterVanityArchetype : ICloudScriptFunction<FYSetActiveChara
|
|||||||
var genderSuffix = request.ArcheTypeId.EndsWith("G02") ? "M" : "F";
|
var genderSuffix = request.ArcheTypeId.EndsWith("G02") ? "M" : "F";
|
||||||
returnVanity.ArchetypeID = request.ArcheTypeId;
|
returnVanity.ArchetypeID = request.ArcheTypeId;
|
||||||
returnVanity.HeadItem.ID = request.ArcheTypeId + "_Head01";
|
returnVanity.HeadItem.ID = request.ArcheTypeId + "_Head01";
|
||||||
returnVanity.BootsItem.ID = "StarterOutfit01_Boots_" + genderSuffix;
|
#if SEASON_2_RELEASE || SEASON_2_DEBUG
|
||||||
returnVanity.ChestItem.ID = "StarterOutfit01_Chest_" + genderSuffix;
|
returnVanity.BootsItem.ID = $"StarterOutfit01_Boots_{genderSuffix}";
|
||||||
returnVanity.GloveItem.ID = "StarterOutfit01_Gloves_" + genderSuffix;
|
returnVanity.ChestItem.ID = $"StarterOutfit01_Chest_{genderSuffix}";
|
||||||
returnVanity.BaseSuitItem.ID = "StarterOutfit01" + genderSuffix + "_BaseSuit";
|
returnVanity.GloveItem.ID = $"StarterOutfit01_Gloves_{genderSuffix}";
|
||||||
|
#elif SEASON_3_RELEASE || SEASON_3_DEBUG
|
||||||
|
returnVanity.BootsItem.ID = "StarterOutfit01_Boots";
|
||||||
|
returnVanity.ChestItem.ID = "StarterOutfit01_Chest";
|
||||||
|
returnVanity.GloveItem.ID = "StarterOutfit01_Gloves";
|
||||||
|
#else
|
||||||
|
#error Unsupported build type
|
||||||
|
#endif
|
||||||
|
returnVanity.BaseSuitItem.ID = $"StarterOutfit01{genderSuffix}_BaseSuit";
|
||||||
returnVanity.BodyType = request.ArcheTypeId.EndsWith("G02") ? 1 : 2;
|
returnVanity.BodyType = request.ArcheTypeId.EndsWith("G02") ? 1 : 2;
|
||||||
await _userDataService.UpdateAsync(
|
await _userDataService.UpdateAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
using Prospect.Server.Api.Utils;
|
using Prospect.Server.Api.Utils;
|
||||||
|
|
||||||
@@ -61,7 +60,7 @@ public class SkipItemCraftingClient : ICloudScriptFunction<FYSkipItemCraftingCli
|
|||||||
new List<string>{"CraftingTimer__2022_05_12", "Balance", "Inventory"}
|
new List<string>{"CraftingTimer__2022_05_12", "Balance", "Inventory"}
|
||||||
);
|
);
|
||||||
|
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var craftingTimer = JsonSerializer.Deserialize<FYItemCurrentlyBeingCrafted>(userData["CraftingTimer__2022_05_12"].Value);
|
var craftingTimer = JsonSerializer.Deserialize<FYItemCurrentlyBeingCrafted>(userData["CraftingTimer__2022_05_12"].Value);
|
||||||
|
|
||||||
@@ -78,24 +77,24 @@ public class SkipItemCraftingClient : ICloudScriptFunction<FYSkipItemCraftingCli
|
|||||||
FYCurrencyItem[] changedCurrency;
|
FYCurrencyItem[] changedCurrency;
|
||||||
if (request.UseOptionalCosts) {
|
if (request.UseOptionalCosts) {
|
||||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, shopCraftingData.SkipOptionalCraftingMaxCost, 1);
|
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, shopCraftingData.SkipOptionalCraftingMaxCost, 1);
|
||||||
if (balance["SC"] < remaining) {
|
if (balance.SoftCurrency < remaining) {
|
||||||
return new FYSkipItemCraftingClientResult {
|
return new FYSkipItemCraftingClientResult {
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "Insufficient balance",
|
Error = "Insufficient balance",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
balance["SC"] -= remaining;
|
balance.SoftCurrency -= remaining;
|
||||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||||
} else {
|
} else {
|
||||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, shopCraftingData.SkipCraftingMaxCost, 1);
|
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, shopCraftingData.SkipCraftingMaxCost, 1);
|
||||||
if (balance["AU"] < remaining) {
|
if (balance.HardCurrency < remaining) {
|
||||||
return new FYSkipItemCraftingClientResult {
|
return new FYSkipItemCraftingClientResult {
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "Insufficient balance",
|
Error = "Insufficient balance",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
balance["AU"] -= remaining;
|
balance.HardCurrency -= remaining;
|
||||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||||
}
|
}
|
||||||
|
|
||||||
List<FYCustomItemInfo> itemsGrantedOrUpdated = [];
|
List<FYCustomItemInfo> itemsGrantedOrUpdated = [];
|
||||||
|
|||||||
+8
-7
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -69,7 +70,7 @@ public class SkipPlayerQuarterUpgradeClient : ICloudScriptFunction<FYSkipPlayerQ
|
|||||||
}
|
}
|
||||||
|
|
||||||
var titleData = _titleDataService.Find(new List<string>{"PlayerQuarters"});
|
var titleData = _titleDataService.Find(new List<string>{"PlayerQuarters"});
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var playerQuartersData = JsonSerializer.Deserialize<TitleDataPlayerQuartersInfo[]>(titleData["PlayerQuarters"]);
|
var playerQuartersData = JsonSerializer.Deserialize<TitleDataPlayerQuartersInfo[]>(titleData["PlayerQuarters"]);
|
||||||
var nextQuartersLevel = playerQuartersData[userPlayerQuarters.Level - 1]; // Quarters level starts from 1
|
var nextQuartersLevel = playerQuartersData[userPlayerQuarters.Level - 1]; // Quarters level starts from 1
|
||||||
|
|
||||||
@@ -79,24 +80,24 @@ public class SkipPlayerQuarterUpgradeClient : ICloudScriptFunction<FYSkipPlayerQ
|
|||||||
FYCurrencyItem[] changedCurrency;
|
FYCurrencyItem[] changedCurrency;
|
||||||
if (request.UseOptionalCosts) {
|
if (request.UseOptionalCosts) {
|
||||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nextQuartersLevel.OptionalRushCosts, 1);
|
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nextQuartersLevel.OptionalRushCosts, 1);
|
||||||
if (balance["SC"] < remaining) {
|
if (balance.SoftCurrency < remaining) {
|
||||||
return new FYSkipPlayerQuarterUpgradeClientResult {
|
return new FYSkipPlayerQuarterUpgradeClientResult {
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "Insufficient balance",
|
Error = "Insufficient balance",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
balance["SC"] -= remaining;
|
balance.SoftCurrency -= remaining;
|
||||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||||
} else {
|
} else {
|
||||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nextQuartersLevel.InitialRushCosts, 1);
|
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nextQuartersLevel.InitialRushCosts, 1);
|
||||||
if (balance["AU"] < remaining) {
|
if (balance.HardCurrency < remaining) {
|
||||||
return new FYSkipPlayerQuarterUpgradeClientResult {
|
return new FYSkipPlayerQuarterUpgradeClientResult {
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "Insufficient balance",
|
Error = "Insufficient balance",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
balance["AU"] -= remaining;
|
balance.HardCurrency -= remaining;
|
||||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||||
}
|
}
|
||||||
|
|
||||||
var upgradeStartedTime = new FYTimestamp {
|
var upgradeStartedTime = new FYTimestamp {
|
||||||
|
|||||||
+8
-7
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
using Prospect.Server.Api.Utils;
|
using Prospect.Server.Api.Utils;
|
||||||
@@ -56,7 +57,7 @@ public class SkipTechTreeNodeUpgradeClient : ICloudScriptFunction<FYSkipTechTree
|
|||||||
new List<string>{"TechTreeNodeData", "Balance", "CharacterTechTreeBonuses"}
|
new List<string>{"TechTreeNodeData", "Balance", "CharacterTechTreeBonuses"}
|
||||||
);
|
);
|
||||||
|
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
|
var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
|
||||||
|
|
||||||
var currentNode = userTechTree.NodeInProgress;
|
var currentNode = userTechTree.NodeInProgress;
|
||||||
@@ -81,24 +82,24 @@ public class SkipTechTreeNodeUpgradeClient : ICloudScriptFunction<FYSkipTechTree
|
|||||||
FYCurrencyItem[] changedCurrency;
|
FYCurrencyItem[] changedCurrency;
|
||||||
if (request.UseOptionalCosts) {
|
if (request.UseOptionalCosts) {
|
||||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nodeLevelInfo.OptionalRushCosts, 1);
|
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nodeLevelInfo.OptionalRushCosts, 1);
|
||||||
if (balance["SC"] < remaining) {
|
if (balance.SoftCurrency < remaining) {
|
||||||
return new FYSkipTechTreeNodeUpgradeClientResult {
|
return new FYSkipTechTreeNodeUpgradeClientResult {
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "Insufficient balance",
|
Error = "Insufficient balance",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
balance["SC"] -= remaining;
|
balance.SoftCurrency -= remaining;
|
||||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||||
} else {
|
} else {
|
||||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nodeLevelInfo.InitialRushCosts, 1);
|
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nodeLevelInfo.InitialRushCosts, 1);
|
||||||
if (balance["AU"] < remaining) {
|
if (balance.HardCurrency < remaining) {
|
||||||
return new FYSkipTechTreeNodeUpgradeClientResult {
|
return new FYSkipTechTreeNodeUpgradeClientResult {
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "Insufficient balance",
|
Error = "Insufficient balance",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
balance["AU"] -= remaining;
|
balance.HardCurrency -= remaining;
|
||||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||||
}
|
}
|
||||||
|
|
||||||
userTechTree.TotalUpgrades++;
|
userTechTree.TotalUpgrades++;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -70,8 +71,9 @@ public class StartItemCraftingClient : ICloudScriptFunction<FYStartItemCraftingC
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Contract unlock criteria
|
// TODO: Contract unlock criteria
|
||||||
|
// TODO: Inventory limit check
|
||||||
|
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
@@ -88,15 +90,14 @@ public class StartItemCraftingClient : ICloudScriptFunction<FYStartItemCraftingC
|
|||||||
int remaining = ingredient.Amount;
|
int remaining = ingredient.Amount;
|
||||||
if (ingredient.Currency == "SoftCurrency") {
|
if (ingredient.Currency == "SoftCurrency") {
|
||||||
remaining -= ingredient.Amount;
|
remaining -= ingredient.Amount;
|
||||||
balance["SC"] -= ingredient.Amount;
|
balance.SoftCurrency -= ingredient.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
} else if (ingredient.Currency == "Aurum") {
|
} else if (ingredient.Currency == "Aurum") {
|
||||||
remaining -= ingredient.Amount;
|
remaining -= ingredient.Amount;
|
||||||
balance["AU"] -= ingredient.Amount;
|
balance.HardCurrency -= ingredient.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else {
|
} else {
|
||||||
for (var i = 0; i < inventory.Count; i++) {
|
foreach (var item in inventory) {
|
||||||
var item = inventory[i];
|
|
||||||
if (item.BaseItemId != ingredient.Currency) {
|
if (item.BaseItemId != ingredient.Currency) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-7
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -66,7 +67,7 @@ public class StartPlayerQuarterUpgradeClient : ICloudScriptFunction<FYStartPlaye
|
|||||||
}
|
}
|
||||||
|
|
||||||
var titleData = _titleDataService.Find(new List<string>{"PlayerQuarters"});
|
var titleData = _titleDataService.Find(new List<string>{"PlayerQuarters"});
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var playerQuartersData = JsonSerializer.Deserialize<TitleDataPlayerQuartersInfo[]>(titleData["PlayerQuarters"]);
|
var playerQuartersData = JsonSerializer.Deserialize<TitleDataPlayerQuartersInfo[]>(titleData["PlayerQuarters"]);
|
||||||
// Current level contains the information about next level
|
// Current level contains the information about next level
|
||||||
@@ -82,15 +83,14 @@ public class StartPlayerQuarterUpgradeClient : ICloudScriptFunction<FYStartPlaye
|
|||||||
int remaining = ingredient.Amount;
|
int remaining = ingredient.Amount;
|
||||||
if (ingredient.Currency == "SoftCurrency") {
|
if (ingredient.Currency == "SoftCurrency") {
|
||||||
remaining -= ingredient.Amount;
|
remaining -= ingredient.Amount;
|
||||||
balance["SC"] -= ingredient.Amount;
|
balance.SoftCurrency -= ingredient.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
} else if (ingredient.Currency == "Aurum") {
|
} else if (ingredient.Currency == "Aurum") {
|
||||||
remaining -= ingredient.Amount;
|
remaining -= ingredient.Amount;
|
||||||
balance["AU"] -= ingredient.Amount;
|
balance.HardCurrency -= ingredient.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else {
|
} else {
|
||||||
for (var i = 0; i < inventory.Count; i++) {
|
foreach (var item in inventory) {
|
||||||
var item = inventory[i];
|
|
||||||
if (item.BaseItemId != ingredient.Currency) {
|
if (item.BaseItemId != ingredient.Currency) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-7
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -67,7 +68,7 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
var titleData = _titleDataService.Find(new List<string>{"TechTreeNodes"});
|
var titleData = _titleDataService.Find(new List<string>{"TechTreeNodes"});
|
||||||
@@ -89,15 +90,14 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
|||||||
int remaining = ingredient.Amount;
|
int remaining = ingredient.Amount;
|
||||||
if (ingredient.Currency == "SoftCurrency") {
|
if (ingredient.Currency == "SoftCurrency") {
|
||||||
remaining -= ingredient.Amount;
|
remaining -= ingredient.Amount;
|
||||||
balance["SC"] -= ingredient.Amount;
|
balance.SoftCurrency -= ingredient.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
} else if (ingredient.Currency == "Aurum") {
|
} else if (ingredient.Currency == "Aurum") {
|
||||||
remaining -= ingredient.Amount;
|
remaining -= ingredient.Amount;
|
||||||
balance["AU"] -= ingredient.Amount;
|
balance.HardCurrency -= ingredient.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else {
|
} else {
|
||||||
for (var i = 0; i < inventory.Count; i++) {
|
foreach (var item in inventory) {
|
||||||
var item = inventory[i];
|
|
||||||
if (item.BaseItemId != ingredient.Currency) {
|
if (item.BaseItemId != ingredient.Currency) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1,6 +1,7 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
using Prospect.Server.Api.Services.Database;
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.UserData;
|
namespace Prospect.Server.Api.Services.UserData;
|
||||||
@@ -70,6 +71,54 @@ public class UserDataService
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var defaultVanity = new FYCharacterVanity {
|
||||||
|
UserID = playFabId,
|
||||||
|
ArchetypeID = "E01_G02",
|
||||||
|
SlotIndex = 0,
|
||||||
|
BaseSuitItem = new FYVanityMaterialItem {
|
||||||
|
ID = "StarterOutfit01M_BaseSuit",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
},
|
||||||
|
HeadItem = new FYVanityMaterialItem {
|
||||||
|
ID = "E01_G02_Head01",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
},
|
||||||
|
MeleeWeaponItem = new FYVanityMaterialItem {
|
||||||
|
ID = "Melee_Omega",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
},
|
||||||
|
BodyType = 1,
|
||||||
|
};
|
||||||
|
#if SEASON_2_RELEASE || SEASON_2_DEBUG
|
||||||
|
defaultVanity.BootsItem = new FYVanityMaterialItem {
|
||||||
|
ID = "StarterOutfit01_Boots_M",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
};
|
||||||
|
defaultVanity.ChestItem = new FYVanityMaterialItem {
|
||||||
|
ID = "StarterOutfit01_Chest_M",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
};
|
||||||
|
defaultVanity.GloveItem = new FYVanityMaterialItem {
|
||||||
|
ID = "StarterOutfit01_Gloves_M",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
};
|
||||||
|
#elif SEASON_3_RELEASE || SEASON_3_DEBUG
|
||||||
|
defaultVanity.BootsItem = new FYVanityMaterialItem {
|
||||||
|
ID = "StarterOutfit01_Boots",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
};
|
||||||
|
defaultVanity.ChestItem = new FYVanityMaterialItem {
|
||||||
|
ID = "StarterOutfit01_Chest",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
};
|
||||||
|
defaultVanity.GloveItem = new FYVanityMaterialItem {
|
||||||
|
ID = "StarterOutfit01_Gloves",
|
||||||
|
MaterialIndex = 0,
|
||||||
|
};
|
||||||
|
#else
|
||||||
|
#error Unsupported build type
|
||||||
|
#endif
|
||||||
|
|
||||||
// TODO: Proper objects.
|
// TODO: Proper objects.
|
||||||
var defaultData = new Dictionary<string, (bool isPublic, string value)>
|
var defaultData = new Dictionary<string, (bool isPublic, string value)>
|
||||||
{
|
{
|
||||||
@@ -120,9 +169,7 @@ public class UserDataService
|
|||||||
// Used to optimize bonuses calculation and further validations without getting the user data and computing bonuses in runtime.
|
// Used to optimize bonuses calculation and further validations without getting the user data and computing bonuses in runtime.
|
||||||
["CharacterTechTreeBonuses"] = (false, "{\"aurumCap\":0,\"aurumRate\":0,\"kmarksCap\":0,\"kmarksRate\":0,\"crateTier\":0,\"stashSize\":0,\"safePocketSize\":0,\"upgradeSpeed\":1.0}"),
|
["CharacterTechTreeBonuses"] = (false, "{\"aurumCap\":0,\"aurumRate\":0,\"kmarksCap\":0,\"kmarksRate\":0,\"crateTier\":0,\"stashSize\":0,\"safePocketSize\":0,\"upgradeSpeed\":1.0}"),
|
||||||
["GlobalVanity"] = (false, $"{{\"activeGlobalVanityIds\":[\"Season03_Spray_13\",\"Banner_MIne\",\"Emote_Chill_01\",\"\",\"\",\"\",\"\",\"\"], \"droppodId\": \"VDP_Omega02\"}}"),
|
["GlobalVanity"] = (false, $"{{\"activeGlobalVanityIds\":[\"Season03_Spray_13\",\"Banner_MIne\",\"Emote_Chill_01\",\"\",\"\",\"\",\"\",\"\"], \"droppodId\": \"VDP_Omega02\"}}"),
|
||||||
// NOTE: Default CharacterVanity is based on Season 2 IDs.
|
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
||||||
["CharacterVanity"] = (false, $"{{\"userId\":\"{playFabId}\",\"head_item\":{{\"id\":\"E01_G02_Head01\",\"materialIndex\":0}},\"boots_item\":{{\"id\":\"StarterOutfit01_Boots_M\",\"materialIndex\":0}},\"chest_item\":{{\"id\":\"StarterOutfit01_Chest_M\",\"materialIndex\":0}},\"glove_item\":{{\"id\":\"StarterOutfit01_Gloves_M\",\"materialIndex\":0}},\"base_suit_item\":{{\"id\":\"StarterOutfit01M_BaseSuit\",\"materialIndex\":0}},\"melee_weapon_item\":{{\"id\":\"Melee_Omega\",\"materialIndex\":0}},\"body_type\":1,\"archetype_id\":\"E01_G02\",\"slot_index\":0}}"),
|
|
||||||
// ["Inventory"] = (false, "[]"),
|
|
||||||
["Inventory"] = (false, "[]"),
|
["Inventory"] = (false, "[]"),
|
||||||
["VanityItems"] = (false, "[]"),
|
["VanityItems"] = (false, "[]"),
|
||||||
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
||||||
@@ -165,9 +212,6 @@ public class UserDataService
|
|||||||
}
|
}
|
||||||
|
|
||||||
var other = currentUserId != requestUserId;
|
var other = currentUserId != requestUserId;
|
||||||
if (other) {
|
|
||||||
Console.WriteLine("aboba");
|
|
||||||
}
|
|
||||||
var result = new Dictionary<string, FUserDataRecord>();
|
var result = new Dictionary<string, FUserDataRecord>();
|
||||||
|
|
||||||
if (keys != null && keys.Count > 0)
|
if (keys != null && keys.Count > 0)
|
||||||
|
|||||||
+130
-2
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.12.35514.174 d17.12
|
VisualStudioVersion = 17.12.35514.174
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Server.Api", "Prospect.Server.Api\Prospect.Server.Api.csproj", "{A539B020-8BEC-497F-9176-DC2665D927A1}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Server.Api", "Prospect.Server.Api\Prospect.Server.Api.csproj", "{A539B020-8BEC-497F-9176-DC2665D927A1}"
|
||||||
EndProject
|
EndProject
|
||||||
@@ -27,6 +27,14 @@ Global
|
|||||||
Debug|x86 = Debug|x86
|
Debug|x86 = Debug|x86
|
||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
Release|x86 = Release|x86
|
Release|x86 = Release|x86
|
||||||
|
Season 2 Debug|x64 = Season 2 Debug|x64
|
||||||
|
Season 2 Debug|x86 = Season 2 Debug|x86
|
||||||
|
Season 2 Release|x64 = Season 2 Release|x64
|
||||||
|
Season 2 Release|x86 = Season 2 Release|x86
|
||||||
|
Season 3 Debug|x64 = Season 3 Debug|x64
|
||||||
|
Season 3 Debug|x86 = Season 3 Debug|x86
|
||||||
|
Season 3 Release|x64 = Season 3 Release|x64
|
||||||
|
Season 3 Release|x86 = Season 3 Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
@@ -37,6 +45,22 @@ Global
|
|||||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x64.Build.0 = Release|Any CPU
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x86.ActiveCfg = Release|Any CPU
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x86.Build.0 = Release|Any CPU
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x64.Build.0 = Debug|Any CPU
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
@@ -45,6 +69,22 @@ Global
|
|||||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x64.Build.0 = Release|Any CPU
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x86.ActiveCfg = Release|Any CPU
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x86.Build.0 = Release|Any CPU
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x64.Build.0 = Debug|Any CPU
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
@@ -53,6 +93,22 @@ Global
|
|||||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x64.Build.0 = Release|Any CPU
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x86.ActiveCfg = Release|Any CPU
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x86.Build.0 = Release|Any CPU
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x64.Build.0 = Debug|Any CPU
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
@@ -61,6 +117,22 @@ Global
|
|||||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x64.Build.0 = Release|Any CPU
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x86.ActiveCfg = Release|Any CPU
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x86.Build.0 = Release|Any CPU
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x64.Build.0 = Debug|Any CPU
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
@@ -69,6 +141,22 @@ Global
|
|||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x64.Build.0 = Release|Any CPU
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x86.ActiveCfg = Release|Any CPU
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x86.Build.0 = Release|Any CPU
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x64.Build.0 = Debug|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
@@ -77,6 +165,46 @@ Global
|
|||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x64.Build.0 = Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x86.ActiveCfg = Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x86.Build.0 = Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.ActiveCfg = Debug|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.Build.0 = Debug|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.Build.0 = Release|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.ActiveCfg = Release|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.Build.0 = Release|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.Build.0 = Release|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.Build.0 = Release|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.Build.0 = Release|x64
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
||||||
|
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.Build.0 = Release|Win32
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
Reference in New Issue
Block a user