Skip to content

Commit e8856b2

Browse files
authored
Merge pull request #1038 from PlayEveryWare/release-3.3.4
Release 3.3.4
2 parents d8f4c9e + 5e85a6e commit e8856b2

File tree

90 files changed

+743
-438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+743
-438
lines changed
Lines changed: 46 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,65 @@
11
/*
2-
* Copyright (c) 2024 PlayEveryWare
3-
*
4-
* Permission is hereby granted, free of charge, to any person obtaining a copy
5-
* of this software and associated documentation files (the "Software"), to deal
6-
* in the Software without restriction, including without limitation the rights
7-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
* copies of the Software, and to permit persons to whom the Software is
9-
* furnished to do so, subject to the following conditions:
10-
*
11-
* The above copyright notice and this permission notice shall be included in all
12-
* copies or substantial portions of the Software.
13-
*
14-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
* SOFTWARE.
21-
*/
2+
* Copyright (c) 2024 PlayEveryWare
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in all
12+
* copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
* SOFTWARE.
21+
*/
2222

2323
namespace PlayEveryWare.EpicOnlineServices
2424
{
2525
using System;
26+
using System.IO;
2627
using System.Threading.Tasks;
2728
using UnityEngine;
2829
using UnityEngine.Networking;
2930

3031
public class AndroidFileIOHelper
3132
{
32-
public static async Task<string> ReadAllText(string filePath)
33+
public static bool FileExists(string filePath)
3334
{
3435
using UnityWebRequest request = UnityWebRequest.Get(filePath);
35-
request.timeout = 2; //seconds till timeout
36-
UnityWebRequestAsyncOperation operation = request.SendWebRequest();
36+
request.timeout = 2;
37+
request.SendWebRequest();
38+
while (!request.isDone) { }
39+
40+
bool exists = (request.result == UnityWebRequest.Result.Success);
3741

38-
while (!operation.isDone)
42+
if (!exists)
3943
{
40-
await Task.Yield();
44+
Debug.LogError($"AndroidFileIOHelper says that \"{filePath}\" does not exist.");
4145
}
4246

47+
return exists;
48+
}
49+
50+
public static string ReadAllText(string filePath)
51+
{
52+
using UnityWebRequest request = UnityWebRequest.Get(filePath);
53+
request.timeout = 2; //seconds till timeout
54+
request.SendWebRequest();
55+
56+
while (!request.isDone) { }
57+
58+
return ProcessRequest(filePath, request);
59+
}
60+
61+
private static string ProcessRequest(string filePath, UnityWebRequest request)
62+
{
4363
string text = null;
4464

4565
switch (request.result)
@@ -72,4 +92,4 @@ public static async Task<string> ReadAllText(string filePath)
7292
return text;
7393
}
7494
}
75-
}
95+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:aa2712cc2ae3e8a997803b8a8e31f48c3af027d9a071e0f17cde49e6a7c8df41
3-
size 28348072
2+
oid sha256:78c79a46b31919256f415a59080ab8bf3123d1025664a9667dc0f457aff04f75
3+
size 28413432

Assets/Plugins/Source/Editor/Platforms/iOS/IOSBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#if !EOS_DISABLE
2323
namespace PlayEveryWare.EpicOnlineServices.Editor.Build
2424
{
25+
using EpicOnlineServices.Utility;
2526
using System.IO;
2627
using UnityEditor;
2728
using UnityEditor.Build.Reporting;
@@ -60,7 +61,7 @@ public override void PostBuild(BuildReport report)
6061

6162
PBXProject proj = new();
6263

63-
proj.ReadFromString(FileUtility.ReadAllText(projPath));
64+
proj.ReadFromString(FileSystemUtility.ReadAllText(projPath));
6465

6566
string targetGUID = proj.GetUnityMainTargetGuid();
6667
string unityTargetGUID = proj.GetUnityFrameworkTargetGuid();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:90f48d15a2e71966a46aa0f97a90e65ae8e8f7c4d72cea4f9f4d12ac7aec3181
2+
oid sha256:4137246fe695d302dac3b9dae8f6c7fa84617bdef16d1973a7d4cd67b99502c4
33
size 10752
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:284201afa667e80f3feeeb45200516169467b56765a9adfe55ce5406099c62ab
3-
size 18104808
2+
oid sha256:aba8695b971b5e247a03b0269ca0678c3d164d6ac1b15c78f512356ada74d09e
3+
size 18199528
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:bab781e35dd3069d6bd69d7c00257d0c0396154ede649dd1d0f8d7fbeea8010e
3-
size 104448
2+
oid sha256:333dc8a91c678c470fb7e9dd15c3ac4da7787af42e3f7468161f0cb48dc450fa
3+
size 101376
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6f7f4283120741c4169c06242095b40d41e3999f4996044e6520fb921fb64a37
3-
size 113152
2+
oid sha256:866feddfad909ac1600ef529504bb7c9313a754207bbd1c71a09cb76e4b7bbcb
3+
size 98816
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:63706183da128ef27291e51f0d439dee26d9af8f329ef6fb5a73fbb6842b599e
3-
size 13922280
2+
oid sha256:ab1c4bea182420d7c01def7799fd5ce6297df8eb08d8e04ff547888b987a797e
3+
size 13966312
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3e8e84b684183730c2591ddf1b88ef2875b11f40397e3017c9a2478fa290328c
3-
size 417280
2+
oid sha256:adaca6c603194980d613586874fc1b8d4916052c7db5629c0086b675feec7963
3+
size 422400
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3f7284bd478fbadb5a6f2d0afdaeaa123ef548a4d1ba2bdb6734faf3212fe826
3-
size 11199424
2+
oid sha256:0a87e4ab94375970c14de1ccff17d2764e1ab58f9e35546528839a32399d409a
3+
size 11389408

0 commit comments

Comments
 (0)