Compare commits
54
Commits
b6
...
57a45d91df
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57a45d91df | ||
|
|
c6b2330e1d | ||
|
|
922deb8397 | ||
|
|
f4d93c9e71 | ||
|
|
9737316dbc | ||
|
|
b0822c34cd | ||
|
|
a4e006f84f | ||
|
|
310e2bf7e9 | ||
|
|
3cdf8bc7e2 | ||
|
|
5d93b3541d | ||
|
|
40dad82559 | ||
|
|
3b108d99ca | ||
|
|
67f3095896 | ||
|
|
89e7a69049 | ||
|
|
6f3410b37d | ||
|
|
345a822a2e | ||
|
|
1e79360b6e | ||
|
|
31aa20abd8 | ||
|
|
2630a9f2af | ||
|
|
d9bd46e6e0 | ||
|
|
269659b8da | ||
|
|
14097808d8 | ||
|
|
6fe4432c6e | ||
|
|
4f11c8e550 | ||
|
|
1ac2374eff | ||
|
|
b5cb885262 | ||
|
|
d55ef94fd9 | ||
|
|
1f4640fccd | ||
|
|
faf90c1841 | ||
|
|
efbacc57d1 | ||
|
|
458585c37f | ||
|
|
b3c5fa3e2b | ||
|
|
2fb730cb8c | ||
|
|
87e1708d6b | ||
|
|
2695f25242 | ||
|
|
81dea35778 | ||
|
|
704abac924 | ||
|
|
033227eb83 | ||
|
|
388dd99f60 | ||
|
|
986db8acb8 | ||
|
|
1b94cbdd8d | ||
|
|
b2e2106912 | ||
|
|
3858d482e9 | ||
|
|
5e42a54bbf | ||
|
|
7766d47bda | ||
|
|
31dbcfdb4f | ||
|
|
43e2b69d66 | ||
|
|
7a0e0d1285 | ||
|
|
36d797b391 | ||
|
|
4e0b6440d9 | ||
|
|
eec90dae91 | ||
|
|
4e1c256fbe | ||
|
|
7a370fded1 | ||
|
|
ff54118493 |
@@ -0,0 +1,33 @@
|
|||||||
|
name: Build & Deploy
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main, preprod]
|
||||||
|
workflow_dispatch: {}
|
||||||
|
|
||||||
|
env:
|
||||||
|
IMAGE: git.nfteam.ovh/neckfire/the-cycle
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Build & push image
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.nfteam.ovh -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
||||||
|
SHA="${GITHUB_SHA::12}"
|
||||||
|
BRANCH="${GITHUB_REF_NAME}"
|
||||||
|
if [ "$BRANCH" = "main" ]; then TAGS="-t ${IMAGE}:latest -t ${IMAGE}:${SHA}"; else TAGS="-t ${IMAGE}:${BRANCH} -t ${IMAGE}:${BRANCH}-${SHA}"; fi
|
||||||
|
docker build $TAGS -f Dockerfile .
|
||||||
|
docker push --all-tags "${IMAGE}"
|
||||||
|
- name: Notify ntfy
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
if [ "${{ job.status }}" = "success" ]; then EMOJI="white_check_mark"; PRIO="default"; else EMOJI="rotating_light"; PRIO="high"; fi
|
||||||
|
curl -s -H "Authorization: Bearer ${{ secrets.NTFY_TOKEN }}" -H "Title: ${GITHUB_REPOSITORY} — ${{ job.status }}" \
|
||||||
|
-H "Priority: ${PRIO}" -H "Tags: ${EMOJI}" -H "Click: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions" \
|
||||||
|
-d "${GITHUB_WORKFLOW} (${GITHUB_REF_NAME} #${GITHUB_RUN_NUMBER}) : ${{ job.status }}" \
|
||||||
|
"${{ secrets.NTFY_URL }}/${{ secrets.NTFY_TOPIC }}" || true
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_out/
|
||||||
+15
@@ -0,0 +1,15 @@
|
|||||||
|
# The Cycle: Frontier — serveur API (émulateur Prospect), build depuis les sources.
|
||||||
|
# Multi-stage : SDK .NET 8 pour publier le projet API → runtime aspnet 8.
|
||||||
|
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||||
|
WORKDIR /src
|
||||||
|
COPY src/ ./src/
|
||||||
|
# Configuration "Season 2 Release" = build qui correspond au client S2 déployé
|
||||||
|
# (le code sélectionne la saison via des #if SEASON_2_RELEASE / SEASON_3_RELEASE).
|
||||||
|
RUN dotnet publish src/Prospect.Server.Api/Prospect.Server.Api.csproj \
|
||||||
|
-c "Season 2 Release" -o /app
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build /app ./
|
||||||
|
EXPOSE 8443 8000
|
||||||
|
ENTRYPOINT ["dotnet", "Prospect.Server.Api.dll"]
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
# 🎮 The Cycle: Frontier — Rejoindre le serveur privé (installation client)
|
||||||
|
|
||||||
|
Guide pour **installer le client et jouer sur le serveur privé**. Tu n'installes **rien côté serveur** — juste le jeu + un loader + un certificat.
|
||||||
|
|
||||||
|
> ⚠️ **À savoir avant de commencer**
|
||||||
|
> - Le jeu a été retiré de Steam en septembre 2022 : il faut **l'avoir déjà eu dans ta bibliothèque Steam** pour le retélécharger.
|
||||||
|
> - **Ce n'est pas du co-op en raid.** Chacun joue sa propre instance (stations solo) ; l'émulateur ne supporte pas plusieurs joueurs dans le même raid. Vous partagez le même serveur (progression, boutiques, comptes), pas la même partie.
|
||||||
|
> - Le serveur doit être **allumé** au moment où tu joues (demande à l'hébergeur).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Fichiers à télécharger (dans la release)
|
||||||
|
Les 2 fichiers sont dispo dans la **release Gitea** :
|
||||||
|
👉 **https://git.nfteam.ovh/neckfire/the-cycle/releases/tag/friends-client**
|
||||||
|
|
||||||
|
1. **`LoaderPack.zip`** — le loader qui redirige le jeu vers le serveur privé (build b8 / Saison 2).
|
||||||
|
2. **`certificate.crt`** — le certificat **public** du serveur (sans clé privée, safe).
|
||||||
|
|
||||||
|
Télécharge les deux depuis la page de release avant de commencer.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Étapes (Windows)
|
||||||
|
|
||||||
|
### 1. Installer le client Saison 2 (via la console Steam)
|
||||||
|
1. Steam ouvert, `Win+R` → tape `steam://nav/console` → Entrée (la **console Steam** s'ouvre).
|
||||||
|
2. Colle **exactement** cette commande → Entrée :
|
||||||
|
```
|
||||||
|
download_depot 868270 868271 4623363103423775682
|
||||||
|
```
|
||||||
|
(`868270` = le jeu, `868271` = le dépôt client, `4623363103423775682` = manifest **Saison 2 v2.7.2**.)
|
||||||
|
3. Le téléchargement démarre (⚠️ **pas de barre de progression**, sois patient — plusieurs Go).
|
||||||
|
4. À la fin, Steam affiche **« Depot download complete »** + le **chemin du dossier**
|
||||||
|
(ex. `...\Steam\steamapps\content\app_868270\depot_868271`). **Ce dossier = ton install du jeu.**
|
||||||
|
|
||||||
|
> Il faut **avoir eu The Cycle: Frontier dans ta bibliothèque Steam** avant, sinon → erreur `missing license`.
|
||||||
|
|
||||||
|
> **Pas assez d'espace sur le disque principal ?** `download_depot` écrit toujours dans `...\Steam\steamapps\content`. Pour le mettre sur un autre disque : ferme Steam, supprime `...\Steam\steamapps\content`, puis en **cmd admin** :
|
||||||
|
> ```
|
||||||
|
> mkdir "D:\SteamContent"
|
||||||
|
> mklink /J "C:\Program Files (x86)\Steam\steamapps\content" "D:\SteamContent"
|
||||||
|
> ```
|
||||||
|
> Rouvre Steam et relance la commande → le jeu ira sur `D:\`.
|
||||||
|
|
||||||
|
### 2. Installer le LoaderPack
|
||||||
|
1. Va dans le dossier du jeu → **`Prospect\Binaries\Win64`**.
|
||||||
|
2. Ouvre `LoaderPack.zip` et **glisse tout son contenu** dans ce dossier `Win64`.
|
||||||
|
3. Crée un **raccourci** vers `Prospect.Client.Loader.exe` (c'est avec ça que tu lanceras le jeu).
|
||||||
|
|
||||||
|
### 3. Faire confiance au certificat du serveur
|
||||||
|
1. Double-clique **`certificate.crt`** → **Installer le certificat**.
|
||||||
|
2. **Emplacement : Utilisateur actuel** → Suivant.
|
||||||
|
3. **Placer tous les certificats dans le magasin suivant** → **Parcourir** → **Autorités de certification racines de confiance** → OK → Suivant → Terminer.
|
||||||
|
4. Accepte l'avertissement de sécurité (il mentionne `2EA46.playfabapi.com`).
|
||||||
|
|
||||||
|
### 4. Pointer le client vers le serveur
|
||||||
|
Dans **`Prospect\Binaries\Win64`**, crée (ou édite) un fichier **`backend.txt`** contenant **exactement** cette ligne :
|
||||||
|
|
||||||
|
```
|
||||||
|
https://tc.nfteam.ovh:8443
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Lancer le jeu
|
||||||
|
1. **Steam doit être ouvert** (connecté à ton compte).
|
||||||
|
2. Lance le jeu via le **raccourci `Prospect.Client.Loader`** (⚠️ pas via Steam directement).
|
||||||
|
3. Connexion automatique avec ton compte Steam. Bienvenue sur Fortuna III ! 🚀
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Dépannage
|
||||||
|
| Symptôme | Cause / solution |
|
||||||
|
|---|---|
|
||||||
|
| `libcurl error 7 (Couldn't connect to server)` | Le serveur est **éteint** → demande à l'hébergeur de l'allumer. |
|
||||||
|
| Erreur de certificat / `hostname mismatch` | `certificate.crt` **pas importé** (ou pas dans « Autorités racines de confiance »). Refais l'étape 3. |
|
||||||
|
| `missing license` au téléchargement | Tu n'as jamais eu le jeu sur ce compte Steam → impossible de le retélécharger. |
|
||||||
|
| Parties du corps manquantes (client S3) | Va en station → change ton apparence une fois (corrige les IDs). |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
*Serveur privé The Cycle: Frontier — émulateur Prospect. Usage privé entre amis.*
|
||||||
@@ -9,12 +9,10 @@ Also known as "The Cycle: Frontier".
|
|||||||
- [1. Prerequisites](#1-prerequisites)
|
- [1. Prerequisites](#1-prerequisites)
|
||||||
- [1.1 How to download Season 2 client from SteamDB using Steam console](#11-how-to-download-season-2-client-from-steamdb-using-steam-console)
|
- [1.1 How to download Season 2 client from SteamDB using Steam console](#11-how-to-download-season-2-client-from-steamdb-using-steam-console)
|
||||||
- [2. Unpack `Prospect.Server.Api`](#2-unpack-prospectserverapi)
|
- [2. Unpack `Prospect.Server.Api`](#2-unpack-prospectserverapi)
|
||||||
- [3. Patch the `hosts` file](#3-patch-the-hosts-file)
|
- [3. Generate and import SSL certificate](#3-generate-and-import-ssl-certificate)
|
||||||
- [4. Generate and import SSL certificate](#4-generate-and-import-ssl-certificate)
|
- [4. Extract `LoaderPack` to the game](#4-extract-loaderpack-to-the-game)
|
||||||
- [5. Add `steam_appid` to the game](#5-add-steam_appid-to-the-game)
|
- [5. Run the server](#5-run-the-server)
|
||||||
- [6. Copy the `Prospect.Client.Loader` to the game](#6-copy-the-prospectclientloader-to-the-game)
|
- [6. Run the game](#6-run-the-game)
|
||||||
- [7. Run the server](#7-run-the-server)
|
|
||||||
- [8. Run the game](#8-run-the-game)
|
|
||||||
- [Troubleshooting and FAQ](#troubleshooting-and-faq)
|
- [Troubleshooting and FAQ](#troubleshooting-and-faq)
|
||||||
- [How to remove the certificate?](#how-to-remove-the-certificate)
|
- [How to remove the certificate?](#how-to-remove-the-certificate)
|
||||||
- [`generate_ssl.exe` is flagged as a virus](#generate_sslexe-is-flagged-as-a-virus)
|
- [`generate_ssl.exe` is flagged as a virus](#generate_sslexe-is-flagged-as-a-virus)
|
||||||
@@ -30,10 +28,7 @@ Also known as "The Cycle: Frontier".
|
|||||||
* [x] EULA acceptance
|
* [x] EULA acceptance
|
||||||
* [x] Tutorial
|
* [x] Tutorial
|
||||||
* [x] Single-player station (Season 2 and Season 3):
|
* [x] Single-player station (Season 2 and Season 3):
|
||||||
* [ ] Onboarding
|
* [x] Onboarding
|
||||||
* [x] Talk to Badum
|
|
||||||
* [x] Equip items
|
|
||||||
* [ ] Deploy to Fortuna
|
|
||||||
* [ ] Matchmaking and deployment
|
* [ ] Matchmaking and deployment
|
||||||
* [x] Solo
|
* [x] Solo
|
||||||
* [ ] Squad
|
* [ ] Squad
|
||||||
@@ -42,16 +37,15 @@ Also known as "The Cycle: Frontier".
|
|||||||
* [x] Inventory and loadout
|
* [x] Inventory and loadout
|
||||||
* [ ] Loadout presets (Season 3)
|
* [ ] Loadout presets (Season 3)
|
||||||
* [x] Quests
|
* [x] Quests
|
||||||
* [ ] Job boards
|
|
||||||
* [x] Faction progression
|
* [x] Faction progression
|
||||||
* [ ] Season pass
|
* [ ] Season pass
|
||||||
* [ ] Shops
|
* [ ] Aurum Shops
|
||||||
* [ ] Daily shop
|
* [ ] Daily shop
|
||||||
* [ ] Weekly shop
|
* [ ] Weekly shop
|
||||||
* [ ] Shop rotation
|
* [ ] Shop rotation
|
||||||
* [x] Daily login
|
* [x] Daily login
|
||||||
* [x] Character appearance and emotes
|
* [x] Character appearance and emotes
|
||||||
* [x] Shops
|
* [x] Item Shops
|
||||||
* [x] Crafting station
|
* [x] Crafting station
|
||||||
* [x] Quarters
|
* [x] Quarters
|
||||||
* [x] Player balance
|
* [x] Player balance
|
||||||
@@ -60,17 +54,17 @@ Also known as "The Cycle: Frontier".
|
|||||||
* [x] Vivox login
|
* [x] Vivox login
|
||||||
* [x] Vivox create and join channel
|
* [x] Vivox create and join channel
|
||||||
* [ ] Proximity voice works
|
* [ ] Proximity voice works
|
||||||
* [ ] Game mechanics
|
* [x] Game mechanics
|
||||||
* [x] Can deploy through terminal
|
* [x] Can deploy through terminal
|
||||||
* [x] Can deploy with loadout
|
* [x] Can deploy with loadout
|
||||||
* [ ] Can evac
|
* [x] Can evac
|
||||||
* [ ] Can do quests
|
* [x] Can do quests (except PvP)
|
||||||
* [ ] Can gain/lose loot
|
* [x] Can gain/lose loot
|
||||||
* [ ] Can use Alien Forge.
|
* [x] Can use Alien Forge
|
||||||
* [ ] Map content
|
* [x] Map content
|
||||||
* [x] Bright Sands
|
* [x] Bright Sands
|
||||||
* [ ] Crescent Falls
|
* [x] Crescent Falls
|
||||||
* [ ] Tharis Island
|
* [x] Tharis Island
|
||||||
|
|
||||||
## Running locally
|
## Running locally
|
||||||
|
|
||||||
@@ -90,21 +84,17 @@ Before you start, you'll need the following software downloaded and installed:
|
|||||||
|
|
||||||
1. [MongoDB Community Edition](https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.4-signed.msi).
|
1. [MongoDB Community Edition](https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.4-signed.msi).
|
||||||
|
|
||||||
1. [Latest `Prospect.Server.Api`](https://github.com/deiteris/Prospect/releases) from the Releases section.
|
1. [`Prospect.Server.Api` and `LoaderPack`](https://github.com/deiteris/Prospect/releases) from the Releases section:
|
||||||
|
|
||||||
1. [Latest `Prospect.Client.Loader`](https://github.com/deiteris/Prospect/releases) from the Releases section.
|
- For Season 3 (the latest Steam game client), use Build 6.
|
||||||
|
|
||||||
1. [.NET Runtime 8.0](https://aka.ms/dotnet-core-applaunch?missing_runtime=true&arch=x64&rid=win-x64&os=win10&apphost_version=8.0.11) installed.
|
- For Season 2 game client, use the latest version.
|
||||||
|
|
||||||
1. [ASP.NET Core 8.0](https://aka.ms/dotnet-core-applaunch?framework=Microsoft.AspNetCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10) installed.
|
|
||||||
|
|
||||||
1. The Cycle: Frontier game client:
|
1. The Cycle: Frontier game client:
|
||||||
|
|
||||||
- The latest version from [Steam](https://steamcommunity.com/app/868270).
|
- The latest version from [Steam](https://steamcommunity.com/app/868270).
|
||||||
|
|
||||||
- Season 2 client. See [download instructions below](#11-how-to-download-season-2-client-from-steamdb-using-steam-console).
|
- Season 2 client version `4623363103423775682` from SteamDB. See [download instructions below](#11-how-to-download-season-2-client-from-steamdb-using-steam-console).
|
||||||
|
|
||||||
- Any other version, even Season 1 works.
|
|
||||||
|
|
||||||
#### 1.1 How to download Season 2 client from SteamDB using Steam console
|
#### 1.1 How to download Season 2 client from SteamDB using Steam console
|
||||||
|
|
||||||
@@ -129,17 +119,7 @@ Before you start, you'll need the following software downloaded and installed:
|
|||||||
|
|
||||||
Use your favorite ZIP archiver and unzip the `Prospect.Server.Api.zip` downloaded from this repository.
|
Use your favorite ZIP archiver and unzip the `Prospect.Server.Api.zip` downloaded from this repository.
|
||||||
|
|
||||||
### 3. Patch the `hosts` file
|
### 3. Generate and import SSL certificate
|
||||||
|
|
||||||
To be able to connect to the locally running server, you must replace the IP address of `2EA46.playfabapi.com` that the game uses. Do the following:
|
|
||||||
|
|
||||||
1. Open Notepad as Administrator.
|
|
||||||
|
|
||||||
1. Click **File** > **Open...** and select `C:\Windows\System32\drivers\etc\hosts`.
|
|
||||||
|
|
||||||
1. At the end of the file, add `127.0.0.1 2EA46.playfabapi.com` on a new line. Do not add the `#` character!
|
|
||||||
|
|
||||||
### 4. Generate and import SSL certificate
|
|
||||||
|
|
||||||
> [!IMPORTANT]
|
> [!IMPORTANT]
|
||||||
> Do not share the generated certificate! Generated certificate includes a private key that may be used to generate other certificates and compromise your security.
|
> Do not share the generated certificate! Generated certificate includes a private key that may be used to generate other certificates and compromise your security.
|
||||||
@@ -163,34 +143,24 @@ to successfully communicate with the local server. Do the following:
|
|||||||
|
|
||||||
1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `2EA46.playfabapi.com` certification authority and click **Yes**.
|
1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `2EA46.playfabapi.com` certification authority and click **Yes**.
|
||||||
|
|
||||||
### 5. Add `steam_appid` to the game
|
### 4. Extract `LoaderPack` to the game
|
||||||
|
|
||||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
||||||
|
|
||||||
1. Right-click in the folder > **New** > **Text Document**, and name it `steam_appid`.
|
1. Open the `LoaderPack` archive.
|
||||||
|
|
||||||
1. Open `steam_appid` and enter `480`.
|
1. Drag and drop the contents of the `LoaderPack` archive to the game.
|
||||||
|
|
||||||
1. Save and close the file.
|
|
||||||
|
|
||||||
### 6. Copy the `Prospect.Client.Loader` to the game
|
|
||||||
|
|
||||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
|
||||||
|
|
||||||
1. Copy the downloaded `Prospect.Client.Loader` file into the folder.
|
|
||||||
|
|
||||||
1. Create a shortcut for the `Prospect.Client.Loader` that you will use later to launch the game.
|
1. Create a shortcut for the `Prospect.Client.Loader` that you will use later to launch the game.
|
||||||
|
|
||||||
### 7. Run the server
|
### 5. Run the server
|
||||||
|
|
||||||
Now you are all set! Open the folder with `Prospect.Server.Api` and run `Prospect.Server.Api.exe`. It will open a console if it runs successfully.
|
Now you are all set! Open the folder with `Prospect.Server.Api` and run `Prospect.Server.Api.exe`. It will open a console if it runs successfully.
|
||||||
|
|
||||||
> [!IMPORTANT]
|
> [!IMPORTANT]
|
||||||
> Do not close the console when you run the game.
|
> Do not close the console when you run the game.
|
||||||
>
|
|
||||||
> If the console does not open, make sure you have [.NET Runtime 8.0](https://aka.ms/dotnet-core-applaunch?missing_runtime=true&arch=x64&rid=win-x64&os=win10&apphost_version=8.0.11) and [ASP.NET Core 8.0](https://aka.ms/dotnet-core-applaunch?framework=Microsoft.AspNetCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10) installed.
|
|
||||||
|
|
||||||
### 8. Run the game
|
### 6. Run the game
|
||||||
|
|
||||||
Once the server is running, make sure that Steam is running and open The Cycle: Frontier using the shortcut you've created before.
|
Once the server is running, make sure that Steam is running and open The Cycle: Frontier using the shortcut you've created before.
|
||||||
|
|
||||||
@@ -231,17 +201,14 @@ Make sure that:
|
|||||||
|
|
||||||
### Login Failed. Error code: 5
|
### Login Failed. Error code: 5
|
||||||
|
|
||||||
Make sure that:
|
Make sure that `Prospect.Server.Api` server is running.
|
||||||
|
|
||||||
* `Prospect.Server.Api` server is running.
|
If the server is running, press `Alt+Tab` to a game console that opens when you start the game and check for the following:
|
||||||
* The `C:\Windows\System32\drivers\etc\hosts` file contains `127.0.0.1 2EA46.playfabapi.com` and that the file is **saved**.
|
|
||||||
|
|
||||||
If the server works and the `hosts` file is saved, press `Alt+Tab` to a game console that opens when you start the game and check for the following:
|
|
||||||
|
|
||||||
* `libcurl error 7 (Couldn't connect to server)` - indicates that the `Prospect.Server.Api` is not running.
|
* `libcurl error 7 (Couldn't connect to server)` - indicates that the `Prospect.Server.Api` is not running.
|
||||||

|

|
||||||
|
|
||||||
* `InvalidAPIEndpoint` - indicates that the `hosts` file was not updated properly.
|
* `InvalidAPIEndpoint` - indicates that you are running the game using the original shortcut and not using `Prospect.Client.Loader`.
|
||||||

|

|
||||||
|
|
||||||
* `libcurl error 60 (Peer certificate cannot be authenticated with given CA certificates)` - indicates that the certificate was not installed correctly. Make sure that the certificate is present in `certmgr.msc` and there is only one certificate. Try removing the certificate and importing it again by following step 4.
|
* `libcurl error 60 (Peer certificate cannot be authenticated with given CA certificates)` - indicates that the certificate was not installed correctly. Make sure that the certificate is present in `certmgr.msc` and there is only one certificate. Try removing the certificate and importing it again by following step 4.
|
||||||
|
|||||||
@@ -0,0 +1,119 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<VCProjectVersion>16.0</VCProjectVersion>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<ProjectGuid>{a9ba7d25-f239-4320-a0dc-85e8001fd669}</ProjectGuid>
|
||||||
|
<RootNamespace>ProspectAgent</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="Shared">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<VcpkgUseStatic>true</VcpkgUseStatic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<VcpkgUseStatic>true</VcpkgUseStatic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg">
|
||||||
|
<VcpkgEnableManifest>true</VcpkgEnableManifest>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;PROSPECTAGENT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableUAC>false</EnableUAC>
|
||||||
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;PROSPECTAGENT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<Optimization>MinSpace</Optimization>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableUAC>false</EnableUAC>
|
||||||
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="hooks.h" />
|
||||||
|
<ClInclude Include="logger.h" />
|
||||||
|
<ClInclude Include="SDK.h" />
|
||||||
|
<ClInclude Include="SDK_Memory.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="logger.cpp" />
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="logger.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="SDK.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="hooks.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="SDK_Memory.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="logger.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <locale>
|
||||||
|
#include <string>
|
||||||
|
#include "SDK_Memory.h"
|
||||||
|
|
||||||
|
namespace SDK
|
||||||
|
{
|
||||||
|
template<class T>
|
||||||
|
struct TArray
|
||||||
|
{
|
||||||
|
friend struct FString;
|
||||||
|
|
||||||
|
TArray()
|
||||||
|
{
|
||||||
|
Data = nullptr;
|
||||||
|
Count = Max = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int Num() const
|
||||||
|
{
|
||||||
|
return Count;
|
||||||
|
}
|
||||||
|
|
||||||
|
T& operator[](int i)
|
||||||
|
{
|
||||||
|
return Data[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
const T& operator[](int i) const
|
||||||
|
{
|
||||||
|
return Data[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsValidIndex(int i) const
|
||||||
|
{
|
||||||
|
return i < Num();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
T* Data;
|
||||||
|
int32_t Count;
|
||||||
|
int32_t Max;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct FString : private TArray<wchar_t>
|
||||||
|
{
|
||||||
|
FString(const wchar_t* other)
|
||||||
|
{
|
||||||
|
const size_t charLen = std::wcslen(other);
|
||||||
|
|
||||||
|
if (charLen == 0)
|
||||||
|
{
|
||||||
|
Count = 0;
|
||||||
|
Max = 0;
|
||||||
|
Data = nullptr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Count = charLen + 1;
|
||||||
|
Max = Count;
|
||||||
|
Data = static_cast<wchar_t*>((*GMalloc)->Malloc(Count * 2));
|
||||||
|
|
||||||
|
memset(Data, 0, Count * 2);
|
||||||
|
memcpy(Data, other, charLen * 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FString(const std::wstring& other) : FString(other.c_str())
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsValid() const
|
||||||
|
{
|
||||||
|
return Data != nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
const wchar_t* c_str() const
|
||||||
|
{
|
||||||
|
return Data;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string ToString() const
|
||||||
|
{
|
||||||
|
const auto length = std::wcslen(Data);
|
||||||
|
|
||||||
|
std::string str(length, '\0');
|
||||||
|
std::use_facet<std::ctype<wchar_t>>(std::locale()).narrow(Data, Data + length, '?', &str[0]);
|
||||||
|
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct UPlayFabAPISettings
|
||||||
|
{
|
||||||
|
FString VerticalName;
|
||||||
|
FString BaseServiceHost;
|
||||||
|
FString TitleId;
|
||||||
|
FString AdvertisingIdType;
|
||||||
|
FString AdvertisingIdValue;
|
||||||
|
bool DisableAdvertising = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
#define DEFAULT_ALIGNMENT 0
|
||||||
|
|
||||||
|
namespace SDK
|
||||||
|
{
|
||||||
|
class FExec
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual ~FExec() = default;
|
||||||
|
private:
|
||||||
|
virtual bool Exec(void* world, void* cmd, void* ar) = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
class FMalloc : FExec
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual void* Malloc(SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* TryMalloc(SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* Realloc(void* Original, SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* TryRealloc(void* Original, SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void Free(void* Original) = 0;
|
||||||
|
|
||||||
|
virtual SIZE_T QuantizeSize(SIZE_T Count, uint32_t Alignment)
|
||||||
|
{
|
||||||
|
return Count;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool GetAllocationSize(void* Original, SIZE_T& SizeOut)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void Trim(bool bTrimThreadCaches)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void SetupTLSCachesOnCurrentThread()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void ClearAndDisableTLSCachesOnCurrentThread()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void InitializeStatsMetadata();
|
||||||
|
|
||||||
|
virtual bool Exec(void* InWorld, void* Cmd, void* Ar) override
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void UpdateStats() = 0;
|
||||||
|
|
||||||
|
virtual void GetAllocatorStats(void* out_Stats) = 0;
|
||||||
|
|
||||||
|
virtual void DumpAllocatorStats(class FOutputDevice& Ar) = 0;
|
||||||
|
|
||||||
|
virtual bool IsInternallyThreadSafe() const
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool ValidateHeap()
|
||||||
|
{
|
||||||
|
return(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual const TCHAR* GetDescriptiveName() = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
FMalloc** GMalloc;
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "SDK.h"
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
#include "logger.h"
|
||||||
|
|
||||||
|
#include <cstdio>
|
||||||
|
#include <Windows.h>
|
||||||
|
|
||||||
|
HANDLE h_out = nullptr, h_old_out = nullptr;
|
||||||
|
HANDLE h_err = nullptr, h_old_err = nullptr;
|
||||||
|
HANDLE h_in = nullptr, h_old_in = nullptr;
|
||||||
|
|
||||||
|
namespace logger
|
||||||
|
{
|
||||||
|
void Attach()
|
||||||
|
{
|
||||||
|
h_old_out = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
h_old_err = GetStdHandle(STD_ERROR_HANDLE);
|
||||||
|
h_old_in = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
|
||||||
|
AllocConsole() && AttachConsole(GetCurrentProcessId());
|
||||||
|
|
||||||
|
h_out = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
h_err = GetStdHandle(STD_ERROR_HANDLE);
|
||||||
|
h_in = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
|
||||||
|
SetConsoleMode(h_out,
|
||||||
|
ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT);
|
||||||
|
|
||||||
|
SetConsoleMode(h_in,
|
||||||
|
ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS |
|
||||||
|
ENABLE_PROCESSED_INPUT | ENABLE_QUICK_EDIT_MODE);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Detach()
|
||||||
|
{
|
||||||
|
if (h_out && h_err && h_in) {
|
||||||
|
FreeConsole();
|
||||||
|
|
||||||
|
if (h_old_out)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_OUTPUT_HANDLE, h_old_out);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (h_old_err)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_ERROR_HANDLE, h_old_err);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (h_old_in)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_INPUT_HANDLE, h_old_in);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Print(const char* fmt, ...)
|
||||||
|
{
|
||||||
|
if (!h_out)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
char buf[1024];
|
||||||
|
va_list va;
|
||||||
|
|
||||||
|
va_start(va, fmt);
|
||||||
|
_vsnprintf_s(buf, 1024, fmt, va);
|
||||||
|
va_end(va);
|
||||||
|
|
||||||
|
return !!WriteConsoleA(h_out, buf, static_cast<DWORD>(strlen(buf)), nullptr, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
char ReadKey()
|
||||||
|
{
|
||||||
|
if (!h_in)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto key = char{ 0 };
|
||||||
|
auto keysread = DWORD{ 0 };
|
||||||
|
|
||||||
|
ReadConsoleA(h_in, &key, 1, &keysread, nullptr);
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace logger
|
||||||
|
{
|
||||||
|
void Attach();
|
||||||
|
|
||||||
|
void Detach();
|
||||||
|
|
||||||
|
bool Print(const char* fmt, ...);
|
||||||
|
|
||||||
|
char ReadKey();
|
||||||
|
}
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <Windows.h>
|
||||||
|
#include <MinHook.h>
|
||||||
|
#include <cstdio>
|
||||||
|
#include "logger.h"
|
||||||
|
#include "SDK.h"
|
||||||
|
#include "SDK_Memory.h"
|
||||||
|
#include <string>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cctype>
|
||||||
|
#include <locale>
|
||||||
|
|
||||||
|
std::wstring g_backendUrl;
|
||||||
|
|
||||||
|
// trim from start (in place)
|
||||||
|
inline void ltrim(std::wstring &s) {
|
||||||
|
s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
|
||||||
|
return !std::isspace(ch);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// trim from end (in place)
|
||||||
|
inline void rtrim(std::wstring &s) {
|
||||||
|
s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
|
||||||
|
return !std::isspace(ch);
|
||||||
|
}).base(), s.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void trim(std::wstring &s) {
|
||||||
|
rtrim(s);
|
||||||
|
ltrim(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr uintptr_t OffsetGMalloc = 0x63EC4A0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function offset, find with "?sdk=".
|
||||||
|
*/
|
||||||
|
constexpr uintptr_t OffsetPlayFabApiGetUrl = 0xCEEF00;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function hooks.
|
||||||
|
*/
|
||||||
|
typedef SDK::FString(__fastcall* tPlayFabApiGetUrl)(SDK::UPlayFabAPISettings*, const SDK::FString&);
|
||||||
|
|
||||||
|
tPlayFabApiGetUrl OldPlayFabApiGetUrl;
|
||||||
|
|
||||||
|
SDK::FString __fastcall PlayFabApiGetUrlProxy(SDK::UPlayFabAPISettings* thiz, const SDK::FString& callPath) {
|
||||||
|
logger::Print("[Agent] GetURL called with callPath %s\n", callPath.ToString().c_str());
|
||||||
|
|
||||||
|
if (!g_backendUrl.empty())
|
||||||
|
{
|
||||||
|
return g_backendUrl + std::wstring(callPath.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::wstring(L"https://127.0.0.1:8443") + std::wstring(callPath.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
DWORD WINAPI OnDllAttach(LPVOID base) {
|
||||||
|
logger::Print("[Agent] DLL Attached\n");
|
||||||
|
|
||||||
|
const auto hModule = GetModuleHandleW(nullptr);
|
||||||
|
const auto hModulePtr = reinterpret_cast<uintptr_t>(hModule);
|
||||||
|
|
||||||
|
// Initialize GMalloc.
|
||||||
|
SDK::GMalloc = reinterpret_cast<SDK::FMalloc**>(hModulePtr + OffsetGMalloc);
|
||||||
|
|
||||||
|
// Initialize MinHook.
|
||||||
|
if (MH_Initialize() != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to initialize MinHook\n");
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hook UPlayFabAPISettings::GetUrl.
|
||||||
|
const auto pTarget = reinterpret_cast<LPVOID>(hModulePtr + OffsetPlayFabApiGetUrl);
|
||||||
|
const auto ppOriginal = reinterpret_cast<LPVOID*>(&OldPlayFabApiGetUrl);
|
||||||
|
const auto mhStatus = MH_CreateHook(pTarget, &PlayFabApiGetUrlProxy, ppOriginal);
|
||||||
|
|
||||||
|
if (mhStatus != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to create PlayFabAPIGetUrl hook (%d)\n", mhStatus);
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MH_EnableHook(pTarget) != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to enable PlayFabAPIGetUrl hook\n");
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const wchar_t* filePath = L"backend.txt";
|
||||||
|
std::wifstream f(filePath);
|
||||||
|
if (f) {
|
||||||
|
std::wstringstream buffer;
|
||||||
|
buffer << f.rdbuf();
|
||||||
|
g_backendUrl = buffer.str();
|
||||||
|
trim(g_backendUrl);
|
||||||
|
if (g_backendUrl.rfind(L"https://", 0) != 0) {
|
||||||
|
logger::Print("[Agent] URL must start with https://\n");
|
||||||
|
g_backendUrl.clear();
|
||||||
|
} else {
|
||||||
|
logger::Print("[Agent] Loaded custom URL: %S\n", g_backendUrl.c_str());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger::Print("[Agent] Failed to open file: %S\n", filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger::Print("[Agent] DLL Initialized\n");
|
||||||
|
ExitThread(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOL WINAPI DllMain(
|
||||||
|
const _In_ HINSTANCE hinstDll,
|
||||||
|
const _In_ DWORD fdwReason,
|
||||||
|
const _In_opt_ LPVOID lpvReserved
|
||||||
|
) {
|
||||||
|
if (fdwReason == DLL_PROCESS_ATTACH) {
|
||||||
|
DisableThreadLibraryCalls(hinstDll);
|
||||||
|
|
||||||
|
// Allocate a console.
|
||||||
|
AllocConsole();
|
||||||
|
freopen_s(reinterpret_cast<FILE**>(stdout), "CONOUT$", "w", stdout);
|
||||||
|
|
||||||
|
// Attach logger.
|
||||||
|
logger::Attach();
|
||||||
|
|
||||||
|
// Spawn thread.
|
||||||
|
CreateThread(nullptr, 0, OnDllAttach, hinstDll, 0, nullptr);
|
||||||
|
} else if (fdwReason == DLL_PROCESS_DETACH) {
|
||||||
|
// Detach logger.
|
||||||
|
logger::Detach();
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"default-registry": {
|
||||||
|
"kind": "git",
|
||||||
|
"baseline": "2960d7d80e8d09c84ae8abf15c12196c2ca7d39a",
|
||||||
|
"repository": "https://github.com/microsoft/vcpkg"
|
||||||
|
},
|
||||||
|
"registries": [
|
||||||
|
{
|
||||||
|
"kind": "artifact",
|
||||||
|
"location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip",
|
||||||
|
"name": "microsoft"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"dependencies": [
|
||||||
|
"minhook"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -21,10 +21,9 @@
|
|||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<VCProjectVersion>17.0</VCProjectVersion>
|
<VCProjectVersion>17.0</VCProjectVersion>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<ProjectGuid>{8170a17f-e536-4fdb-bc01-78bf09a9a48b}</ProjectGuid>
|
<ProjectGuid>{04b1d963-2bcb-4887-9d6d-04cb3366a348}</ProjectGuid>
|
||||||
<RootNamespace>ProspectClientLoader</RootNamespace>
|
<RootNamespace>ProspectClientLoader</RootNamespace>
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
<ProjectName>Prospect.Client.Loader</ProjectName>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
@@ -71,6 +70,9 @@
|
|||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<OutDir>$(SolutionDir)\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
|||||||
@@ -2,7 +2,14 @@
|
|||||||
#include <tlhelp32.h>
|
#include <tlhelp32.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string>
|
||||||
|
|
||||||
|
std::wstring ExePath() {
|
||||||
|
TCHAR buffer[MAX_PATH] = { 0 };
|
||||||
|
GetModuleFileName( NULL, buffer, MAX_PATH );
|
||||||
|
std::wstring::size_type pos = std::wstring(buffer).find_last_of(L"\\/");
|
||||||
|
return std::wstring(buffer).substr(0, pos);
|
||||||
|
}
|
||||||
|
|
||||||
// Function to create and launch a process with parameters
|
// Function to create and launch a process with parameters
|
||||||
HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
||||||
@@ -22,7 +29,20 @@ HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
|||||||
return pi.hProcess;
|
return pi.hProcess;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
printf("Failed to start process. Error: %lu\n", GetLastError());
|
wchar_t szErrorMessage[512];
|
||||||
|
|
||||||
|
DWORD dwErrorCode = GetLastError();
|
||||||
|
FormatMessage(
|
||||||
|
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||||
|
NULL,
|
||||||
|
dwErrorCode,
|
||||||
|
0,
|
||||||
|
szErrorMessage,
|
||||||
|
sizeof(szErrorMessage),
|
||||||
|
NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
printf("Failed to start process. Error: %lu: %ws\n", dwErrorCode, szErrorMessage);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -54,80 +74,421 @@ HANDLE OpenTargetProcess(DWORD processID) {
|
|||||||
return hProcess;
|
return hProcess;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CheckTutorialActorsOffset(HANDLE hProcess, uintptr_t address) {
|
bool WriteBytes(HANDLE hProcess, uintptr_t address, BYTE* newValues, size_t size) {
|
||||||
|
SIZE_T bytesWritten;
|
||||||
|
DWORD oldProtect;
|
||||||
|
if (VirtualProtectEx(hProcess, (LPVOID)address, size, PAGE_EXECUTE_READWRITE, &oldProtect)) {
|
||||||
|
if (WriteProcessMemory(hProcess, (LPVOID)address, newValues, size, &bytesWritten)) {
|
||||||
|
printf("Memory Write Success at address 0x%p\n", (void*)address);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Failed to write memory. Error: %lu\n", GetLastError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// Restore original protection
|
||||||
|
VirtualProtectEx(hProcess, (LPVOID)address, size, oldProtect, &oldProtect);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Failed to change memory protection. Error: %lu\n", GetLastError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckForceLevelStreamingOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
BYTE buffer[2];
|
BYTE buffer[2];
|
||||||
SIZE_T bytesRead;
|
SIZE_T bytesRead;
|
||||||
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
return buffer[0] == 0x32 && buffer[1] == 0xDB;
|
return buffer[0] == 0x32 && buffer[1] == 0xDB;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
DWORD error = GetLastError();
|
DWORD error = GetLastError();
|
||||||
if (error == 299) {
|
if (error == 299) {
|
||||||
printf("Incomplete memory read. Retrying...\n");
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
Sleep(1000);
|
Sleep(1000);
|
||||||
return CheckTutorialActorsOffset(hProcess, address);
|
return CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
}
|
}
|
||||||
printf("Failed to read memory. Error: %lu\n", error);
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CheckGPStringOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x5F && buffer[1] == 0x00;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckWeakPointerCheckJumpOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0xF8 && buffer[1] == 0xFE;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckWeakPointerCheckOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[3];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x0F && buffer[1] == 0x1F && buffer[2] == 0x40;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchForceLevelStreaming(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
// Season 3 Patch force disable level streaming: sub_3DA7520 -> loc_3DA75B6
|
||||||
|
uintptr_t address = imageBase + 0x3DA75B6;
|
||||||
|
bool found = CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
// Season 2 Patch force disable level streaming: sub_3D19900 -> loc_3D19996
|
||||||
|
address = imageBase + 0x3D19996;
|
||||||
|
found = CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to patch force level streaming!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[2] = { 0xB3, 0x01 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x5541C08;
|
||||||
|
found = CheckGPStringOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
address = imageBase + 0x54E0558;
|
||||||
|
found = CheckGPStringOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find _GP string!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[6] = { 0x47, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x16D7C24;
|
||||||
|
found = CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
// TODO
|
||||||
|
//if (!found) {
|
||||||
|
// address = imageBase + 0x54E0558;
|
||||||
|
// found = CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
//}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find Weak Pointer Check!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[28] = {
|
||||||
|
0x48, 0x8B, 0x06,
|
||||||
|
0x48, 0x8D, 0x4D, 0x7F,
|
||||||
|
0x48, 0x89, 0x45, 0x7F,
|
||||||
|
0xE8, 0xDC, 0xC7, 0xA7, 0x00,
|
||||||
|
0x48, 0x85, 0xC0,
|
||||||
|
0x0F, 0x84, 0xEE, 0x00, 0x00, 0x00,
|
||||||
|
0x90, 0x90, 0x90
|
||||||
|
};
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x16D7D34;
|
||||||
|
found = CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
// TODO
|
||||||
|
//if (!found) {
|
||||||
|
// address = imageBase + 0x54E0558;
|
||||||
|
// found = CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
//}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find Weak Pointer Check Jump!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[1] = { 0xEC };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckUpdateInventoryFunctionOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x84 && buffer[1] == 0xC0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchUpdateInventory(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
uintptr_t address = imageBase + 0x18D5A11;
|
||||||
|
bool found = CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
address = imageBase + 0x3D19B19;
|
||||||
|
found = CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to patch inventory update function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
BYTE newValues[8] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckSetupPlayerContractsOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x48 && buffer[1] == 0x8D;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckSetupPlayerContractsOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckUpdatePlayerContractsOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x3B && buffer[1] == 0xC1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckUpdatePlayerContractsOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchLoadPlayerContracts(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
uintptr_t address = imageBase + 0x171E9EC;
|
||||||
|
bool found = CheckUpdatePlayerContractsOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to update player contracts function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[4] = { 0x90, 0x90, 0xEB, 0x21 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x1706127;
|
||||||
|
found = CheckSetupPlayerContractsOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find setup player contracts function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[39] = {
|
||||||
|
0x45, 0x33, 0xC0, 0x49, 0x8B, 0xD5, 0x48, 0x8B, 0x89, 0xD8, 0x00, 0x00, 0x00, 0xE8, 0x47,
|
||||||
|
0xE2, 0x10, 0x00, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
|
||||||
|
0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0xEB
|
||||||
|
};
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Inject(HANDLE hProcess, const wchar_t* dllPath) {
|
||||||
|
// Allocate space in the target process for the DLL path
|
||||||
|
size_t pathSize = (wcslen(dllPath) + 1) * sizeof(wchar_t);
|
||||||
|
LPVOID remotePath = VirtualAllocEx(hProcess, NULL, pathSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
|
||||||
|
if (!remotePath) {
|
||||||
|
wprintf(L"Failed to allocate memory in remote process. Error: %lu\n", GetLastError());
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write the DLL path into the target process
|
||||||
|
if (!WriteProcessMemory(hProcess, remotePath, dllPath, pathSize, NULL)) {
|
||||||
|
wprintf(L"Failed to write memory. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the address of LoadLibraryW in kernel32.dll
|
||||||
|
LPVOID loadLibraryAddr = (LPVOID)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "LoadLibraryW");
|
||||||
|
if (!loadLibraryAddr) {
|
||||||
|
wprintf(L"Failed to get LoadLibraryW address. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a remote thread to call LoadLibraryW with our DLL path
|
||||||
|
HANDLE hThread = CreateRemoteThread(
|
||||||
|
hProcess, NULL, 0,
|
||||||
|
(LPTHREAD_START_ROUTINE)loadLibraryAddr,
|
||||||
|
remotePath, 0, NULL);
|
||||||
|
|
||||||
|
if (!hThread) {
|
||||||
|
wprintf(L"Failed to create remote thread. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool Patch(const wchar_t* processName) {
|
bool Patch(const wchar_t* processName) {
|
||||||
DWORD processID;
|
DWORD processID;
|
||||||
uintptr_t imageBase, address;
|
|
||||||
BYTE newValues[2] = { 0xB3, 0x01 };
|
|
||||||
SIZE_T bytesWritten;
|
|
||||||
|
|
||||||
HANDLE hProcess = StartProcess(processName, &processID);
|
HANDLE hProcess = StartProcess(processName, &processID);
|
||||||
if (hProcess == NULL) {
|
if (hProcess == NULL) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!Inject(hProcess, L"Prospect.Agent.dll")) {
|
||||||
// Wait a bit for PE image to load
|
|
||||||
Sleep(5000);
|
|
||||||
// Find the PE Image Base Address
|
|
||||||
imageBase = GetModuleBaseAddress(processID);
|
|
||||||
if (imageBase == 0) {
|
|
||||||
printf("Failed to find PE Image Base Address.\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!Inject(hProcess, L"UE4SS.dll")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
uintptr_t imageBase;
|
||||||
|
// Wait a bit for PE image to load
|
||||||
|
Sleep(250);
|
||||||
|
while ((imageBase = GetModuleBaseAddress(processID)) == 0) {
|
||||||
|
printf("Failed to find PE Image Base Address. Retrying...\n");
|
||||||
|
Sleep(250);
|
||||||
|
}
|
||||||
printf("PE Image Base Address: 0x%p\n", (void*)imageBase);
|
printf("PE Image Base Address: 0x%p\n", (void*)imageBase);
|
||||||
|
|
||||||
// Season 3 Patch tutorial actors loader: sub_3DA7520 -> loc_3DA75B6
|
bool success = !PatchForceLevelStreaming(hProcess, imageBase) || !PatchUpdateInventory(hProcess, imageBase) || !PatchLoadPlayerContracts(hProcess, imageBase);
|
||||||
address = imageBase + 0x3DA75B6;
|
if (success) {
|
||||||
bool found = CheckTutorialActorsOffset(hProcess, address);
|
|
||||||
if (!found) {
|
|
||||||
// Season 2 Patch tutorial actors loader: sub_3D19900 -> loc_3D19996
|
|
||||||
address = imageBase + 0x3D19996;
|
|
||||||
found = CheckTutorialActorsOffset(hProcess, address);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!found) {
|
|
||||||
printf("Failed to find necessary memory chunk!");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
DWORD oldProtect;
|
|
||||||
if (VirtualProtectEx(hProcess, (LPVOID)address, sizeof(newValues), PAGE_EXECUTE_READWRITE, &oldProtect)) {
|
|
||||||
if (WriteProcessMemory(hProcess, (LPVOID)address, newValues, sizeof(newValues), &bytesWritten)) {
|
|
||||||
printf("Memory Write Success: Wrote 0xB3 0x01 at address 0x%p\n", (void*)address);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
printf("Failed to write memory. Error: %lu\n", GetLastError());
|
|
||||||
}
|
|
||||||
// Restore original protection
|
|
||||||
VirtualProtectEx(hProcess, (LPVOID)address, sizeof(newValues), oldProtect, &oldProtect);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
printf("Failed to change memory protection. Error: %lu\n", GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clean up
|
// Clean up
|
||||||
CloseHandle(hProcess);
|
CloseHandle(hProcess);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool WriteSteamAppIDFile() {
|
||||||
|
const char* filename = "steam_appid.txt";
|
||||||
|
FILE* fp;
|
||||||
|
|
||||||
|
if (fopen_s(&fp, filename, "r") == 0) {
|
||||||
|
// File exists, close the file
|
||||||
|
fclose(fp);
|
||||||
|
printf("File '%s' already exists.\n", filename);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// File does not exist, create and write to it
|
||||||
|
if (fopen_s(&fp, filename, "w") == 0) {
|
||||||
|
const char* content = "480";
|
||||||
|
size_t written = fwrite(content, sizeof(char), strlen(content), fp);
|
||||||
|
fclose(fp);
|
||||||
|
printf("File '%s' was created and written successfully.\n", filename);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Error creating the file '%s'.\n", filename);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
bool success = Patch(L"Prospect-Win64-Shipping.exe");
|
printf("Current working directory: %ws\n", ExePath().c_str());
|
||||||
|
|
||||||
|
bool success = WriteSteamAppIDFile();
|
||||||
|
if (!success) {
|
||||||
|
// Wait for user input to exit
|
||||||
|
printf("An error occurred when writing steam_appid.txt! Press any key to exit...\n");
|
||||||
|
getchar();
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
success = Patch(L"Prospect-Win64-Shipping.exe");
|
||||||
if (!success) {
|
if (!success) {
|
||||||
// Wait for user input to exit
|
// Wait for user input to exit
|
||||||
printf("An error occurred when patching the executable! Press any key to exit...\n");
|
printf("An error occurred when patching the executable! Press any key to exit...\n");
|
||||||
|
|||||||
@@ -4,4 +4,6 @@ public class PlayFabSettings
|
|||||||
{
|
{
|
||||||
public string PublisherId { get; set; }
|
public string PublisherId { get; set; }
|
||||||
public string TitleId { get; set; }
|
public string TitleId { get; set; }
|
||||||
|
public string SignalRURL { get; set; }
|
||||||
|
public string SignalRAccessToken { get; set; }
|
||||||
}
|
}
|
||||||
@@ -155,11 +155,119 @@ public class ClientController : Controller
|
|||||||
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
||||||
public IActionResult GetStoreItems(FGetStoreItems request)
|
public IActionResult GetStoreItems(FGetStoreItems request)
|
||||||
{
|
{
|
||||||
return Ok(new ClientResponse<object>
|
// The vendors (Korolev / ICA / Osiris / QuickShop) and other stores are defined
|
||||||
|
// inside the Blueprints title data: each item lists a per-store entry under
|
||||||
|
// ItemShopsCraftingData keyed by the store id, with the currency price in its
|
||||||
|
// recipe ingredients. This endpoint was previously a stub returning {}, which is
|
||||||
|
// why every shop showed up empty. We build the store on the fly from that data.
|
||||||
|
var storeId = request.StoreId ?? "";
|
||||||
|
var store = new List<FStoreItem>();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "Blueprints" });
|
||||||
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
|
if (blueprints != null && !string.IsNullOrEmpty(storeId))
|
||||||
|
{
|
||||||
|
uint position = 0;
|
||||||
|
foreach (var (itemId, blueprint) in blueprints)
|
||||||
|
{
|
||||||
|
if (blueprint.ItemShopsCraftingData == null) continue;
|
||||||
|
if (!blueprint.ItemShopsCraftingData.TryGetValue(storeId, out var shopData)) continue;
|
||||||
|
if (shopData?.ItemRecipeIngredients == null) continue;
|
||||||
|
|
||||||
|
// Only currency ingredients form a purchasable price. Entries whose
|
||||||
|
// recipe is item-based (crafting) are handled by the crafting UI from
|
||||||
|
// the blueprint data the client already has, not by the buy store.
|
||||||
|
var prices = new Dictionary<string, uint>();
|
||||||
|
foreach (var ingredient in shopData.ItemRecipeIngredients)
|
||||||
|
{
|
||||||
|
var code = ingredient.Currency switch
|
||||||
|
{
|
||||||
|
"SoftCurrency" => "SC",
|
||||||
|
"Aurum" => "AU",
|
||||||
|
"InsuranceCurrency" => "IN",
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
if (code == null || ingredient.Amount < 0) continue;
|
||||||
|
prices[code] = prices.TryGetValue(code, out var current)
|
||||||
|
? current + (uint)ingredient.Amount
|
||||||
|
: (uint)ingredient.Amount;
|
||||||
|
}
|
||||||
|
if (prices.Count == 0) continue;
|
||||||
|
|
||||||
|
store.Add(new FStoreItem
|
||||||
|
{
|
||||||
|
ItemId = itemId,
|
||||||
|
VirtualCurrencyPrices = prices,
|
||||||
|
RealCurrencyPrices = new Dictionary<string, uint>(),
|
||||||
|
DisplayPosition = position++,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(e, "Failed to build store items for store {StoreId}", storeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cosmetic / premium stores are backed by the Vanities title data (not Blueprints):
|
||||||
|
// each vanity carries its price in StoreData.Amount, paid in Aurum. AurumShop lists
|
||||||
|
// the whole priced catalogue; the daily/weekly rotations (ids from RequestStore
|
||||||
|
// RotationData) show a deterministic slice so they change over time but stay stable
|
||||||
|
// within a period.
|
||||||
|
var isAurumShop = storeId == "AurumShop";
|
||||||
|
var isDailyShop = storeId.StartsWith("DailyShop_");
|
||||||
|
var isWeeklyShop = storeId.StartsWith("WeeklyShop_");
|
||||||
|
if (store.Count == 0 && (isAurumShop || isDailyShop || isWeeklyShop))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var vanityData = _titleDataService.Find(new List<string> { "Vanities" });
|
||||||
|
var vanities = JsonSerializer.Deserialize<List<TitleDataVanityInfo>>(vanityData["Vanities"]);
|
||||||
|
var priced = vanities?
|
||||||
|
.Where(v => v.StoreData != null && v.StoreData.Amount > 0)
|
||||||
|
.OrderBy(v => v.Name, StringComparer.Ordinal)
|
||||||
|
.ToList() ?? new List<TitleDataVanityInfo>();
|
||||||
|
|
||||||
|
IEnumerable<TitleDataVanityInfo> selection = priced;
|
||||||
|
if ((isDailyShop || isWeeklyShop) && priced.Count > 0)
|
||||||
|
{
|
||||||
|
var size = isWeeklyShop ? 12 : 6;
|
||||||
|
int.TryParse(storeId[(storeId.IndexOf('_') + 1)..], out var rotation);
|
||||||
|
var start = (int)(((long)rotation * size) % priced.Count);
|
||||||
|
selection = Enumerable.Range(0, Math.Min(size, priced.Count))
|
||||||
|
.Select(i => priced[(start + i) % priced.Count]);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint position = 0;
|
||||||
|
foreach (var vanity in selection)
|
||||||
|
{
|
||||||
|
store.Add(new FStoreItem
|
||||||
|
{
|
||||||
|
ItemId = vanity.Name,
|
||||||
|
VirtualCurrencyPrices = new Dictionary<string, uint> { ["AU"] = (uint)vanity.StoreData.Amount },
|
||||||
|
RealCurrencyPrices = new Dictionary<string, uint>(),
|
||||||
|
DisplayPosition = position++,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(e, "Failed to build vanity store {StoreId}", storeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation("GetStoreItems '{StoreId}': {Count} item(s)", storeId, store.Count);
|
||||||
|
return Ok(new ClientResponse<FGetStoreItemsResult>
|
||||||
{
|
{
|
||||||
Code = 200,
|
Code = 200,
|
||||||
Status = "OK",
|
Status = "OK",
|
||||||
Data = new {}
|
Data = new FGetStoreItemsResult
|
||||||
|
{
|
||||||
|
StoreId = string.IsNullOrEmpty(storeId) ? null : storeId,
|
||||||
|
CatalogVersion = "StaticItems",
|
||||||
|
Store = store,
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -244,13 +352,15 @@ public class ClientController : Controller
|
|||||||
public async Task<IActionResult> GetUserInventory(FGetUserInventoryRequest request)
|
public async Task<IActionResult> GetUserInventory(FGetUserInventoryRequest request)
|
||||||
{
|
{
|
||||||
var userId = User.FindAuthUserId();
|
var userId = User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Balance", "Inventory", "VanityItems"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Balance", "Inventory", "VanityItems", "CharacterVanity", "GlobalVanity"});
|
||||||
var inventory = JsonSerializer.Deserialize<FYCustomItemInfo[]>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<FYCustomItemInfo[]>(userData["Inventory"].Value);
|
||||||
// TODO: Per-user vanity
|
// Per-user vanity ownership: the player owns the cosmetics they've bought (VanityItems)
|
||||||
// var vanity = JsonSerializer.Deserialize<CustomVanityItem[]>(userData["VanityItems"].Value);
|
// plus whatever is currently equipped (CharacterVanity / GlobalVanity), so the starter
|
||||||
var titleData = _titleDataService.Find(new List<string>{"Blueprints", "Vanities"});
|
// outfit stays owned. Previously the whole Vanities catalogue was returned as owned,
|
||||||
|
// which made every item in the Aurum shop show up as already "owned".
|
||||||
|
var ownedVanityIds = CollectOwnedVanityIds(userData);
|
||||||
|
var titleData = _titleDataService.Find(new List<string>{"Blueprints"});
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
var vanity = JsonSerializer.Deserialize<TitleDataVanityInfo[]>(titleData["Vanities"]);
|
|
||||||
List<FItemInstance> items = new List<FItemInstance>();
|
List<FItemInstance> items = new List<FItemInstance>();
|
||||||
foreach (var item in inventory) {
|
foreach (var item in inventory) {
|
||||||
if (!blueprints.ContainsKey(item.BaseItemId)) {
|
if (!blueprints.ContainsKey(item.BaseItemId)) {
|
||||||
@@ -276,9 +386,9 @@ public class ClientController : Controller
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var item in vanity) {
|
foreach (var vanityId in ownedVanityIds) {
|
||||||
items.Add(new FItemInstance {
|
items.Add(new FItemInstance {
|
||||||
ItemId = item.Name,
|
ItemId = vanityId,
|
||||||
// ItemInstanceId is not required since it's not a unique item.
|
// ItemInstanceId is not required since it's not a unique item.
|
||||||
ItemClass = "Vanity",
|
ItemClass = "Vanity",
|
||||||
// PurchaseDate = DateTime.Now, // TODO
|
// PurchaseDate = DateTime.Now, // TODO
|
||||||
@@ -303,6 +413,60 @@ public class ClientController : Controller
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Collects the vanity ids a player actually owns: everything they've purchased
|
||||||
|
// (VanityItems) plus everything currently equipped (CharacterVanity slots and the
|
||||||
|
// GlobalVanity sprays / banner / emotes / drop pod). Parsed defensively with
|
||||||
|
// JsonDocument so malformed / partial data never breaks the inventory response.
|
||||||
|
private static HashSet<string> CollectOwnedVanityIds(Dictionary<string, FUserDataRecord> userData)
|
||||||
|
{
|
||||||
|
var owned = new HashSet<string>(StringComparer.Ordinal);
|
||||||
|
void AddId(string? id) { if (!string.IsNullOrEmpty(id)) owned.Add(id); }
|
||||||
|
|
||||||
|
if (userData.TryGetValue("VanityItems", out var viRec) && !string.IsNullOrWhiteSpace(viRec.Value))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(viRec.Value);
|
||||||
|
if (doc.RootElement.ValueKind == JsonValueKind.Array)
|
||||||
|
foreach (var el in doc.RootElement.EnumerateArray())
|
||||||
|
if (el.ValueKind == JsonValueKind.Object && el.TryGetProperty("baseItemId", out var b))
|
||||||
|
AddId(b.GetString());
|
||||||
|
}
|
||||||
|
catch { /* ignore malformed VanityItems */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userData.TryGetValue("CharacterVanity", out var cvRec) && !string.IsNullOrWhiteSpace(cvRec.Value))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(cvRec.Value);
|
||||||
|
if (doc.RootElement.ValueKind == JsonValueKind.Object)
|
||||||
|
foreach (var prop in doc.RootElement.EnumerateObject())
|
||||||
|
if (prop.Value.ValueKind == JsonValueKind.Object && prop.Value.TryGetProperty("id", out var id))
|
||||||
|
AddId(id.GetString());
|
||||||
|
}
|
||||||
|
catch { /* ignore malformed CharacterVanity */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userData.TryGetValue("GlobalVanity", out var gvRec) && !string.IsNullOrWhiteSpace(gvRec.Value))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(gvRec.Value);
|
||||||
|
var root = doc.RootElement;
|
||||||
|
if (root.ValueKind == JsonValueKind.Object)
|
||||||
|
{
|
||||||
|
if (root.TryGetProperty("activeGlobalVanityIds", out var arr) && arr.ValueKind == JsonValueKind.Array)
|
||||||
|
foreach (var el in arr.EnumerateArray()) AddId(el.GetString());
|
||||||
|
if (root.TryGetProperty("droppodId", out var dp)) AddId(dp.GetString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch { /* ignore malformed GlobalVanity */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
return owned;
|
||||||
|
}
|
||||||
|
|
||||||
[HttpPost("GetTitleData")]
|
[HttpPost("GetTitleData")]
|
||||||
[Produces(MediaTypeNames.Application.Json)]
|
[Produces(MediaTypeNames.Application.Json)]
|
||||||
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
|
// PlayFab StoreItem: a single catalog item offered for sale in a store, with its prices.
|
||||||
|
public class FStoreItem
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Store specific custom data. The data only exists as part of this store; it is not transferred to item instances.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("CustomData")]
|
||||||
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
|
public object? CustomData { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Intended display position for this item. Note that 0 is the first position and -1 is the last position.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("DisplayPosition")]
|
||||||
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
|
public uint? DisplayPosition { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Unique identifier of the item as it exists in the catalog - note that this must exactly match the ItemId from the catalog.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("ItemId")]
|
||||||
|
public string ItemId { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Override prices for this item for specific currencies.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("RealCurrencyPrices")]
|
||||||
|
public Dictionary<string, uint> RealCurrencyPrices { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Override prices for this item in virtual currencies and "RM" (the base Real Money purchase price, in USD pennies).
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("VirtualCurrencyPrices")]
|
||||||
|
public Dictionary<string, uint> VirtualCurrencyPrices { get; set; } = new();
|
||||||
|
}
|
||||||
@@ -1,8 +1,19 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client;
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
public class FGetStoreItems
|
public class FGetStoreItems
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Catalog version to store items from. Use default catalog version if null.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("CatalogVersion")]
|
||||||
|
public string? CatalogVersion { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Unique identifier for the store which is being requested.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("StoreId")]
|
||||||
|
public string? StoreId { get; set; }
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
|
public class FGetStoreItemsResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] The base catalog that this store is a part of.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("CatalogVersion")]
|
||||||
|
public string? CatalogVersion { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Array of items which can be purchased from this store.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("Store")]
|
||||||
|
public List<FStoreItem> Store { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] The ID of this store.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("StoreId")]
|
||||||
|
public string? StoreId { get; set; }
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Data;
|
namespace Prospect.Server.Api.Models.Data;
|
||||||
|
|
||||||
@@ -11,5 +12,14 @@ public class PlayerBalance
|
|||||||
public int SoftCurrency { get; set; }
|
public int SoftCurrency { get; set; }
|
||||||
|
|
||||||
[JsonPropertyName("IN")]
|
[JsonPropertyName("IN")]
|
||||||
public int InsuranceTokens { get; set; }
|
public int InsuranceCurrency { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class JobBoardsData
|
||||||
|
{
|
||||||
|
[JsonPropertyName("lastBoardRefreshTimeUtc")]
|
||||||
|
public FYTimestamp LastBoardRefreshTimeUtc { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("boards")]
|
||||||
|
public List<FYFactionContractsData> Boards { get; set; }
|
||||||
}
|
}
|
||||||
@@ -33,6 +33,24 @@ public class TitleDataContractInfoObjective {
|
|||||||
public int MaxProgress { get; set; }
|
public int MaxProgress { get; set; }
|
||||||
[JsonPropertyName("ItemToOwn")]
|
[JsonPropertyName("ItemToOwn")]
|
||||||
public string ItemToOwn { get; set; }
|
public string ItemToOwn { get; set; }
|
||||||
|
[JsonPropertyName("KillConditions")]
|
||||||
|
public TitleDataContractInfoObjectiveKillConditions? KillConditions { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TitleDataContractInfoObjectiveKillConditions
|
||||||
|
{
|
||||||
|
[JsonPropertyName("KillTarget")]
|
||||||
|
public EYKillTypeAction KillTarget { get; set; }
|
||||||
|
[JsonPropertyName("AllowedWeaponCategories")]
|
||||||
|
public EYDeviceCategory[] AllowedWeaponCategories { get; set; }
|
||||||
|
[JsonPropertyName("AllowedSpecificWeapons")]
|
||||||
|
public string[] AllowedSpecificWeapons { get; set; }
|
||||||
|
[JsonPropertyName("SpecificAIEnemyTypeToKill")]
|
||||||
|
public EYEnemyType SpecificAIEnemyTypeToKill { get; set; }
|
||||||
|
[JsonPropertyName("MapName")]
|
||||||
|
public string MapName { get; set; }
|
||||||
|
[JsonPropertyName("OnlyDuringStorm")]
|
||||||
|
public bool OnlyDuringStorm { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TitleDataContractInfoUnlockData {
|
public class TitleDataContractInfoUnlockData {
|
||||||
@@ -62,3 +80,60 @@ public enum EYContractDifficulty
|
|||||||
Hard = 3,
|
Hard = 3,
|
||||||
MAX = 4
|
MAX = 4
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public enum EYDeviceCategory
|
||||||
|
{
|
||||||
|
AssaultRifle = 0,
|
||||||
|
Pistol = 1,
|
||||||
|
SMG = 2,
|
||||||
|
SniperRifle = 3,
|
||||||
|
HeavyWeapon = 4,
|
||||||
|
Shotgun = 5,
|
||||||
|
BurstRifle = 6,
|
||||||
|
Exotic = 7,
|
||||||
|
MissileLauncher = 8,
|
||||||
|
Scanner = 9,
|
||||||
|
All = 10,
|
||||||
|
INVALID = 11,
|
||||||
|
MAX = 12
|
||||||
|
};
|
||||||
|
|
||||||
|
public enum EYKillTypeAction
|
||||||
|
{
|
||||||
|
Invalid = 0,
|
||||||
|
Players = 1,
|
||||||
|
Creatures = 2,
|
||||||
|
All = 3,
|
||||||
|
MAX = 4
|
||||||
|
};
|
||||||
|
|
||||||
|
public enum EYEnemyType
|
||||||
|
{
|
||||||
|
None = 0,
|
||||||
|
DebugAutomationTest = 1,
|
||||||
|
DirtBeast_Melee = 2,
|
||||||
|
DirtBeast_RangedShort = 3,
|
||||||
|
DirtBeast_RangedMedium = 4,
|
||||||
|
DirtBeast_RangedLong = 5,
|
||||||
|
DirtBeast_MeleeHeavy = 6,
|
||||||
|
DirtBeast_RangedHeavy = 7,
|
||||||
|
DirtBeast_FlyingHeavy = 8,
|
||||||
|
DirtBeast_Boss = 9,
|
||||||
|
Orobot_Melee = 10,
|
||||||
|
Orobot_RangedShort = 11,
|
||||||
|
Orobot_RangedMedium = 12,
|
||||||
|
Orobot_Walker = 13,
|
||||||
|
Orobot_Platform = 14,
|
||||||
|
Plunderbot_RangedShort = 15,
|
||||||
|
Plunderbot_RangedMedium = 16,
|
||||||
|
Plunderbot_RangedLong = 17,
|
||||||
|
GlowBeetle_Blast = 18,
|
||||||
|
GlowBeetle_Acid = 19,
|
||||||
|
GlowBeetle_Summon = 20,
|
||||||
|
Strider = 21,
|
||||||
|
Rattler = 22,
|
||||||
|
Weremole = 23,
|
||||||
|
Crusher = 24,
|
||||||
|
Howler = 25,
|
||||||
|
MAX = 26
|
||||||
|
};
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
||||||
},
|
},
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"applicationUrl": "https://2EA46.playfabapi.com:443",
|
"applicationUrl": "https://127.0.0.1:8443;http://127.0.0.1:8000",
|
||||||
"useSSL": true
|
"useSSL": true
|
||||||
},
|
},
|
||||||
"IIS Express": {
|
"IIS Express": {
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
||||||
},
|
},
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"applicationUrl": "https://2EA46.playfabapi.com"
|
"applicationUrl": "https://127.0.0.1:8443;http://127.0.0.1:8000",
|
||||||
|
"useSSL": true
|
||||||
},
|
},
|
||||||
"IIS Express": {
|
"IIS Express": {
|
||||||
"commandName": "IISExpress",
|
"commandName": "IISExpress",
|
||||||
|
|||||||
@@ -55,12 +55,11 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
|||||||
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 userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive", "ContractsOneTimeCompleted"});
|
||||||
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
||||||
|
|
||||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
var contract = contracts[request.ContractID];
|
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||||
if (contract == null) {
|
|
||||||
return new FYActivateContractResult
|
return new FYActivateContractResult
|
||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
@@ -68,14 +67,32 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
|||||||
Status = 3 // EYActivateContractRequestStatus::FAILED_GETTING_STATIC_DATA
|
Status = 3 // EYActivateContractRequestStatus::FAILED_GETTING_STATIC_DATA
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
|
if (contractsCompleted.ContractsIDs.Contains(request.ContractID)) {
|
||||||
|
return new FYActivateContractResult
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
Error = "Contract is already completed",
|
||||||
|
Status = 1 // EYActivateContractRequestStatus::CONTRACT_OF_THIS_FACTION_IS_ALREADY_ACTIVE
|
||||||
|
};
|
||||||
|
}
|
||||||
// TODO: Contract unlock criteria
|
// TODO: Contract unlock criteria
|
||||||
|
|
||||||
var progress = new int[contract.Objectives.Length];
|
var progress = new int[contract.Objectives.Length];
|
||||||
|
// NOTE: Automatically set max progress for player kill objectives.
|
||||||
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
|
var objective = contract.Objectives[i];
|
||||||
|
if (objective.Type == EYContractObjectiveType.Kills && objective.KillConditions.KillTarget == EYKillTypeAction.Players) {
|
||||||
|
progress[i] = objective.MaxProgress;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
var contractData = new FYActiveContractPlayerData {
|
var contractData = new FYActiveContractPlayerData {
|
||||||
ContractID = request.ContractID,
|
ContractID = request.ContractID,
|
||||||
Progress = progress,
|
Progress = progress,
|
||||||
};
|
};
|
||||||
|
// TODO: Max number of active jobs
|
||||||
contractsActive.Contracts.Add(contractData);
|
contractsActive.Contracts.Add(contractData);
|
||||||
await _userDataService.UpdateAsync(
|
await _userDataService.UpdateAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
|
|||||||
+4
-9
@@ -32,18 +32,13 @@ public class CheckClientVersionUpToDateFunction : ICloudScriptFunction<CheckClie
|
|||||||
_logger.LogInformation("Processing client version check request for client {Version}",
|
_logger.LogInformation("Processing client version check request for client {Version}",
|
||||||
request.Version);
|
request.Version);
|
||||||
|
|
||||||
// TODO: Validate login
|
|
||||||
// if (string.IsNullOrEmpty(request.LoginNonce))
|
|
||||||
// {
|
|
||||||
// return new CheckClientVersionUpToDateResponse
|
|
||||||
// {
|
|
||||||
// IsClientUpToDate = false,
|
|
||||||
// };
|
|
||||||
// }
|
|
||||||
|
|
||||||
return new CheckClientVersionUpToDateResponse
|
return new CheckClientVersionUpToDateResponse
|
||||||
{
|
{
|
||||||
|
#if SEASON_2_RELEASE || SEASON_2_DEBUG
|
||||||
|
IsClientUpToDate = request.Version == "4.27.2-1413204+PROSPECT-Releases-R2.7.0",
|
||||||
|
#else
|
||||||
IsClientUpToDate = true,
|
IsClientUpToDate = true,
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
private readonly TitleDataService _titleDataService;
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
|
||||||
|
private readonly Random rnd = new Random();
|
||||||
|
|
||||||
public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
@@ -66,11 +68,10 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
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 titleData = _titleDataService.Find(new List<string>{"Contracts", "Blueprints"});
|
var titleData = _titleDataService.Find(new List<string>{ "Contracts", "Blueprints", "Jobs", "LevelData" });
|
||||||
|
|
||||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
var contract = contracts[request.ContractID];
|
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||||
if (contract == null) {
|
|
||||||
return new FYClaimCompletedActiveContractRewardsResult
|
return new FYClaimCompletedActiveContractRewardsResult
|
||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
@@ -82,16 +83,17 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
var factionKey = "FactionProgression" + contract.Faction;
|
var factionKey = "FactionProgression" + contract.Faction;
|
||||||
var userData = await _userDataService.FindAsync(
|
var userData = await _userDataService.FindAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey}
|
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey, "JobBoardsData" }
|
||||||
);
|
);
|
||||||
|
|
||||||
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 jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value);
|
||||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(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 == contract.Name);
|
||||||
if (targetContractIdx == -1) {
|
if (targetContractIdx == -1) {
|
||||||
return new FYClaimCompletedActiveContractRewardsResult
|
return new FYClaimCompletedActiveContractRewardsResult
|
||||||
{
|
{
|
||||||
@@ -106,6 +108,7 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
var targetContract = contractsActive.Contracts[targetContractIdx];
|
var targetContract = contractsActive.Contracts[targetContractIdx];
|
||||||
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
||||||
HashSet<string> deletedItemsIds = [];
|
HashSet<string> deletedItemsIds = [];
|
||||||
|
// TODO: Optimize
|
||||||
for (var i = 0; i < contract.Objectives.Length; i++) {
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
var objective = contract.Objectives[i];
|
var objective = contract.Objectives[i];
|
||||||
int remaining = objective.MaxProgress;
|
int remaining = objective.MaxProgress;
|
||||||
@@ -128,6 +131,12 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (objective.Type == EYContractObjectiveType.Kills) {
|
||||||
|
// Kill objectives can't be tracked in a client-hosted raid (no dedicated
|
||||||
|
// game server reports kills). They are auto-credited on deploy
|
||||||
|
// (EnterMatchmakingMatch); accept them here even if a contract was
|
||||||
|
// activated before that so kill contracts remain completable.
|
||||||
|
remaining = 0;
|
||||||
} else {
|
} else {
|
||||||
// NOTE: A game server must write the correct progress
|
// NOTE: A game server must write the correct progress
|
||||||
// for other types of objectives.
|
// for other types of objectives.
|
||||||
@@ -161,14 +170,14 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
} else if (reward.ItemID == "Aurum") {
|
} else if (reward.ItemID == "Aurum") {
|
||||||
balance.HardCurrency += reward.Amount;
|
balance.HardCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.ItemID == "InsuranceToken") {
|
} else if (reward.ItemID == "InsuranceCurrency") {
|
||||||
balance.InsuranceTokens += reward.Amount;
|
balance.InsuranceCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
} else {
|
} else {
|
||||||
// TODO: Inventory limit check
|
// TODO: Inventory limit check
|
||||||
|
|
||||||
var blueprintData = blueprints[reward.ItemID];
|
var blueprintData = blueprints[reward.ItemID];
|
||||||
var remainingAmount = reward.Amount * blueprintData.AmountPerPurchase;
|
var remainingAmount = reward.Amount; // Quest rewards are given individually
|
||||||
|
|
||||||
// Populate incomplete stacks first
|
// Populate incomplete stacks first
|
||||||
foreach (var item in newInventory) {
|
foreach (var item in newInventory) {
|
||||||
@@ -211,14 +220,47 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
factionProgression += contract.ReputationIncrease;
|
factionProgression += contract.ReputationIncrease;
|
||||||
contractsActive.Contracts.RemoveAt(targetContractIdx);
|
contractsActive.Contracts.RemoveAt(targetContractIdx);
|
||||||
// Main contracts can be completed only once.
|
// Main contracts can be completed only once.
|
||||||
|
// Other contracts should be jobs.
|
||||||
|
var newContractIdOnBoard = "";
|
||||||
if (contract.IsMainContract) {
|
if (contract.IsMainContract) {
|
||||||
contractsCompleted.ContractsIDs.Add(request.ContractID);
|
contractsCompleted.ContractsIDs.Add(contract.Name);
|
||||||
|
} else {
|
||||||
|
var parts = contract.Name.Split('-');
|
||||||
|
var difficulty = parts[1];
|
||||||
|
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||||
|
var levels = levelsData[contract.Faction];
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"]);
|
||||||
|
var level = levels.Length - Array.FindIndex(levels, (int xp) => {
|
||||||
|
return factionProgression >= xp;
|
||||||
|
});
|
||||||
|
|
||||||
|
var factionBoard = jobBoardsData.Boards.Find(c => c.FactionId == contract.Faction);
|
||||||
|
var idx = Array.FindIndex(difficulties, d => d == difficulty);
|
||||||
|
var factionJobs = jobs[contract.Faction];
|
||||||
|
var jobsAvailable = Array.FindAll(factionJobs[difficulty], (string jobId) => {
|
||||||
|
return level >= contracts[jobId].UnlockData.Level;
|
||||||
|
});
|
||||||
|
// If player completes a job, it means he has at least one unlocked anyway.
|
||||||
|
newContractIdOnBoard = jobsAvailable[rnd.Next(jobsAvailable.Length)];
|
||||||
|
factionBoard.Contracts[idx].ContractId = newContractIdOnBoard;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Check for next unlock in contracts instead of relying on client
|
||||||
var newContracts = new List<FYActiveContractPlayerData>();
|
var newContracts = new List<FYActiveContractPlayerData>();
|
||||||
foreach (var contractIdToUnlock in request.ContractsToUnlock) {
|
foreach (var contractIdToUnlock in request.ContractsToUnlock) {
|
||||||
|
if (contractsCompleted.ContractsIDs.Contains(contractIdToUnlock)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
var contractToUnlock = contracts[contractIdToUnlock];
|
var contractToUnlock = contracts[contractIdToUnlock];
|
||||||
var progress = new int[contractToUnlock.Objectives.Length];
|
var progress = new int[contractToUnlock.Objectives.Length];
|
||||||
|
// NOTE: Automatically set max progress for player kill objectives.
|
||||||
|
for (var i = 0; i < contractToUnlock.Objectives.Length; i++) {
|
||||||
|
var objective = contractToUnlock.Objectives[i];
|
||||||
|
if (objective.Type == EYContractObjectiveType.Kills && objective.KillConditions.KillTarget == EYKillTypeAction.Players) {
|
||||||
|
progress[i] = objective.MaxProgress;
|
||||||
|
}
|
||||||
|
}
|
||||||
var newContract = new FYActiveContractPlayerData {
|
var newContract = new FYActiveContractPlayerData {
|
||||||
ContractID = contractIdToUnlock,
|
ContractID = contractIdToUnlock,
|
||||||
Progress = progress,
|
Progress = progress,
|
||||||
@@ -235,6 +277,7 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
["Balance"] = JsonSerializer.Serialize(balance),
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
[factionKey] = JsonSerializer.Serialize(factionProgression),
|
[factionKey] = JsonSerializer.Serialize(factionProgression),
|
||||||
|
["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -242,12 +285,12 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "",
|
Error = "",
|
||||||
ClaimedContractID = request.ContractID,
|
ClaimedContractID = contract.Name,
|
||||||
ContractsActivated = newContracts,
|
ContractsActivated = newContracts,
|
||||||
ItemsUpdatedOrRemoved = itemsUpdatedOrRemoved,
|
ItemsUpdatedOrRemoved = itemsUpdatedOrRemoved,
|
||||||
ChangedCurrencies = changedCurrencies.ToArray(),
|
ChangedCurrencies = changedCurrencies.ToArray(),
|
||||||
ItemsGranted = itemsGranted,
|
ItemsGranted = itemsGranted,
|
||||||
NewContractIdOnBoard = "", // TODO: This should be a replacement contract apparently?
|
NewContractIdOnBoard = newContractIdOnBoard,
|
||||||
PlayerFactionProgressData = new FYPlayerFactionProgressData {
|
PlayerFactionProgressData = new FYPlayerFactionProgressData {
|
||||||
FactionID = contract.Faction,
|
FactionID = contract.Faction,
|
||||||
CurrentProgression = factionProgression,
|
CurrentProgression = factionProgression,
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
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;
|
||||||
|
|
||||||
public class ClientsideFriendsImportRequest
|
public class ClientsideFriendsImportRequest
|
||||||
{
|
{
|
||||||
@@ -18,15 +21,33 @@ public class ClientsideFriendsImportResponse
|
|||||||
public class ClientsideFriendsImportFunction : ICloudScriptFunction<ClientsideFriendsImportRequest, ClientsideFriendsImportResponse>
|
public class ClientsideFriendsImportFunction : ICloudScriptFunction<ClientsideFriendsImportRequest, ClientsideFriendsImportResponse>
|
||||||
{
|
{
|
||||||
private readonly ILogger<ClientsideFriendsImportFunction> _logger;
|
private readonly ILogger<ClientsideFriendsImportFunction> _logger;
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
public ClientsideFriendsImportFunction(ILogger<ClientsideFriendsImportFunction> logger)
|
public ClientsideFriendsImportFunction(ILogger<ClientsideFriendsImportFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<ClientsideFriendsImportResponse> ExecuteAsync(ClientsideFriendsImportRequest request)
|
public async Task<ClientsideFriendsImportResponse> ExecuteAsync(ClientsideFriendsImportRequest request)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Processing friends import");
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
|
// Persist the platform friend ids the client imports (Steam ids) so GetFriendList
|
||||||
|
// can later resolve which of them actually play on this server.
|
||||||
|
var ids = request.UserIDs ?? Array.Empty<string>();
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["ImportedSteamFriends"] = JsonSerializer.Serialize(ids),
|
||||||
|
});
|
||||||
|
_logger.LogInformation("Imported {Count} {Platform} friend id(s) for user {User}", ids.Length, request.Platform, userId);
|
||||||
|
|
||||||
return new ClientsideFriendsImportResponse{};
|
return new ClientsideFriendsImportResponse{};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
|
// Closed Beta Function
|
||||||
|
|
||||||
|
public class CompleteInventoryUpdateRequest
|
||||||
|
{
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserID { get; set; }
|
||||||
|
[JsonPropertyName("reason")]
|
||||||
|
public string Reason { get; set; }
|
||||||
|
[JsonPropertyName("newSet")]
|
||||||
|
public LoadoutData NewSet { get; set; }
|
||||||
|
[JsonPropertyName("itemsToAdd")]
|
||||||
|
public FYCustomItemInfo[] ItemsToAdd { get; set; }
|
||||||
|
[JsonPropertyName("itemsToUpdateAmount")]
|
||||||
|
public FYCustomItemInfo[] ItemsToUpdateAmount { get; set; }
|
||||||
|
[JsonPropertyName("itemsToRemove")]
|
||||||
|
public HashSet<string> ItemsToRemove { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CompleteInventoryUpdateResponse
|
||||||
|
{
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserId { get; set; }
|
||||||
|
[JsonPropertyName("error")]
|
||||||
|
public string Error { get; set; }
|
||||||
|
[JsonPropertyName("newSet")]
|
||||||
|
public LoadoutData NewSet { get; set; }
|
||||||
|
[JsonPropertyName("itemsToAdd")]
|
||||||
|
public FYCustomItemInfo[] ItemsToAdd { get; set; }
|
||||||
|
[JsonPropertyName("itemsToUpdateAmount")]
|
||||||
|
public FYCustomItemInfo[] ItemsToUpdateAmount { get; set; }
|
||||||
|
[JsonPropertyName("itemsToRemove")]
|
||||||
|
public HashSet<string> ItemsToRemove { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[CloudScriptFunction("CompleteInventoryUpdate")]
|
||||||
|
public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInventoryUpdateRequest, CompleteInventoryUpdateResponse>
|
||||||
|
{
|
||||||
|
private readonly ILogger<CompleteInventoryUpdateFunction> _logger;
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
|
||||||
|
public CompleteInventoryUpdateFunction(ILogger<CompleteInventoryUpdateFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<CompleteInventoryUpdateResponse> ExecuteAsync(CompleteInventoryUpdateRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory"});
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
|
// Insurance payout: this request also reports the end-of-match inventory, so items
|
||||||
|
// the player lost (death / left behind) arrive in ItemsToRemove. Any of those that
|
||||||
|
// were insured on deploy (EnterMatchmakingStation) are recovered back to the stash —
|
||||||
|
// the premium was already paid up-front — and the insurance is consumed (one raid).
|
||||||
|
// Recovery is only performed if the item's policy declares a positive Payout.
|
||||||
|
var recoveredInsured = new HashSet<string>();
|
||||||
|
if (request.ItemsToRemove is { Count: > 0 })
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var td = _titleDataService.Find(new List<string> { "InventoryInsurance" });
|
||||||
|
if (td.TryGetValue("InventoryInsurance", out var rawPolicies) && !string.IsNullOrEmpty(rawPolicies))
|
||||||
|
{
|
||||||
|
var policies = JsonSerializer.Deserialize<Dictionary<string, InventoryInsurancePolicy>>(rawPolicies);
|
||||||
|
foreach (var item in inventory)
|
||||||
|
{
|
||||||
|
if (!request.ItemsToRemove.Contains(item.ItemId)) continue;
|
||||||
|
if (string.IsNullOrEmpty(item.Insurance) || item.InsuranceOwnerPlayfabId != userId) continue;
|
||||||
|
if (policies == null || !policies.TryGetValue(item.Insurance, out var policy) || policy.Payout <= 0) continue;
|
||||||
|
recoveredInsured.Add(item.ItemId);
|
||||||
|
item.Insurance = ""; // consumed for this raid
|
||||||
|
item.InsuranceOwnerPlayfabId = "";
|
||||||
|
}
|
||||||
|
if (recoveredInsured.Count > 0)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Recovered {Count} insured item(s) for user {User}", recoveredInsured.Count, userId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
// Never fail the inventory commit because of insurance handling.
|
||||||
|
_logger.LogWarning(e, "Failed to process insurance payout");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
// IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
|
||||||
|
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||||
|
foreach (var item in inventory) {
|
||||||
|
// Keep items that weren't removed, plus insured items recovered above.
|
||||||
|
if (!request.ItemsToRemove.Contains(item.ItemId) || recoveredInsured.Contains(item.ItemId)) {
|
||||||
|
newInventory.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var item in request.ItemsToUpdateAmount) {
|
||||||
|
var inventoryItem = newInventory.Find(i => i.ItemId == item.ItemId);
|
||||||
|
if (inventoryItem == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
inventoryItem.Amount = item.Amount;
|
||||||
|
inventoryItem.ModData = item.ModData;
|
||||||
|
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
||||||
|
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
||||||
|
inventoryItem.Durability = item.Durability;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Check updated items and validate new items
|
||||||
|
foreach (var item in request.ItemsToAdd) {
|
||||||
|
newInventory.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>{
|
||||||
|
["LOADOUT"] = JsonSerializer.Serialize(request.NewSet),
|
||||||
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
|
});
|
||||||
|
|
||||||
|
return new CompleteInventoryUpdateResponse
|
||||||
|
{
|
||||||
|
UserId = userId,
|
||||||
|
//Error = "",
|
||||||
|
//NewSet = request.NewSet,
|
||||||
|
//ItemsToAdd = request.ItemsToAdd,
|
||||||
|
//ItemsToRemove = request.ItemsToRemove,
|
||||||
|
//ItemsToUpdateAmount = request.ItemsToUpdateAmount,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Prospect.Server.Api.Hubs;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
|
// Closed Beta Function
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
[CloudScriptFunction("EnterMatchmaking")]
|
||||||
|
public class EnterMatchmakingFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchAzureFunctionResult>
|
||||||
|
{
|
||||||
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
|
||||||
|
public EnterMatchmakingFunction(IHubContext<CycleHub> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYEnterMatchAzureFunctionResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
|
{
|
||||||
|
//await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
||||||
|
// Success = true,
|
||||||
|
// SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
||||||
|
// SquadID = request.SquadId,
|
||||||
|
//});
|
||||||
|
|
||||||
|
return new FYEnterMatchAzureFunctionResult
|
||||||
|
{
|
||||||
|
Success = true,
|
||||||
|
ErrorMessage = "",
|
||||||
|
SingleplayerStation = true,
|
||||||
|
Address = request.MapName,
|
||||||
|
MaintenanceMode = false,
|
||||||
|
Port = 7777,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
using Prospect.Server.Api.Hubs;
|
using Prospect.Server.Api.Hubs;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
@@ -17,15 +20,80 @@ public class OnSquadMatchmakingSuccessMessage {
|
|||||||
[CloudScriptFunction("EnterMatchmakingMatch")]
|
[CloudScriptFunction("EnterMatchmakingMatch")]
|
||||||
public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
||||||
{
|
{
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly IHubContext<CycleHub> _hubContext;
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
|
||||||
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext)
|
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_hubContext = hubContext;
|
_hubContext = hubContext;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
{
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
|
|
||||||
|
var userData = await _userDataService.FindAsync(
|
||||||
|
userId, userId,
|
||||||
|
new List<string>{"ContractsActive", "Inventory"}
|
||||||
|
);
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
// Compute delivery quest progress before deploy.
|
||||||
|
// This ensures that the quest progress will be shown on the planet.
|
||||||
|
// The station doesn't seem to care about delivery quests progress and calculates progress
|
||||||
|
// based on actual items in stash. And so does the "ClaimActiveContract" function.
|
||||||
|
foreach (var contractActive in contractsActive.Contracts) {
|
||||||
|
if (!contracts.TryGetValue(contractActive.ContractID, out var contract)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
|
var objective = contract.Objectives[i];
|
||||||
|
// Kill objectives: the client-hosted raid has no dedicated game server
|
||||||
|
// to report per-kill progress to the backend, so kills would never be
|
||||||
|
// saved. Auto-credit them on deploy so the objective can be completed
|
||||||
|
// (mirrors the player-kill auto-credit done in ActivateContract).
|
||||||
|
if (objective.Type == EYContractObjectiveType.Kills) {
|
||||||
|
contractActive.Progress[i] = objective.MaxProgress;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (objective.Type != EYContractObjectiveType.OwnNumOfItem) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
int remaining = objective.MaxProgress;
|
||||||
|
foreach (var item in inventory) {
|
||||||
|
if (item.BaseItemId != objective.ItemToOwn) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
remaining -= item.Amount;
|
||||||
|
if (remaining <= 0) {
|
||||||
|
remaining = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contractActive.Progress[i] = objective.MaxProgress - remaining;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string>{
|
||||||
|
["ContractsActive"] = JsonSerializer.Serialize(contractsActive),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
||||||
Success = true,
|
Success = true,
|
||||||
SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
||||||
|
|||||||
@@ -1,18 +1,107 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
|
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;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
// Config d'une police d'assurance (TitleData "InventoryInsurance").
|
||||||
|
public class InventoryInsurancePolicy
|
||||||
|
{
|
||||||
|
public string InsuranceId { get; set; }
|
||||||
|
public double Cost { get; set; }
|
||||||
|
public double Payout { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
[CloudScriptFunction("EnterMatchmakingStation")]
|
[CloudScriptFunction("EnterMatchmakingStation")]
|
||||||
public class EnterMatchmakingStationFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
public class EnterMatchmakingStationFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
||||||
{
|
{
|
||||||
public Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly ILogger<EnterMatchmakingStationFunction> _logger;
|
||||||
|
|
||||||
|
public EnterMatchmakingStationFunction(
|
||||||
|
IHttpContextAccessor httpContextAccessor,
|
||||||
|
UserDataService userDataService,
|
||||||
|
TitleDataService titleDataService,
|
||||||
|
ILogger<EnterMatchmakingStationFunction> logger)
|
||||||
{
|
{
|
||||||
return Task.FromResult(new FYEnterMatchmakingResult
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
|
{
|
||||||
|
// Au déploiement, le client peut demander d'assurer une partie de l'inventaire.
|
||||||
|
var insurance = request.PurchaseInventoryInsurances;
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context != null && insurance?.ItemIds is { Count: > 0 })
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await ApplyInsuranceAsync(context.User.FindAuthUserId(), insurance);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
// Ne jamais bloquer le déploiement à cause de l'assurance.
|
||||||
|
_logger.LogWarning(e, "Failed to apply inventory insurance on deploy");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new FYEnterMatchmakingResult
|
||||||
{
|
{
|
||||||
Success = true,
|
Success = true,
|
||||||
ErrorMessage = "",
|
ErrorMessage = "",
|
||||||
SingleplayerStation = true, // NOTE: This will always travel to single player station
|
SingleplayerStation = true, // NOTE: This will always travel to single player station
|
||||||
IsMatchTravel = false,
|
IsMatchTravel = false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Marque les items choisis comme assurés (Insurance + propriétaire) et débite la
|
||||||
|
// prime en InsuranceCurrency selon le coût de la police (TitleData InventoryInsurance).
|
||||||
|
private async Task ApplyInsuranceAsync(string userId, FYPurchaseInventoryInsuranceRequest req)
|
||||||
|
{
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "InventoryInsurance" });
|
||||||
|
var policies = JsonSerializer.Deserialize<Dictionary<string, InventoryInsurancePolicy>>(titleData["InventoryInsurance"]);
|
||||||
|
var insuranceId = string.IsNullOrEmpty(req.InsuranceId) ? "Default" : req.InsuranceId;
|
||||||
|
if (policies == null || !policies.TryGetValue(insuranceId, out var policy))
|
||||||
|
{
|
||||||
|
_logger.LogWarning("Unknown insurance policy {InsuranceId}", insuranceId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string> { "Inventory", "Balance" });
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
|
|
||||||
|
var toInsure = new HashSet<string>(req.ItemIds);
|
||||||
|
var insuredCount = 0;
|
||||||
|
foreach (var item in inventory)
|
||||||
|
{
|
||||||
|
if (!toInsure.Contains(item.ItemId)) continue;
|
||||||
|
item.Insurance = insuranceId;
|
||||||
|
item.InsuranceOwnerPlayfabId = userId;
|
||||||
|
insuredCount++;
|
||||||
|
}
|
||||||
|
if (insuredCount == 0) return;
|
||||||
|
|
||||||
|
// Prime = coût de la police × nombre d'items assurés (arrondi au supérieur),
|
||||||
|
// plafonnée au solde disponible pour ne jamais passer en négatif.
|
||||||
|
var premium = (int)Math.Ceiling(policy.Cost * insuredCount);
|
||||||
|
premium = Math.Min(premium, balance.InsuranceCurrency);
|
||||||
|
balance.InsuranceCurrency -= premium;
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["Inventory"] = JsonSerializer.Serialize(inventory),
|
||||||
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
});
|
});
|
||||||
|
_logger.LogInformation("Insured {Count} item(s) under policy {Policy} for user {User} (premium {Premium})",
|
||||||
|
insuredCount, insuranceId, userId, premium);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,71 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("GetFriendList")]
|
[CloudScriptFunction("GetFriendList")]
|
||||||
public class GetFriendList : ICloudScriptFunction<FYBaseSocialRequest, object?>
|
public class GetFriendList : ICloudScriptFunction<FYBaseSocialRequest, object?>
|
||||||
{
|
{
|
||||||
public Task<object?> ExecuteAsync(FYBaseSocialRequest request)
|
private readonly ILogger<GetFriendList> _logger;
|
||||||
{
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
return Task.FromResult<object?>(new
|
private readonly UserDataService _userDataService;
|
||||||
{
|
private readonly DbUserService _userService;
|
||||||
|
|
||||||
|
public GetFriendList(ILogger<GetFriendList> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, DbUserService userService)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_userService = userService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<object?> ExecuteAsync(FYBaseSocialRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
|
// Resolve the imported Steam friends (persisted by ClientsideFriendsImport) to the
|
||||||
|
// players that actually exist on this server. It's a private server, so only friends
|
||||||
|
// who have logged in here will show up.
|
||||||
|
var steamIds = new List<string>();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string> { "ImportedSteamFriends" });
|
||||||
|
if (userData.TryGetValue("ImportedSteamFriends", out var rec) && !string.IsNullOrWhiteSpace(rec.Value))
|
||||||
|
{
|
||||||
|
try { steamIds = JsonSerializer.Deserialize<List<string>>(rec.Value) ?? new List<string>(); }
|
||||||
|
catch { /* ignore malformed */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
var friends = new List<object>();
|
||||||
|
if (steamIds.Count > 0)
|
||||||
|
{
|
||||||
|
var players = await _userService.FindManyAsync(PlayFabUserAuthType.Steam, steamIds);
|
||||||
|
foreach (var player in players)
|
||||||
|
{
|
||||||
|
if (player.Id == userId) continue; // never list yourself
|
||||||
|
friends.Add(new
|
||||||
|
{
|
||||||
|
profile = new
|
||||||
|
{
|
||||||
|
playerId = player.Id,
|
||||||
|
displayName = player.DisplayName,
|
||||||
|
avatarUrl = "",
|
||||||
|
},
|
||||||
|
onlineState = 0, // EYUserState — real presence tracking is a later phase
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE: the exact response shape the client expects is not yet confirmed; this is a
|
||||||
|
// best-effort structure. The log lets us verify resolution while we validate in game.
|
||||||
|
_logger.LogInformation("GetFriendList for {User}: {Count} friend(s) resolved on server", userId, friends.Count);
|
||||||
|
return new { friends };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,16 +1,26 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Microsoft.Extensions.Options;
|
||||||
|
using Prospect.Server.Api.Config;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("GetSignalRConnection")]
|
[CloudScriptFunction("GetSignalRConnection")]
|
||||||
public class GetSignalRConnection : ICloudScriptFunction<FYGetSignalRConnection, FYGetSignalRConnectionResult>
|
public class GetSignalRConnection : ICloudScriptFunction<FYGetSignalRConnection, FYGetSignalRConnectionResult>
|
||||||
{
|
{
|
||||||
|
private readonly PlayFabSettings _settings;
|
||||||
|
|
||||||
|
public GetSignalRConnection(IOptions<PlayFabSettings> settings)
|
||||||
|
{
|
||||||
|
_settings = settings.Value;
|
||||||
|
}
|
||||||
|
|
||||||
public Task<FYGetSignalRConnectionResult> ExecuteAsync(FYGetSignalRConnection request)
|
public Task<FYGetSignalRConnectionResult> ExecuteAsync(FYGetSignalRConnection request)
|
||||||
{
|
{
|
||||||
|
// The game client connects to SignalR only over HTTPS
|
||||||
return Task.FromResult(new FYGetSignalRConnectionResult
|
return Task.FromResult(new FYGetSignalRConnectionResult
|
||||||
{
|
{
|
||||||
Url = "https://2ea46.playfabapi.com/signalr/?hub=pubsub",
|
Url = _settings.SignalRURL,
|
||||||
AccessToken = "TEST"
|
AccessToken = _settings.SignalRAccessToken
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ using System.Text.Json.Serialization;
|
|||||||
using Prospect.Server.Api.Models.Data;
|
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.CloudScript.Functions;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
public class PurchaseWeaponShopItemRequest
|
public class PurchaseWeaponShopItemRequest
|
||||||
@@ -137,7 +138,7 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
|||||||
Error = "Invalid purchase amount",
|
Error = "Invalid purchase amount",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance", "ContractsOneTimeCompleted"});
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(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"});
|
||||||
@@ -153,7 +154,21 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
|||||||
|
|
||||||
var blueprintData = blueprints[request.BaseItemID];
|
var blueprintData = blueprints[request.BaseItemID];
|
||||||
|
|
||||||
// TODO: Contract unlock criteria
|
// Contract unlock criteria: some items can only be purchased after completing a
|
||||||
|
// specific contract. Only gate when the item explicitly declares such a lock, so
|
||||||
|
// items with no lock keep working as before.
|
||||||
|
if (!string.IsNullOrEmpty(blueprintData.UnlockData?.ContractLockPurchase))
|
||||||
|
{
|
||||||
|
var completed = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
|
if (completed?.ContractsIDs == null || !completed.ContractsIDs.Contains(blueprintData.UnlockData.ContractLockPurchase))
|
||||||
|
{
|
||||||
|
return new PurchaseWeaponShopItemResponse
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
Error = "Item is locked: complete the required contract first",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Validate price
|
// Validate price
|
||||||
var shopCraftingData = blueprintData.ItemShopsCraftingData[request.ShopItemBelongsTo];
|
var shopCraftingData = blueprintData.ItemShopsCraftingData[request.ShopItemBelongsTo];
|
||||||
|
|||||||
+71
-70
@@ -1,4 +1,7 @@
|
|||||||
using System.Text.Json;
|
using System.Collections;
|
||||||
|
using System.Diagnostics.Contracts;
|
||||||
|
using System.Text.Json;
|
||||||
|
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;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
@@ -11,11 +14,16 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly string[] factions = ["Korolev", "Osiris", "ICA"]; // TODO: Order is important
|
||||||
|
private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
|
||||||
|
private readonly Random rnd = new Random();
|
||||||
|
|
||||||
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_userDataService = userDataService;
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
||||||
@@ -26,10 +34,65 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
return new FYGetPlayerContractsResult{};
|
return new FYGetPlayerContractsResult{};
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
|
||||||
|
|
||||||
// TODO: Get player's contract boards and refresh
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{ "ContractsActive", "JobBoardsData", "FactionProgressionKorolev", "FactionProgressionICA", "FactionProgressionOsiris" });
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value);
|
||||||
|
|
||||||
|
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
var lastBoardRefreshTimeUtc = jobBoardsData.LastBoardRefreshTimeUtc;
|
||||||
|
var boards = jobBoardsData.Boards;
|
||||||
|
// The boards are updated once in 3 hours
|
||||||
|
if (now >= lastBoardRefreshTimeUtc.Seconds + 60 * 60 * 3) {
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "Contracts", "Jobs", "LevelData" });
|
||||||
|
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"]);
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||||
|
var currentQuests = new Dictionary<string, Dictionary<string, bool>> {
|
||||||
|
["Korolev"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||||
|
["Osiris"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||||
|
["ICA"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var contract in contractsActive.Contracts) {
|
||||||
|
var parts = contract.ContractID.Split('-');
|
||||||
|
if (parts[0] != "NEW") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var difficulty = parts[1];
|
||||||
|
var faction = parts[2] == "KOR" ? "Korolev" : parts[2];
|
||||||
|
currentQuests[faction][difficulty] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < factions.Length; i++) {
|
||||||
|
var faction = factions[i];
|
||||||
|
var factionProgression = JsonSerializer.Deserialize<int>(userData[$"FactionProgression{faction}"].Value);
|
||||||
|
var levels = levelsData[faction];
|
||||||
|
var level = levels.Length - Array.FindIndex(levels, (int xp) => {
|
||||||
|
return factionProgression >= xp;
|
||||||
|
});
|
||||||
|
|
||||||
|
for (var j = 0; j < difficulties.Length; j++) {
|
||||||
|
var difficulty = difficulties[j];
|
||||||
|
if (currentQuests[faction][difficulty]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var factionJobs = jobs[faction];
|
||||||
|
var jobsAvailable = Array.FindAll(factionJobs[difficulty], (string jobId) => {
|
||||||
|
return level >= contracts[jobId].UnlockData.Level;
|
||||||
|
});
|
||||||
|
string jobId = jobsAvailable.Length > 0 ? jobsAvailable[rnd.Next(jobsAvailable.Length)] : factionJobs[difficulty][0];
|
||||||
|
boards[i].Contracts[j] = new FYFactionContractData { ContractId = jobId };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastBoardRefreshTimeUtc.Seconds = now;
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string> { ["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData) }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return new FYGetPlayerContractsResult
|
return new FYGetPlayerContractsResult
|
||||||
{
|
{
|
||||||
@@ -38,72 +101,10 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
ActiveContracts = contractsActive.Contracts,
|
ActiveContracts = contractsActive.Contracts,
|
||||||
FactionsContracts = new FYFactionsContractsData
|
FactionsContracts = new FYFactionsContractsData
|
||||||
{
|
{
|
||||||
Boards = new List<FYFactionContractsData>
|
Boards = boards,
|
||||||
{
|
LastBoardRefreshTimeUtc = lastBoardRefreshTimeUtc
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "ICA",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-ICA-Gather-1",
|
|
||||||
},
|
},
|
||||||
new FYFactionContractData
|
RefreshHours24UtcFromBackend = 12 // Doesn't seem to work
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-ICA-Uplink-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-ICA-Uplink-1",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Korolev",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-KOR-Mine-4",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-KOR-Mine-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-KOR-PvP-6",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Osiris",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-Osiris-Brightcaps-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-Osiris-Gather-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-Osiris-Gather-7",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
LastBoardRefreshTimeUtc = new FYTimestamp
|
|
||||||
{
|
|
||||||
Seconds = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
RefreshHours24UtcFromBackend = 12
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+103
-14
@@ -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;
|
||||||
@@ -9,6 +10,15 @@ public class FYFortunaPassClaimedRewards {
|
|||||||
public List<string> RewardsIDs { get; set; }
|
public List<string> RewardsIDs { get; set; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Récompense d'un palier de la passe (catalogue optionnel TitleData "FortunaPass2_Rewards").
|
||||||
|
// itemId "SoftCurrency"/"Aurum"/"InsuranceCurrency" = monnaie, sinon item d'inventaire.
|
||||||
|
public class FortunaPassRewardDef {
|
||||||
|
[JsonPropertyName("itemId")]
|
||||||
|
public string ItemId { get; set; }
|
||||||
|
[JsonPropertyName("amount")]
|
||||||
|
public int Amount { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class RequestClaimFortunaPassRewardsRequest
|
public class RequestClaimFortunaPassRewardsRequest
|
||||||
{
|
{
|
||||||
[JsonPropertyName("rewardsIds")]
|
[JsonPropertyName("rewardsIds")]
|
||||||
@@ -34,11 +44,15 @@ public class RequestClaimFortunaPassRewardsFunction : ICloudScriptFunction<Reque
|
|||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly ILogger<RequestClaimFortunaPassRewardsFunction> _logger;
|
||||||
|
|
||||||
public RequestClaimFortunaPassRewardsFunction(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
public RequestClaimFortunaPassRewardsFunction(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService, ILogger<RequestClaimFortunaPassRewardsFunction> logger)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_userDataService = userDataService;
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<RequestClaimFortunaPassRewardsResponse> ExecuteAsync(RequestClaimFortunaPassRewardsRequest request)
|
public async Task<RequestClaimFortunaPassRewardsResponse> ExecuteAsync(RequestClaimFortunaPassRewardsRequest request)
|
||||||
@@ -49,28 +63,103 @@ public class RequestClaimFortunaPassRewardsFunction : ICloudScriptFunction<Reque
|
|||||||
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 userData = await _userDataService.FindAsync(userId, userId, new List<string>{"FortunaPass2_ClaimedRewards"});
|
|
||||||
var claimedRewards = JsonSerializer.Deserialize<FYFortunaPassClaimedRewards>(userData["FortunaPass2_ClaimedRewards"].Value);
|
// Clé de la saison courante (déterminée par la config de build) — évite d'écraser
|
||||||
foreach (var rewardId in request.RewardsIDs) {
|
// la progression de l'autre saison (l'ancien code écrasait S2 ET S3).
|
||||||
claimedRewards.RewardsIDs.Add(rewardId);
|
#if SEASON_3_RELEASE || SEASON_3_DEBUG
|
||||||
|
const string claimedKey = "FortunaPass3_ClaimedRewards";
|
||||||
|
const string rewardsCatalogKey = "FortunaPass3_Rewards";
|
||||||
|
#else
|
||||||
|
const string claimedKey = "FortunaPass2_ClaimedRewards";
|
||||||
|
const string rewardsCatalogKey = "FortunaPass2_Rewards";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{ claimedKey, "Inventory", "Balance" });
|
||||||
|
var claimedRewards = JsonSerializer.Deserialize<FYFortunaPassClaimedRewards>(userData[claimedKey].Value)
|
||||||
|
?? new FYFortunaPassClaimedRewards { RewardsIDs = new List<string>() };
|
||||||
|
claimedRewards.RewardsIDs ??= new List<string>();
|
||||||
|
|
||||||
|
// Catalogue des récompenses (optionnel) : rewardId -> {itemId, amount}.
|
||||||
|
Dictionary<string, FortunaPassRewardDef> catalog = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var td = _titleDataService.Find(new List<string> { rewardsCatalogKey });
|
||||||
|
if (td.TryGetValue(rewardsCatalogKey, out var raw) && !string.IsNullOrWhiteSpace(raw))
|
||||||
|
catalog = JsonSerializer.Deserialize<Dictionary<string, FortunaPassRewardDef>>(raw);
|
||||||
|
}
|
||||||
|
catch { /* pas de catalogue → on enregistre seulement la réclamation */ }
|
||||||
|
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value) ?? new List<FYCustomItemInfo>();
|
||||||
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
|
var grantedItems = new List<FYCustomItemInfo>();
|
||||||
|
var changedCurrencies = new List<FYCurrencyItem>();
|
||||||
|
|
||||||
|
foreach (var rewardId in request.RewardsIDs)
|
||||||
|
{
|
||||||
|
// Ne pas re-créditer un palier déjà réclamé.
|
||||||
|
if (claimedRewards.RewardsIDs.Contains(rewardId)) continue;
|
||||||
|
|
||||||
|
if (catalog == null || !catalog.TryGetValue(rewardId, out var def) || def == null)
|
||||||
|
{
|
||||||
|
// Le catalogue des paliers est défini côté client (DataTable). On journalise
|
||||||
|
// les IDs inconnus pour pouvoir construire un vrai catalogue FortunaPass{2,3}_Rewards
|
||||||
|
// qui matche. IMPORTANT : ne PAS marquer le palier comme réclamé si on ne peut rien
|
||||||
|
// accorder — sinon il serait brûlé définitivement et inclaimable une fois le
|
||||||
|
// catalogue ajouté.
|
||||||
|
_logger.LogInformation("FortunaPass claim: aucun catalogue pour le reward '{RewardId}' (catalogue {State}) — non accordé", rewardId, catalog == null ? "absent" : "présent");
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var output = JsonSerializer.Serialize(claimedRewards);
|
claimedRewards.RewardsIDs.Add(rewardId);
|
||||||
await _userDataService.UpdateAsync(
|
_logger.LogInformation("FortunaPass claim: octroi reward '{RewardId}' -> {ItemId} x{Amount}", rewardId, def.ItemId, def.Amount);
|
||||||
userId, userId,
|
|
||||||
new Dictionary<string, string>{
|
switch (def.ItemId)
|
||||||
["FortunaPass2_ClaimedRewards"] = output,
|
{
|
||||||
["FortunaPass3_ClaimedRewards"] = output, // TODO: Separate logic for S2 and S3
|
case "SoftCurrency":
|
||||||
|
balance.SoftCurrency += def.Amount;
|
||||||
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
|
break;
|
||||||
|
case "Aurum":
|
||||||
|
balance.HardCurrency += def.Amount;
|
||||||
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
|
break;
|
||||||
|
case "InsuranceCurrency":
|
||||||
|
balance.InsuranceCurrency += def.Amount;
|
||||||
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
var item = new FYCustomItemInfo {
|
||||||
|
ItemId = Guid.NewGuid().ToString(),
|
||||||
|
Amount = def.Amount <= 0 ? 1 : def.Amount,
|
||||||
|
BaseItemId = def.ItemId,
|
||||||
|
Durability = 0,
|
||||||
|
Insurance = "",
|
||||||
|
InsuranceOwnerPlayfabId = "",
|
||||||
|
ModData = new FYModItems { M = [] },
|
||||||
|
Origin = new FYItemOriginBackend { G = "", P = "", T = "" },
|
||||||
|
InsuredAttachmentId = "",
|
||||||
|
PrimaryVanityId = 0,
|
||||||
|
SecondaryVanityId = 0,
|
||||||
|
RolledPerks = [],
|
||||||
|
};
|
||||||
|
inventory.Add(item);
|
||||||
|
grantedItems.Add(item);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
);
|
}
|
||||||
|
|
||||||
|
var changes = new Dictionary<string, string> { [claimedKey] = JsonSerializer.Serialize(claimedRewards) };
|
||||||
|
if (grantedItems.Count > 0) changes["Inventory"] = JsonSerializer.Serialize(inventory);
|
||||||
|
if (changedCurrencies.Count > 0) changes["Balance"] = JsonSerializer.Serialize(balance);
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, changes);
|
||||||
|
|
||||||
return new RequestClaimFortunaPassRewardsResponse
|
return new RequestClaimFortunaPassRewardsResponse
|
||||||
{
|
{
|
||||||
UserId = userId,
|
UserId = userId,
|
||||||
ErrorType = 3, // EYFortunaPassToastReponseType::Ok
|
ErrorType = 3, // EYFortunaPassToastReponseType::Ok
|
||||||
Error = "",
|
Error = "",
|
||||||
GrantedItems = [],
|
GrantedItems = grantedItems.ToArray(),
|
||||||
ChangedCurrencies = [],
|
ChangedCurrencies = changedCurrencies.ToArray(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-22
@@ -1,5 +1,7 @@
|
|||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
@@ -7,42 +9,43 @@ namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
|||||||
public class RequestFactionProgression : ICloudScriptFunction<FYQueryFactionProgressionRequest, object?>
|
public class RequestFactionProgression : ICloudScriptFunction<FYQueryFactionProgressionRequest, object?>
|
||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
public RequestFactionProgression(IHttpContextAccessor httpContextAccessor)
|
public RequestFactionProgression(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<object?> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
public async Task<object?> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
{
|
{
|
||||||
return Task.FromResult<object?>(null);
|
return null;
|
||||||
}
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
return Task.FromResult<object?>(new
|
var userData = await _userDataService.FindAsync(
|
||||||
|
userId, userId,
|
||||||
|
new List<string> { "FactionProgressionICA", "FactionProgressionKorolev", "FactionProgressionOsiris" }
|
||||||
|
);
|
||||||
|
|
||||||
|
int Progression(string faction) =>
|
||||||
|
userData.TryGetValue("FactionProgression" + faction, out var v) && v.Value != null
|
||||||
|
? JsonSerializer.Deserialize<int>(v.Value)
|
||||||
|
: 0;
|
||||||
|
|
||||||
|
return new
|
||||||
{
|
{
|
||||||
factions = new[]
|
factions = new[]
|
||||||
{
|
{
|
||||||
new
|
new { factionId = "ICA", currentProgression = Progression("ICA") },
|
||||||
{
|
new { factionId = "Korolev", currentProgression = Progression("Korolev") },
|
||||||
factionId = "ICA",
|
new { factionId = "Osiris", currentProgression = Progression("Osiris") },
|
||||||
currentProgression = 0
|
|
||||||
},
|
},
|
||||||
new
|
userId,
|
||||||
{
|
|
||||||
factionId = "Korolev",
|
|
||||||
currentProgression = 0
|
|
||||||
},
|
|
||||||
new
|
|
||||||
{
|
|
||||||
factionId = "Osiris",
|
|
||||||
currentProgression = 0
|
|
||||||
},
|
|
||||||
},
|
|
||||||
userId = context.User.FindAuthUserId(),
|
|
||||||
error = ""
|
error = ""
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,9 +74,9 @@ public class RequestMissionCompleted : ICloudScriptFunction<FYRequestMissionComp
|
|||||||
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
||||||
balance.HardCurrency += reward.RewardAmount;
|
balance.HardCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.RewardRowHandle.RowName == "InsuranceToken") {
|
} else if (reward.RewardRowHandle.RowName == "InsuranceCurrency") {
|
||||||
balance.InsuranceTokens += reward.RewardAmount;
|
balance.InsuranceCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
} else {
|
} else {
|
||||||
// TODO: Inventory limit check
|
// TODO: Inventory limit check
|
||||||
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
||||||
|
|||||||
@@ -1,100 +1,119 @@
|
|||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("RequestPlayerContracts")]
|
[CloudScriptFunction("RequestPlayerContracts")]
|
||||||
public class RequestPlayerContracts : ICloudScriptFunction<FYGetPlayerContractsRequest, FYGetPlayerContractsResult>
|
public class RequestPlayerContracts : ICloudScriptFunction<FYGetPlayerContractsRequest, FYGetPlayerContractsResult>
|
||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
// Board slots are ordered Easy / Medium / Hard (same convention as ClaimActiveContract).
|
||||||
|
private static readonly string[] Difficulties = ["Easy", "Medium", "Hard"];
|
||||||
|
private const int RefreshHours = 12;
|
||||||
|
|
||||||
public RequestPlayerContracts(IHttpContextAccessor httpContextAccessor)
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly Random _rnd = new();
|
||||||
|
|
||||||
|
public RequestPlayerContracts(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<FYGetPlayerContractsResult> ExecuteAsync(FYGetPlayerContractsRequest request)
|
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYGetPlayerContractsRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
{
|
{
|
||||||
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();
|
||||||
|
|
||||||
return Task.FromResult(new FYGetPlayerContractsResult
|
var userData = await _userDataService.FindAsync(
|
||||||
|
userId, userId,
|
||||||
|
new List<string>
|
||||||
{
|
{
|
||||||
UserId = context.User.FindAuthUserId(),
|
"ContractsActive", "JobBoardsData",
|
||||||
|
"FactionProgressionKorolev", "FactionProgressionICA", "FactionProgressionOsiris",
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value)!;
|
||||||
|
var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value)!;
|
||||||
|
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "Contracts", "Jobs", "LevelData" });
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"])!;
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"])!;
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"])!;
|
||||||
|
|
||||||
|
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
var lastRefresh = jobBoardsData.LastBoardRefreshTimeUtc?.Seconds ?? 0;
|
||||||
|
|
||||||
|
// Initial fill only: populate boards that were seeded empty / never refreshed.
|
||||||
|
// The periodic rotation is owned by RequestActiveObjectivesAndBoardsData, so we
|
||||||
|
// don't refresh on a timer here to avoid two competing refresh policies.
|
||||||
|
var boardsEmpty = jobBoardsData.Boards == null
|
||||||
|
|| jobBoardsData.Boards.Any(b => b.Contracts == null
|
||||||
|
|| b.Contracts.Any(c => string.IsNullOrEmpty(c.ContractId)));
|
||||||
|
|
||||||
|
if (jobBoardsData.Boards != null && (lastRefresh == 0 || boardsEmpty))
|
||||||
|
{
|
||||||
|
foreach (var board in jobBoardsData.Boards)
|
||||||
|
{
|
||||||
|
if (board.Contracts == null || !jobs.TryGetValue(board.FactionId, out var factionJobs))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var factionKey = "FactionProgression" + board.FactionId;
|
||||||
|
var factionProgression = userData.TryGetValue(factionKey, out var fp)
|
||||||
|
? JsonSerializer.Deserialize<int>(fp.Value)
|
||||||
|
: 0;
|
||||||
|
|
||||||
|
var level = levelsData.TryGetValue(board.FactionId, out var levels)
|
||||||
|
? levels.Length - Array.FindIndex(levels, xp => factionProgression >= xp)
|
||||||
|
: 0;
|
||||||
|
|
||||||
|
for (var idx = 0; idx < board.Contracts.Count && idx < Difficulties.Length; idx++)
|
||||||
|
{
|
||||||
|
if (!factionJobs.TryGetValue(Difficulties[idx], out var difficultyJobs))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var available = Array.FindAll(difficultyJobs,
|
||||||
|
jobId => contracts.TryGetValue(jobId, out var c) && level >= c.UnlockData.Level);
|
||||||
|
if (available.Length > 0)
|
||||||
|
{
|
||||||
|
board.Contracts[idx].ContractId = available[_rnd.Next(available.Length)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jobBoardsData.LastBoardRefreshTimeUtc = new FYTimestamp { Seconds = now };
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string> { ["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData) }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new FYGetPlayerContractsResult
|
||||||
|
{
|
||||||
|
UserId = userId,
|
||||||
Error = null,
|
Error = null,
|
||||||
ActiveContracts = new List<FYActiveContractPlayerData>(),
|
ActiveContracts = contractsActive.Contracts,
|
||||||
FactionsContracts = new FYFactionsContractsData
|
FactionsContracts = new FYFactionsContractsData
|
||||||
{
|
{
|
||||||
Boards = new List<FYFactionContractsData>
|
Boards = jobBoardsData.Boards,
|
||||||
{
|
LastBoardRefreshTimeUtc = jobBoardsData.LastBoardRefreshTimeUtc ?? new FYTimestamp { Seconds = now },
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "ICA",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-ICA-Gather-1",
|
|
||||||
},
|
},
|
||||||
new FYFactionContractData
|
RefreshHours24UtcFromBackend = RefreshHours,
|
||||||
{
|
};
|
||||||
ContractId = "NEW-Medium-ICA-Uplink-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-ICA-Uplink-1",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Korolev",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-KOR-Mine-4",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-KOR-Mine-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-KOR-PvP-6",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Osiris",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-Osiris-Brightcaps-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-Osiris-Gather-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-Osiris-Gather-7",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
LastBoardRefreshTimeUtc = new FYTimestamp
|
|
||||||
{
|
|
||||||
Seconds = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
RefreshHours24UtcFromBackend = 12
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -35,6 +35,11 @@ public class RequestStoreRotationDataFunction : ICloudScriptFunction<RequestStor
|
|||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Nombre de variantes de rotation (les storeId "DailyShop_N" / "WeeklyShop_N"
|
||||||
|
// permettent au client de distinguer chaque rotation et de rafraîchir son cache).
|
||||||
|
private const int DailyVariants = 8;
|
||||||
|
private const int WeeklyVariants = 4;
|
||||||
|
|
||||||
public async Task<RequestStoreRotationDataResponse> ExecuteAsync(RequestStoreRotationDataRequest request)
|
public async Task<RequestStoreRotationDataResponse> ExecuteAsync(RequestStoreRotationDataRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
@@ -43,18 +48,33 @@ public class RequestStoreRotationDataFunction : ICloudScriptFunction<RequestStor
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Get and save store rotation data
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
|
// Rotation quotidienne : expire au prochain minuit UTC ; l'index de rotation
|
||||||
|
// est le nombre de jours écoulés depuis l'epoch (déterministe, stable).
|
||||||
|
var todayUtc = now.Date;
|
||||||
|
var dailyExpiration = todayUtc.AddDays(1);
|
||||||
|
var dayIndex = (int)(todayUtc - DateTime.UnixEpoch.Date).TotalDays;
|
||||||
|
var dailyStoreId = $"DailyShop_{dayIndex % DailyVariants}";
|
||||||
|
|
||||||
|
// Rotation hebdomadaire : expire au prochain lundi 00:00 UTC.
|
||||||
|
// DayOfWeek : dimanche=0 ; on ramène lundi=0.
|
||||||
|
var daysSinceMonday = ((int)todayUtc.DayOfWeek + 6) % 7;
|
||||||
|
var weekStart = todayUtc.AddDays(-daysSinceMonday);
|
||||||
|
var weeklyExpiration = weekStart.AddDays(7);
|
||||||
|
var weekIndex = (int)Math.Floor((weekStart - DateTime.UnixEpoch.Date).TotalDays / 7);
|
||||||
|
var weeklyStoreId = $"WeeklyShop_{weekIndex % WeeklyVariants}";
|
||||||
|
|
||||||
return new RequestStoreRotationDataResponse
|
return new RequestStoreRotationDataResponse
|
||||||
{
|
{
|
||||||
Error = "",
|
Error = "",
|
||||||
DailyStoreData = new StoreRotationData {
|
DailyStoreData = new StoreRotationData {
|
||||||
StoreID = "DailyShop",
|
StoreID = dailyStoreId,
|
||||||
ExpirationData = DateTime.UtcNow.AddDays(1)
|
ExpirationData = dailyExpiration
|
||||||
},
|
},
|
||||||
WeeklyStoreData = new StoreRotationData {
|
WeeklyStoreData = new StoreRotationData {
|
||||||
StoreID = "WeeklyShop",
|
StoreID = weeklyStoreId,
|
||||||
ExpirationData = DateTime.UtcNow.AddDays(1)
|
ExpirationData = weeklyExpiration
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -82,6 +82,7 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
// 2. Stack existing items - deletes existing items 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.
|
// 3. Change vanity data - updates an existing item.
|
||||||
// 4. Change weapon mods - updates an existing item.
|
// 4. Change weapon mods - updates an existing item.
|
||||||
|
// IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
|
||||||
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)) {
|
||||||
@@ -98,6 +99,7 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
inventoryItem.ModData = item.ModData;
|
inventoryItem.ModData = item.ModData;
|
||||||
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
||||||
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
||||||
|
inventoryItem.Durability = item.Durability;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Check updated items and validate new items
|
// TODO: Check updated items and validate new items
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ public class RegionObject
|
|||||||
[JsonPropertyName("region")]
|
[JsonPropertyName("region")]
|
||||||
public string Region { get; set; }
|
public string Region { get; set; }
|
||||||
[JsonPropertyName("ping")]
|
[JsonPropertyName("ping")]
|
||||||
public int Ping { get; set; }
|
public long Ping { get; set; } // client sends 2147483648 (int.MaxValue+1) for "no ping" -> must be long or deserialization 500s
|
||||||
[JsonPropertyName("instanceType")]
|
[JsonPropertyName("instanceType")]
|
||||||
public int InstanceType { get; set; }
|
public int InstanceType { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,11 +117,11 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
||||||
// TODO: Probably better to decide based on item kind instead
|
// NOTE: Ammo and consumables have reverse price mapping.
|
||||||
if (inventoryItem.Durability == -1) {
|
if (blueprintData.Kind == "Ammo" || blueprintData.Kind == "Ability") {
|
||||||
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
} else {
|
} else if (blueprintData.Kind == "Armor") {
|
||||||
factionProgression += (int)Math.Max(
|
factionProgression += (int)Math.Max(
|
||||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
||||||
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
@@ -130,6 +130,9 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
||||||
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
factionProgression += blueprintData.OverrideScrappingReputation * inventoryItem.Amount;
|
||||||
|
balance.SoftCurrency += blueprintData.OverrideScrappingReturns * inventoryItem.Amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
scrappedItemIds.Add(itemId);
|
scrappedItemIds.Add(itemId);
|
||||||
|
|||||||
+1
-1
@@ -135,7 +135,7 @@ public class StartPlayerQuarterUpgradeClient : ICloudScriptFunction<FYStartPlaye
|
|||||||
userId, userId,
|
userId, userId,
|
||||||
new Dictionary<string, string>{
|
new Dictionary<string, string>{
|
||||||
["Balance"] = JsonSerializer.Serialize(balance),
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
["Inventory"] = JsonSerializer.Serialize(inventory),
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
["PlayerQuartersLevel"] = JsonSerializer.Serialize(userPlayerQuarters),
|
["PlayerQuartersLevel"] = JsonSerializer.Serialize(userPlayerQuarters),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
+10
-2
@@ -54,7 +54,7 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
|||||||
|
|
||||||
var userData = await _userDataService.FindAsync(
|
var userData = await _userDataService.FindAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
new List<string>{"TechTreeNodeData", "Balance", "Inventory"}
|
new List<string>{"TechTreeNodeData", "Balance", "Inventory", "PlayerQuartersLevel"}
|
||||||
);
|
);
|
||||||
|
|
||||||
var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
|
var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
|
||||||
@@ -79,7 +79,15 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
|||||||
var techTreeNodeData = techTreeNodes[request.NodeID];
|
var techTreeNodeData = techTreeNodes[request.NodeID];
|
||||||
var nextTreeNodeLevel = techTreeNodeData.PerkLevels[currentLevel]; // Tech tree node levels start from 0
|
var nextTreeNodeLevel = techTreeNodeData.PerkLevels[currentLevel]; // Tech tree node levels start from 0
|
||||||
|
|
||||||
// TODO: Dependency check
|
// Dependency check: the player's quarters must be high enough to unlock this node.
|
||||||
|
var playerQuarters = JsonSerializer.Deserialize<FYPlayerQuarterStatus>(userData["PlayerQuartersLevel"].Value);
|
||||||
|
if (playerQuarters != null && playerQuarters.Level < techTreeNodeData.PlayerQuarterLevelRequired) {
|
||||||
|
return new FYStartTechTreeNodeUpgradeClientResult
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
Error = $"Requires player quarters level {techTreeNodeData.PlayerQuarterLevelRequired}",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// Validate price
|
// Validate price
|
||||||
// TODO: Refactor
|
// TODO: Refactor
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
// Custom request for dedicated server implementation
|
||||||
|
|
||||||
|
public class FYUpdatePlayerActiveContractsRequest {
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserID { get; set; }
|
||||||
|
[JsonPropertyName("contracts")]
|
||||||
|
public List<FYActiveContractPlayerData> Contracts { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class FYUpdatePlayerActiveContractsResult {
|
||||||
|
}
|
||||||
|
|
||||||
|
[CloudScriptFunction("UpdatePlayerActiveContracts")]
|
||||||
|
public class UpdatePlayerActiveContracts : ICloudScriptFunction<FYUpdatePlayerActiveContractsRequest, FYUpdatePlayerActiveContractsResult>
|
||||||
|
{
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
|
||||||
|
public UpdatePlayerActiveContracts(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
|
{
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYUpdatePlayerActiveContractsResult> ExecuteAsync(FYUpdatePlayerActiveContractsRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
|
||||||
|
foreach (var contract in request.Contracts) {
|
||||||
|
var foundContract = contractsActive.Contracts.Find(item => item.ContractID == contract.ContractID);
|
||||||
|
if (foundContract == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
foundContract.Progress = contract.Progress;
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string>{ ["ContractsActive"] = JsonSerializer.Serialize(contractsActive) }
|
||||||
|
);
|
||||||
|
|
||||||
|
return new FYUpdatePlayerActiveContractsResult
|
||||||
|
{};
|
||||||
|
}
|
||||||
|
}
|
||||||
+10
-3
@@ -1,7 +1,14 @@
|
|||||||
namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
|
||||||
|
// Envoyé par le client au déploiement (dans FYEnterMatchAzureFunction) : quels items
|
||||||
|
// de l'inventaire assurer, avec quelle police (voir TitleData "InventoryInsurance").
|
||||||
public class FYPurchaseInventoryInsuranceRequest
|
public class FYPurchaseInventoryInsuranceRequest
|
||||||
{
|
{
|
||||||
// m_insuranceId
|
[JsonPropertyName("insuranceId")]
|
||||||
// m_itemIds
|
public string InsuranceId { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("itemIds")]
|
||||||
|
public List<string> ItemIds { get; set; }
|
||||||
}
|
}
|
||||||
@@ -29,3 +29,30 @@ public class FYEnterMatchAzureFunction
|
|||||||
[JsonPropertyName("loginNonce")]
|
[JsonPropertyName("loginNonce")]
|
||||||
public string LoginNonce { get; set; }
|
public string LoginNonce { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class FYEnterMatchAzureFunctionCB
|
||||||
|
{
|
||||||
|
[JsonPropertyName("optimalRegion")]
|
||||||
|
public string? OptimalRegion { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("isMatch")]
|
||||||
|
public bool IsMatch { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("bypassMaintenanceMode")]
|
||||||
|
public bool BypassMaintenanceMode { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("debugOption")]
|
||||||
|
public string? DebugOption { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("mapName")]
|
||||||
|
public string? MapName { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("squad_id")]
|
||||||
|
public string? SquadId { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("purchaseInsuranceRequest")]
|
||||||
|
public FYPurchaseInventoryInsuranceRequest PurchaseInventoryInsurances { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("loginNonce")]
|
||||||
|
public string LoginNonce { get; set; }
|
||||||
|
}
|
||||||
+27
@@ -21,3 +21,30 @@ public class FYEnterMatchmakingResult
|
|||||||
[JsonPropertyName("errorMessage")]
|
[JsonPropertyName("errorMessage")]
|
||||||
public string ErrorMessage { get; set; }
|
public string ErrorMessage { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class FYEnterMatchAzureFunctionResult
|
||||||
|
{
|
||||||
|
[JsonPropertyName("success")]
|
||||||
|
public bool Success { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("address")]
|
||||||
|
public string? Address { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("errorMessage")]
|
||||||
|
public string? ErrorMessage { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("port")]
|
||||||
|
public int Port { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("sharedIndex")]
|
||||||
|
public int ShardIndex { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("singleplayerStation")]
|
||||||
|
public bool SingleplayerStation { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("maintenanceMode")]
|
||||||
|
public bool MaintenanceMode { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("sessionTimeJoinDelay")]
|
||||||
|
public float SessionTimeJoinDelay { get; set; }
|
||||||
|
}
|
||||||
@@ -43,4 +43,18 @@ public class DbUserService : BaseDbService<PlayFabUser>
|
|||||||
return await FindAsync(type, key) ??
|
return await FindAsync(type, key) ??
|
||||||
await CreateAsync(type, key);
|
await CreateAsync(type, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Resolve several auth keys (e.g. a batch of Steam IDs) to the players that exist on
|
||||||
|
// this server in a single query. Used by the friends list to keep only the imported
|
||||||
|
// Steam friends who have actually played here.
|
||||||
|
public async Task<List<PlayFabUser>> FindManyAsync(PlayFabUserAuthType type, IReadOnlyCollection<string> keys)
|
||||||
|
{
|
||||||
|
if (keys == null || keys.Count == 0)
|
||||||
|
{
|
||||||
|
return new List<PlayFabUser>();
|
||||||
|
}
|
||||||
|
var wanted = new HashSet<string>(keys);
|
||||||
|
return await Collection.Find(user => user.Auth.Any(auth =>
|
||||||
|
auth.Type == type && wanted.Contains(auth.Key))).ToListAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,7 +1,9 @@
|
|||||||
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.Models.Data;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Functions;
|
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Database;
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.UserData;
|
namespace Prospect.Server.Api.Services.UserData;
|
||||||
@@ -171,6 +173,25 @@ public class UserDataService
|
|||||||
["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\"}}"),
|
||||||
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
||||||
["Inventory"] = (false, "[]"),
|
["Inventory"] = (false, "[]"),
|
||||||
|
["JobBoardsData"] = (false, JsonSerializer.Serialize(
|
||||||
|
new JobBoardsData {
|
||||||
|
LastBoardRefreshTimeUtc = new CloudScript.Models.Data.FYTimestamp { Seconds = 0 },
|
||||||
|
Boards = [
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "Korolev",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
},
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "Osiris",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
},
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "ICA",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
)),
|
||||||
["VanityItems"] = (false, "[]"),
|
["VanityItems"] = (false, "[]"),
|
||||||
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
||||||
["Balance"] = (false, "{\"IN\": 0,\"AU\": 800,\"SC\": 30000}"),
|
["Balance"] = (false, "{\"IN\": 0,\"AU\": 800,\"SC\": 30000}"),
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public class Startup
|
|||||||
app.UseDeveloperExceptionPage();
|
app.UseDeveloperExceptionPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
app.UseHttpsRedirection();
|
// app.UseHttpsRedirection();
|
||||||
app.UseSerilogRequestLogging();
|
app.UseSerilogRequestLogging();
|
||||||
app.UseMiddleware<RequestLoggerMiddleware>();
|
app.UseMiddleware<RequestLoggerMiddleware>();
|
||||||
app.UseRouting();
|
app.UseRouting();
|
||||||
|
|||||||
@@ -8,14 +8,11 @@
|
|||||||
},
|
},
|
||||||
"PlayFabSettings": {
|
"PlayFabSettings": {
|
||||||
"PublisherId": "850902E5B40508ED",
|
"PublisherId": "850902E5B40508ED",
|
||||||
"TitleId": "2EA46"
|
"TitleId": "2EA46",
|
||||||
|
"SignalRURL": "https://127.0.0.1:8443/signalr/?hub=pubsub",
|
||||||
|
"SignalRAccessToken": "TEST"
|
||||||
},
|
},
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
|
||||||
"Https": {
|
|
||||||
"Url": "https://2EA46.playfabapi.com"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Certificates": {
|
"Certificates": {
|
||||||
"Default": {
|
"Default": {
|
||||||
"Path": ".\\certificate.pfx"
|
"Path": ".\\certificate.pfx"
|
||||||
|
|||||||
+53
-26
@@ -21,7 +21,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Tests", "Pr
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Generator", "Prospect.Unreal.Generator\Prospect.Unreal.Generator.csproj", "{71E3E262-49C5-4B6C-9670-D0741CEDB63B}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Generator", "Prospect.Unreal.Generator\Prospect.Unreal.Generator.csproj", "{71E3E262-49C5-4B6C-9670-D0741CEDB63B}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Client.Loader", "Prospect.Client.Loader\Prospect.Client.Loader.vcxproj", "{8170A17F-E536-4FDB-BC01-78BF09A9A48B}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Client.Loader", "Prospect.Client.Loader\Prospect.Client.Loader.vcxproj", "{04B1D963-2BCB-4887-9D6D-04CB3366A348}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Agent", "Prospect.Agent\Prospect.Agent.vcxproj", "{A9BA7D25-F239-4320-A0DC-85E8001FD669}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -183,30 +185,54 @@ Global
|
|||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.Build.0 = 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.ActiveCfg = Season 3 Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.Build.0 = 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
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.Build.0 = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.Build.0 = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.Build.0 = Release|Win32
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x86.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x86.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x86.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -218,7 +244,8 @@ Global
|
|||||||
{380DD490-8F01-4025-91D7-74C289AA5B75} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
{380DD490-8F01-4025-91D7-74C289AA5B75} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34} = {168B6247-2D33-4942-AB3F-C5041B3BDFEA}
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34} = {168B6247-2D33-4942-AB3F-C5041B3BDFEA}
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {12888C62-D3A2-4DD7-A9A5-1481D95865D0}
|
SolutionGuid = {12888C62-D3A2-4DD7-A9A5-1481D95865D0}
|
||||||
|
|||||||
@@ -4,8 +4,13 @@ from cryptography.x509 import NameOID, CertificateBuilder
|
|||||||
from cryptography import x509
|
from cryptography import x509
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
|
import argparse
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument("--common-name", type=str, default='127.0.0.1')
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
if os.path.exists("certificate.pfx"):
|
if os.path.exists("certificate.pfx"):
|
||||||
q = input("certificate.pfx already exists. Are you sure you want to generate a new certificate? (y/n): ")
|
q = input("certificate.pfx already exists. Are you sure you want to generate a new certificate? (y/n): ")
|
||||||
if q != "y":
|
if q != "y":
|
||||||
@@ -20,7 +25,7 @@ def main():
|
|||||||
|
|
||||||
# Generate self-signed certificate
|
# Generate self-signed certificate
|
||||||
subject = issuer = x509.Name([
|
subject = issuer = x509.Name([
|
||||||
x509.NameAttribute(NameOID.COMMON_NAME, '2EA46.playfabapi.com'),
|
x509.NameAttribute(NameOID.COMMON_NAME, args.common_name),
|
||||||
])
|
])
|
||||||
|
|
||||||
cert = CertificateBuilder().subject_name(
|
cert = CertificateBuilder().subject_name(
|
||||||
|
|||||||
Reference in New Issue
Block a user